forked from pool/telegram-desktop
1e2040008d
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=11
187 lines
5.3 KiB
Diff
187 lines
5.3 KiB
Diff
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
|
|
index 2503f1e..da2fe9d 100644
|
|
--- a/Telegram/gyp/Telegram.gyp
|
|
+++ b/Telegram/gyp/Telegram.gyp
|
|
@@ -79,8 +79,11 @@
|
|
],
|
|
|
|
'defines': [
|
|
- 'AL_LIBTYPE_STATIC',
|
|
'<!@(python -c "for s in \'<(travis_defines)\'.split(\',\'): print(s)")',
|
|
+ '__STDC_FORMAT_MACROS',
|
|
+ 'TDESKTOP_DISABLE_AUTOUPDATE',
|
|
+ 'TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME',
|
|
+ 'TDESKTOP_DISABLE_UNITY_INTEGRATION',
|
|
],
|
|
|
|
'include_dirs': [
|
|
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
|
|
index 24ededb..7002c13 100644
|
|
--- a/Telegram/gyp/qt.gypi
|
|
+++ b/Telegram/gyp/qt.gypi
|
|
@@ -38,7 +38,6 @@
|
|
'Qt5Network',
|
|
'Qt5Widgets',
|
|
'Qt5Gui',
|
|
- 'qtharfbuzzng',
|
|
],
|
|
'qt_version%': '<(qt_version)',
|
|
'linux_path_qt%': '/usr/local/tdesktop/Qt-<(qt_version)',
|
|
@@ -56,7 +55,6 @@
|
|
'qtmain',
|
|
'qwindows',
|
|
'qtfreetype',
|
|
- 'qtpcre',
|
|
],
|
|
}],
|
|
[ 'build_mac', {
|
|
@@ -75,7 +73,6 @@
|
|
'<@(qt_libs)',
|
|
'Qt5Core',
|
|
'qtfreetype',
|
|
- 'qtpcre',
|
|
],
|
|
}],
|
|
[ 'build_linux', {
|
|
@@ -91,19 +88,6 @@
|
|
'<@(qt_libs)',
|
|
'Qt5DBus',
|
|
'Qt5Core',
|
|
- 'qtpcre',
|
|
- 'Xi',
|
|
- 'Xext',
|
|
- 'Xfixes',
|
|
- 'SM',
|
|
- 'ICE',
|
|
- 'fontconfig',
|
|
- 'expat',
|
|
- 'freetype',
|
|
- 'xcb-shm',
|
|
- 'xcb-xfixes',
|
|
- 'xcb-render',
|
|
- 'xcb-static',
|
|
],
|
|
}],
|
|
],
|
|
@@ -208,7 +192,6 @@
|
|
'<(qt_loc)/plugins/platforminputcontexts',
|
|
],
|
|
'libraries': [
|
|
- '<(linux_path_xkbcommon)/lib/libxkbcommon.a',
|
|
'<@(qt_libs_release)',
|
|
'<(linux_lib_ssl)',
|
|
'<(linux_lib_crypto)',
|
|
@@ -219,14 +202,28 @@
|
|
'dbus-1',
|
|
'dl',
|
|
'gthread-2.0',
|
|
+ 'jpeg',
|
|
'glib-2.0',
|
|
'pthread',
|
|
+ 'GL',
|
|
+ 'freetype',
|
|
+ 'fontconfig',
|
|
+ 'Xi',
|
|
+ 'SM',
|
|
+ 'ICE',
|
|
+ 'proxy',
|
|
+ '<!(pkg-config 2> /dev/null --libs xkbcommon xkbcommon-x11)',
|
|
+ '<!(pkg-config 2> /dev/null --libs libpcre16)',
|
|
+ '<!(pkg-config 2> /dev/null --libs zlib)',
|
|
+ '<!(pkg-config 2> /dev/null --libs libpng16)',
|
|
+ '<!(pkg-config 2> /dev/null --libs libwebp)',
|
|
+ '<!(pkg-config 2> /dev/null --libs harfbuzz)',
|
|
+ '<!(pkg-config 2> /dev/null --libs xcb-shm xcb-xfixes xcb-render xcb-renderutil xcb-sync xcb-randr xcb-xinerama xcb-xkb xcb-icccm xcb-image xcb-shape xcb-keysyms xcb-util)',
|
|
],
|
|
'include_dirs': [
|
|
'<(qt_loc)/mkspecs/linux-g++',
|
|
],
|
|
'ldflags': [
|
|
- '-static-libstdc++',
|
|
'-pthread',
|
|
'-g',
|
|
'-rdynamic',
|
|
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
|
|
index b42e744..d791379 100644
|
|
--- a/Telegram/gyp/telegram_linux.gypi
|
|
+++ b/Telegram/gyp/telegram_linux.gypi
|
|
@@ -21,11 +21,20 @@
|
|
'conditions': [[ 'build_linux', {
|
|
'variables': {
|
|
'pkgconfig_libs': [
|
|
-# In order to work libxkbcommon must be linked statically,
|
|
-# PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon"
|
|
-# which makes a dynamic link which leads to segfault in
|
|
-# QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create
|
|
- #'xkbcommon',
|
|
+ 'liblzma',
|
|
+ 'openal',
|
|
+ 'libavformat',
|
|
+ 'libavcodec',
|
|
+ 'libswresample',
|
|
+ 'libswscale',
|
|
+ 'libavutil',
|
|
+ 'opus',
|
|
+ 'libva-x11',
|
|
+ 'libva-drm',
|
|
+ 'libva',
|
|
+ 'libdrm',
|
|
+ 'zlib',
|
|
+
|
|
],
|
|
'linux_path_ffmpeg%': '/usr/local',
|
|
'linux_path_openal%': '/usr/local',
|
|
@@ -35,46 +44,26 @@
|
|
'linux_path_breakpad%': '<(libs_loc)/breakpad',
|
|
},
|
|
'include_dirs': [
|
|
- '/usr/local/include',
|
|
- '<(linux_path_ffmpeg)/include',
|
|
- '<(linux_path_openal)/include',
|
|
+ '/usr/include',
|
|
'<(linux_path_breakpad)/include/breakpad',
|
|
],
|
|
'library_dirs': [
|
|
- '/usr/local/lib',
|
|
- '<(linux_path_ffmpeg)/lib',
|
|
- '<(linux_path_openal)/lib',
|
|
- '<(linux_path_libexif_lib)',
|
|
- '<(linux_path_va)/lib',
|
|
- '<(linux_path_vdpau)/lib',
|
|
- '<(linux_path_breakpad)/lib',
|
|
+ '/usr/lib',
|
|
+ '<(linux_path_breakpad)/src/client/linux',
|
|
],
|
|
'libraries': [
|
|
- 'breakpad_client',
|
|
'composeplatforminputcontextplugin',
|
|
'ibusplatforminputcontextplugin',
|
|
'fcitxplatforminputcontextplugin',
|
|
- 'liblzma.a',
|
|
- 'libopenal.a',
|
|
- 'libavformat.a',
|
|
- 'libavcodec.a',
|
|
- 'libswresample.a',
|
|
- 'libswscale.a',
|
|
- 'libavutil.a',
|
|
- 'libopus.a',
|
|
- 'libva-x11.a',
|
|
- 'libva-drm.a',
|
|
- 'libva.a',
|
|
- 'libvdpau.a',
|
|
- 'libdrm.a',
|
|
- 'libz.a',
|
|
-# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
|
|
+ '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
|
|
+ 'libbreakpad_client.a',
|
|
],
|
|
'cflags_cc': [
|
|
'<!(pkg-config 2> /dev/null --cflags appindicator-0.1)',
|
|
'<!(pkg-config 2> /dev/null --cflags gtk+-2.0)',
|
|
'<!(pkg-config 2> /dev/null --cflags glib-2.0)',
|
|
'<!(pkg-config 2> /dev/null --cflags dee-1.0)',
|
|
+ '<!(pkg-config 2> /dev/null --cflags <@(pkgconfig_libs))',
|
|
],
|
|
'configurations': {
|
|
'Release': {
|