sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-12 23:09:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
ports/net-im/telegram-desktop/files/gyp-patches
Steve Wills 9c9f9f3ae4 net-im/telegram-desktop: update to 1.4.0 
PR:		232061
Submitted by:	Henry Hu <henry.hu.sh@gmail.com> (maintainer)
2018-10-09 02:01:19 +00:00

450 lines
15 KiB
Text
Raw Blame History

--- Telegram/gyp/codegen_rules.gypi.orig 2018-09-28 13:08:38 UTC
+++ Telegram/gyp/codegen_rules.gypi
@@ -15,7 +15,7 @@
'<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp',
],
'action': [
- 'python', '<(DEPTH)/update_dependent.py', '--styles',
+ '%%PYTHON_CMD%%', '<(DEPTH)/update_dependent.py', '--styles',
'-I', '<(res_loc)', '-I', '<(src_loc)',
'-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp',
'<@(style_files)',
@@ -26,13 +26,13 @@
'inputs': [
'<(DEPTH)/update_dependent.py',
'<@(qrc_files)',
- '<!@(python <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))',
+ '<!@(%%PYTHON_CMD%% <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))',
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',
],
'action': [
- 'python', '<(DEPTH)/update_dependent.py', '--qrc',
+ '%%PYTHON_CMD%%', '<(DEPTH)/update_dependent.py', '--qrc',
'-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',
'<@(qrc_files)',
],
--- Telegram/gyp/lib_export.gyp.orig 2018-09-28 13:08:38 UTC
+++ Telegram/gyp/lib_export.gyp
@@ -48,7 +48,7 @@
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
- '<(libs_loc)/range-v3/include',
+ '%%LOCALBASE%%',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
'<(submodules_loc)/crl/src',
--- Telegram/gyp/lib_scheme.gyp.orig 2018-09-28 13:08:38 UTC
+++ Telegram/gyp/lib_scheme.gyp
@@ -48,7 +48,7 @@
'<(SHARED_INTERMEDIATE_DIR)/scheme.h',
],
'action': [
- 'python', '<(src_loc)/codegen/scheme/codegen_scheme.py',
+ '%%PYTHON_CMD%%', '<(src_loc)/codegen/scheme/codegen_scheme.py',
'-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl',
],
'message': 'codegen_scheme-ing scheme.tl..',
--- Telegram/gyp/qt_moc.gypi.orig 2018-09-28 13:08:38 UTC
+++ Telegram/gyp/qt_moc.gypi
@@ -12,12 +12,12 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
],
'action': [
- '<(qt_loc)/bin/moc<(exe_ext)',
+ '%%QT_BINDIR%%/moc',
# Silence "Note: No relevant classes found. No output generated."
'--no-notes',
- '<!@(python -c "for s in \'<@(_defines)\'.split(\' \'): print(\'-D\' + s)")',
+ '<!@(%%PYTHON_CMD%% -c "for s in \'<@(_defines)\'.split(\' \'): print(\'-D\' + s)")',
# '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")',
'<(RULE_INPUT_PATH)',
'-o', '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
--- Telegram/gyp/qt_rcc.gypi.orig 2018-09-28 13:08:38 UTC
+++ Telegram/gyp/qt_rcc.gypi
@@ -15,7 +15,7 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',
],
'action': [
- '<(qt_loc)/bin/rcc<(exe_ext)',
+ '%%QT_BINDIR%%/rcc',
'-name', '<(RULE_INPUT_ROOT)',
'-no-compress',
'<(RULE_INPUT_PATH)',
--- Telegram/gyp/qt.gypi.orig 2018-09-28 13:08:38 UTC
+++ Telegram/gyp/qt.gypi
@@ -14,25 +14,21 @@
[ 'build_macold', {
'qt_version%': '5.3.2',
}, {
- 'qt_version%': '5.6.2',
+ 'qt_version%': '%%QT_VERSION%%',
}]
],
},
'qt_libs': [
- 'qwebp',
- 'Qt5PrintSupport',
- 'Qt5PlatformSupport',
'Qt5Network',
'Qt5Widgets',
'Qt5Gui',
- 'qtharfbuzzng',
],
'qt_version%': '<(qt_version)',
'conditions': [
[ 'build_macold', {
'linux_path_qt%': '/usr/local/macold/Qt-<(qt_version)',
}, {
- 'linux_path_qt%': '/usr/local/tdesktop/Qt-<(qt_version)',
+ 'linux_path_qt%': '%%LOCALBASE%%/lib/qt',
}]
]
},
@@ -72,44 +68,25 @@
],
}],
[ 'build_linux', {
- 'qt_lib_prefix': 'lib',
- 'qt_lib_debug_postfix': '.a',
- 'qt_lib_release_postfix': '.a',
+ 'qt_lib_prefix': '',
+ 'qt_lib_debug_postfix': '',
+ 'qt_lib_release_postfix': '',
'qt_libs': [
- 'qxcb',
- 'Qt5XcbQpa',
- 'qconnmanbearer',
- 'qgenericbearer',
- 'qnmbearer',
'<@(qt_libs)',
'Qt5DBus',
'Qt5Core',
- 'qtpcre',
- 'Xi',
- 'Xext',
- 'Xfixes',
- 'SM',
- 'ICE',
- 'fontconfig',
- 'expat',
- 'freetype',
- 'z',
- 'xcb-shm',
- 'xcb-xfixes',
- 'xcb-render',
- 'xcb-static',
],
}],
],
},
'qt_version%': '<(qt_version)',
'qt_loc_unix': '<(qt_loc_unix)',
- 'qt_version_loc': '<!(python -c "print(\'<(qt_version)\'.replace(\'.\', \'_\'))")',
+ 'qt_version_loc': '<!(%%PYTHON_CMD%% -c "print(\'<(qt_version)\'.replace(\'.\', \'_\'))")',
'qt_libs_debug': [
- '<!@(python -c "for s in \'<@(qt_libs)\'.split(\' \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_debug_postfix)\')")',
+ '<!@(%%PYTHON_CMD%% -c "for s in \'<@(qt_libs)\'.split(\' \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_debug_postfix)\')")',
],
'qt_libs_release': [
- '<!@(python -c "for s in \'<@(qt_libs)\'.split(\' \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_release_postfix)\')")',
+ '<!@(%%PYTHON_CMD%% -c "for s in \'<@(qt_libs)\'.split(\' \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_release_postfix)\')")',
],
},
'qt_libs_debug': [ '<@(qt_libs_debug)' ],
@@ -127,11 +104,6 @@
# '<!@(python <(DEPTH)/list_sources.py [sources] <(qt_moc_list_sources_arg))'
# where [sources] contains all your source files
'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%': 'libicutu.a libicui18n.a libicuuc.a libicudata.a',
},
'configurations': {
@@ -180,18 +152,18 @@
},
'include_dirs': [
- '<(qt_loc)/include',
- '<(qt_loc)/include/QtCore',
- '<(qt_loc)/include/QtGui',
- '<(qt_loc)/include/QtDBus',
- '<(qt_loc)/include/QtCore/<(qt_version)',
- '<(qt_loc)/include/QtGui/<(qt_version)',
- '<(qt_loc)/include/QtCore/<(qt_version)/QtCore',
- '<(qt_loc)/include/QtGui/<(qt_version)/QtGui',
+ '%%QT_INCDIR%%',
+ '%%QT_INCDIR%%/QtCore',
+ '%%QT_INCDIR%%/QtGui',
+ '%%QT_INCDIR%%/QtDBus',
+ '%%QT_INCDIR%%/QtCore/<(qt_version)',
+ '%%QT_INCDIR%%/QtGui/<(qt_version)',
+ '%%QT_INCDIR%%/QtCore/<(qt_version)/QtCore',
+ '%%QT_INCDIR%%/QtGui/<(qt_version)/QtGui',
],
'library_dirs': [
- '<(qt_loc)/lib',
- '<(qt_loc)/plugins',
+ '%%LOCALBASE%%/lib',
+ '%%QT_LIBDIR%%/',
'<(qt_loc)/plugins/bearer',
'<(qt_loc)/plugins/platforms',
'<(qt_loc)/plugins/imageformats',
@@ -204,33 +176,20 @@
],
'conditions': [
[ 'build_linux', {
- 'dependencies': [
- '<(DEPTH)/linux_glibc_wraps.gyp:linux_glibc_wraps',
- ],
'library_dirs': [
'<(qt_loc)/plugins/platforminputcontexts',
],
'libraries': [
- '<(PRODUCT_DIR)/obj.target/liblinux_glibc_wraps.a',
- '<(linux_path_xkbcommon)/lib/libxkbcommon.a',
'<@(qt_libs_release)',
- '<(linux_lib_ssl)',
- '<(linux_lib_crypto)',
- '<!@(python -c "for s in \'<(linux_lib_icu)\'.split(\' \'): print(s)")',
- '-lxcb',
+ '-lcrypto',
'-lX11',
- '-lX11-xcb',
- '-ldbus-1',
- '-ldl',
- '-lgthread-2.0',
'-lglib-2.0',
'-lpthread',
],
'include_dirs': [
- '<(qt_loc)/mkspecs/linux-g++',
+ '%%QMAKESPEC%%',
],
'ldflags': [
- '-static-libstdc++',
'-pthread',
'-rdynamic',
],
--- Telegram/gyp/telegram_linux.gypi.orig 2018-09-28 13:08:38 UTC
+++ Telegram/gyp/telegram_linux.gypi
@@ -10,7 +10,7 @@
'variables': {
'build_defines%': '',
},
- 'not_need_gtk%': '<!(python -c "print(\'TDESKTOP_DISABLE_GTK_INTEGRATION\' in \'<(build_defines)\')")',
+ 'not_need_gtk%': '<!(%%PYTHON_CMD%% -c "print(\'TDESKTOP_DISABLE_GTK_INTEGRATION\' in \'<(build_defines)\')")',
'pkgconfig_libs': [
# In order to work libxkbcommon must be linked statically,
# PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon"
@@ -23,10 +23,11 @@
'linux_path_va%': '/usr/local',
'linux_path_vdpau%': '/usr/local',
'linux_path_breakpad%': '/usr/local',
- 'linux_path_opus_include%': '<(libs_loc)/opus/include',
+ 'linux_path_opus_include%': '%%LOCALBASE%%/include/opus',
'linux_path_range%': '/usr/local',
},
'include_dirs': [
+ '/usr/include/openssl-1.0',
'/usr/local/include',
'<(linux_path_ffmpeg)/include',
'<(linux_path_openal)/include',
@@ -35,6 +36,7 @@
'<(linux_path_range)/include',
],
'library_dirs': [
+ '/usr/lib/openssl-1.0',
'/usr/local/lib',
'<(linux_path_ffmpeg)/lib',
'<(linux_path_openal)/lib',
@@ -43,25 +45,16 @@
'<(linux_path_breakpad)/lib',
],
'libraries': [
- 'breakpad_client',
- 'composeplatforminputcontextplugin',
- 'ibusplatforminputcontextplugin',
- 'fcitxplatforminputcontextplugin',
- 'himeplatforminputcontextplugin',
- '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',
+ 'lzma',
+ 'openal',
+ 'avformat',
+ 'avcodec',
+ 'swresample',
+ 'swscale',
+ 'avutil',
+ 'minizip',
+ 'opus',
+ 'z',
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
@@ -71,7 +64,6 @@
'ldflags': [
'-Wl,-wrap,aligned_alloc',
'-Wl,-wrap,secure_getenv',
- '-Wl,-wrap,clock_gettime',
'-Wl,--no-as-needed,-lrt',
],
'configurations': {
@@ -79,13 +71,16 @@
'cflags_c': [
'-Ofast',
'-fno-strict-aliasing',
+ %%CFLAGS%%
],
'cflags_cc': [
'-Ofast',
'-fno-strict-aliasing',
+ %%CXXFLAGS%%
],
'ldflags': [
'-Ofast',
+ %%LDFLAGS%%
],
},
},
@@ -96,10 +91,7 @@
],
}], ['not_need_gtk!="True"', {
'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 gtk+-3.0)',
],
}]
],
--- Telegram/gyp/Telegram.gyp.orig 2018-09-28 13:08:38 UTC
+++ Telegram/gyp/Telegram.gyp
@@ -51,7 +51,7 @@
'pt-BR',
],
'build_defines%': '',
- 'list_sources_command': 'python <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)',
+ 'list_sources_command': '%%PYTHON_CMD%% <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)',
'pch_source': '<(src_loc)/stdafx.cpp',
'pch_header': '<(src_loc)/stdafx.h',
},
@@ -75,7 +75,6 @@
'codegen.gyp:codegen_numbers',
'codegen.gyp:codegen_style',
'tests/tests.gyp:tests',
- 'utils.gyp:Updater',
'../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
'crl.gyp:crl',
'lib_base.gyp:lib_base',
@@ -84,25 +83,16 @@
],
'defines': [
- 'AL_LIBTYPE_STATIC',
'AL_ALEXT_PROTOTYPES',
'TGVOIP_USE_CXX11_LIB',
'XXH_INLINE_ALL',
- '<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
+ '<!@(%%PYTHON_CMD%% -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
],
'include_dirs': [
'<(src_loc)',
'<(SHARED_INTERMEDIATE_DIR)',
- '<(libs_loc)/breakpad/src',
- '<(libs_loc)/lzma/C',
- '<(libs_loc)/zlib',
- '<(libs_loc)/ffmpeg',
- '<(libs_loc)/openal-soft/include',
- '<(libs_loc)/opus/include',
- '<(libs_loc)/range-v3/include',
- '<(minizip_loc)',
- '<(sp_media_key_tap_loc)',
+ '%%LOCALBASE%%/include/minizip',
'<(emoji_suggestions_loc)',
'<(submodules_loc)/GSL/include',
'<(submodules_loc)/variant/include',
@@ -121,7 +111,7 @@
'<(res_loc)/export_html/images/back@2x.png',
],
'sources!': [
- '<!@(<(list_sources_command) <(qt_moc_list_sources_arg) --exclude_for <(build_os))',
+ '<!@(<(list_sources_command) <(qt_moc_list_sources_arg) --exclude_for linux)',
],
'conditions': [
[ '"<(official_build_target)" != ""', {
--- Telegram/gyp/tests/tests.gyp.orig 2018-09-28 13:08:38 UTC
+++ Telegram/gyp/tests/tests.gyp
@@ -13,7 +13,7 @@
'src_loc': '../../SourceFiles',
'submodules_loc': '../../ThirdParty',
'mac_target': '10.10',
- 'list_tests_command': 'python <(DEPTH)/tests/list_tests.py --input <(DEPTH)/tests/tests_list.txt',
+ 'list_tests_command': '%%PYTHON_CMD%% <(DEPTH)/tests/list_tests.py --input <(DEPTH)/tests/tests_list.txt',
},
'targets': [{
'target_name': 'tests',
--- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2018-09-18 16:52:01 UTC
+++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp
@@ -13,11 +13,12 @@
'variables': {
'tgvoip_src_loc': '.',
'official_build_target%': '',
- 'linux_path_opus_include%': '<(DEPTH)/../../../Libraries/opus/include',
+ 'linux_path_opus_include%': '%%LOCALBASE%%/include/opus',
},
'include_dirs': [
'<(tgvoip_src_loc)/webrtc_dsp',
'<(linux_path_opus_include)',
+ '%%LOCALBASE%%/include/',
],
'direct_dependent_settings': {
'include_dirs': [
@@ -263,7 +264,7 @@
},
],
[
- '"<(OS)" != "linux"', {
+ '"<(OS)" != "freebsd"', {
'sources/': [['exclude', '<(tgvoip_src_loc)/os/linux/']],
},
],
@@ -383,12 +384,15 @@
},
],
[
- '"<(OS)" == "linux"', {
+ '"<(OS)" == "freebsd"', {
'defines': [
'WEBRTC_POSIX',
],
+ 'cflags_cc': [
+ '-std=gnu++11',
+ ],
'conditions': [
- [ '"<!(uname -m)" == "i686"', {
+ [ '"<!(uname -m)" == "i386"', {
'cflags_cc': [
'-msse2',
],
Reference in a new issue View git blame Copy permalink