Fixed build under Fedora using rpmbuild and mock. Thanks to AUR packagers for this.

From: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Wed, 1 Feb 2017 15:53:16 +0100
Source: RussianFedora/telegram-desktop
This commit is contained in:
Berkus Decker 2017-11-20 22:08:20 +02:00
parent 63669c1612
commit dd0fa1c33e
4 changed files with 74 additions and 76 deletions

View File

@ -89,19 +89,17 @@
'AL_LIBTYPE_STATIC', 'AL_LIBTYPE_STATIC',
'AL_ALEXT_PROTOTYPES', 'AL_ALEXT_PROTOTYPES',
'TGVOIP_USE_CXX11_LIB', 'TGVOIP_USE_CXX11_LIB',
'<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")', '__STDC_FORMAT_MACROS',
'TDESKTOP_DISABLE_AUTOUPDATE',
'TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME',
'TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION',
'TDESKTOP_DISABLE_CRASH_REPORTS',
], ],
'include_dirs': [ 'include_dirs': [
'<(src_loc)', '<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)', '<(SHARED_INTERMEDIATE_DIR)',
'<(libs_loc)/breakpad/src', '<(libs_loc)/breakpad/src',
'<(libs_loc)/lzma/C',
'<(libs_loc)/libexif-0.6.20',
'<(libs_loc)/zlib',
'<(libs_loc)/ffmpeg',
'<(libs_loc)/openal-soft/include',
'<(libs_loc)/opus/include',
'<(minizip_loc)', '<(minizip_loc)',
'<(sp_media_key_tap_loc)', '<(sp_media_key_tap_loc)',
'<(emoji_suggestions_loc)', '<(emoji_suggestions_loc)',

View File

@ -38,14 +38,13 @@
'Qt5Network', 'Qt5Network',
'Qt5Widgets', 'Qt5Widgets',
'Qt5Gui', 'Qt5Gui',
'qtharfbuzzng',
], ],
'qt_version%': '<(qt_version)', 'qt_version%': '<(qt_version)',
'conditions': [ 'conditions': [
[ 'build_macold', { [ 'build_macold', {
'linux_path_qt%': '/usr/local/macold/Qt-<(qt_version)', 'linux_path_qt%': '/usr/local/macold/Qt-<(qt_version)',
}, { }, {
'linux_path_qt%': '/usr/local/tdesktop/Qt-<(qt_version)', 'linux_path_qt%': '../../../qt',
}] }]
] ]
}, },
@ -97,20 +96,6 @@
'<@(qt_libs)', '<@(qt_libs)',
'Qt5DBus', 'Qt5DBus',
'Qt5Core', 'Qt5Core',
'qtpcre',
'Xi',
'Xext',
'Xfixes',
'SM',
'ICE',
'fontconfig',
'expat',
'freetype',
'z',
'xcb-shm',
'xcb-xfixes',
'xcb-render',
'xcb-static',
], ],
}], }],
], ],
@ -140,11 +125,6 @@
# '<!@(python <(DEPTH)/list_sources.py [sources] <(qt_moc_list_sources_arg))' # '<!@(python <(DEPTH)/list_sources.py [sources] <(qt_moc_list_sources_arg))'
# where [sources] contains all your source files # where [sources] contains all your source files
'qt_moc_list_sources_arg': '--moc-prefix SHARED_INTERMEDIATE_DIR/<(_target_name)/moc/moc_', 'qt_moc_list_sources_arg': '--moc-prefix SHARED_INTERMEDIATE_DIR/<(_target_name)/moc/moc_',
'linux_path_xkbcommon%': '/usr/local',
'linux_lib_ssl%': '/usr/local/ssl/lib/libssl.a',
'linux_lib_crypto%': '/usr/local/ssl/lib/libcrypto.a',
'linux_lib_icu%': '/usr/lib/libicutu.a /usr/lib/libicui18n.a /usr/lib/libicuuc.a /usr/lib/libicudata.a',
}, },
'configurations': { 'configurations': {
@ -221,25 +201,41 @@
'<(qt_loc)/plugins/platforminputcontexts', '<(qt_loc)/plugins/platforminputcontexts',
], ],
'libraries': [ 'libraries': [
'<(linux_path_xkbcommon)/lib/libxkbcommon.a',
'<@(qt_libs_release)', '<@(qt_libs_release)',
'<(linux_lib_ssl)', 'z',
'<(linux_lib_crypto)', 'pcre16',
'<!@(python -c "for s in \'<(linux_lib_icu)\'.split(\' \'): print(s)")', 'harfbuzz',
'-lxcb', 'icuuc',
'-lX11', 'icutu',
'-lX11-xcb', 'icui18n',
'-ldbus-1', 'png16',
'-ldl', 'jpeg',
'-lgthread-2.0', 'xcb',
'-lglib-2.0', 'xcb-shm',
'-lpthread', 'xcb-xfixes',
'xcb-render',
'X11',
'X11-xcb',
'GL',
'dbus-1',
'dl',
'gthread-2.0',
'glib-2.0',
'pthread',
'ssl',
'crypto',
'Xi',
'Xext',
'SM',
'ICE',
'fontconfig',
'expat',
'freetype',
], ],
'include_dirs': [ 'include_dirs': [
'<(qt_loc)/mkspecs/linux-g++', '<(qt_loc)/mkspecs/linux-g++',
], ],
'ldflags': [ 'ldflags': [
'-static-libstdc++',
'-pthread', '-pthread',
'-g', '-g',
'-rdynamic', '-rdynamic',

View File

@ -28,29 +28,19 @@
# QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create # QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create
#'xkbcommon', #'xkbcommon',
], ],
'linux_path_ffmpeg%': '/usr/local',
'linux_path_openal%': '/usr/local',
'linux_path_libexif_lib%': '<(libs_loc)/libexif-0.6.20/libexif/.libs',
'linux_path_va%': '/usr/local',
'linux_path_vdpau%': '/usr/local',
'linux_path_breakpad%': '<(libs_loc)/breakpad', 'linux_path_breakpad%': '<(libs_loc)/breakpad',
'linux_path_opus_include%': '<(libs_loc)/opus/include', 'linux_path_opus_include%': '<(libs_loc)/opus/include',
}, },
'include_dirs': [ 'include_dirs': [
'/usr/local/include', '/usr/include',
'<(linux_path_ffmpeg)/include', '/usr/include/ffmpeg',
'<(linux_path_openal)/include',
'<(linux_path_breakpad)/include/breakpad', '<(linux_path_breakpad)/include/breakpad',
'<(linux_path_opus_include)', '<(linux_path_opus_include)',
], ],
'library_dirs': [ 'library_dirs': [
'/usr/local/lib', '/usr/lib64',
'<(linux_path_ffmpeg)/lib', '/usr/lib',
'<(linux_path_openal)/lib', '<(linux_path_breakpad)/src/client/linux',
'<(linux_path_libexif_lib)',
'<(linux_path_va)/lib',
'<(linux_path_vdpau)/lib',
'<(linux_path_breakpad)/lib',
], ],
'libraries': [ 'libraries': [
'breakpad_client', 'breakpad_client',
@ -58,20 +48,34 @@
'ibusplatforminputcontextplugin', 'ibusplatforminputcontextplugin',
'fcitxplatforminputcontextplugin', 'fcitxplatforminputcontextplugin',
'himeplatforminputcontextplugin', 'himeplatforminputcontextplugin',
'liblzma.a', 'xkbcommon',
'libopenal.a', 'xkbcommon-x11',
'libavformat.a', 'xcb-randr',
'libavcodec.a', 'xcb-xinerama',
'libswresample.a', 'xcb-xkb',
'libswscale.a', 'xcb-shape',
'libavutil.a', 'xcb-icccm',
'libopus.a', 'xcb-sync',
'libva-x11.a', 'xcb-keysyms',
'libva-drm.a', 'xcb-image',
'libva.a', 'xcb-render-util',
'libvdpau.a', 'wayland-client',
'libdrm.a', 'wayland-cursor',
'libz.a', 'proxy',
'lzma',
'openal',
'avformat',
'avcodec',
'swresample',
'swscale',
'avutil',
'opus',
'va-x11',
'va-drm',
'va',
'vdpau',
'z',
'webp',
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
], ],
'conditions': [['not_need_gtk!="True"', { 'conditions': [['not_need_gtk!="True"', {

View File

@ -130,11 +130,11 @@
], ],
}, { }, {
'include_dirs': [ 'include_dirs': [
'/usr/local/include', '/usr/include',
'<(libs_loc)/openssl-xcode/include'
], ],
'library_dirs': [ 'library_dirs': [
'/usr/local/lib', '/usr/lib64',
'/usr/lib',
], ],
}] }]
], ],
@ -152,11 +152,11 @@
], ],
}, { }, {
'include_dirs': [ 'include_dirs': [
'/usr/local/include', '/usr/include',
'<(libs_loc)/openssl-xcode/include'
], ],
'library_dirs': [ 'library_dirs': [
'/usr/local/lib', '/usr/lib64',
'/usr/lib',
], ],
}] }]
], ],