diff options
| author | Peter Cai | 2017-04-02 16:07:01 +0800 |
|---|---|---|
| committer | Peter Cai | 2017-04-02 16:07:01 +0800 |
| commit | 0eefca7fb1a912f38ccb11d0aa49ac3f9c94e863 (patch) | |
| tree | c535afb468aee6e9ef6b1ce1e650278938163ab9 /Flags-for-precompiled-header-and-MOC.patch | |
| parent | 9dd395fb2f104967ee6f2a8c13ef65d7b77ee581 (diff) | |
| download | aur-0eefca7fb1a912f38ccb11d0aa49ac3f9c94e863.tar.gz | |
upgrade to 1.0.27
Diffstat (limited to 'Flags-for-precompiled-header-and-MOC.patch')
| -rw-r--r-- | Flags-for-precompiled-header-and-MOC.patch | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/Flags-for-precompiled-header-and-MOC.patch b/Flags-for-precompiled-header-and-MOC.patch index 558d0fbed0e8..c6df3258963f 100644 --- a/Flags-for-precompiled-header-and-MOC.patch +++ b/Flags-for-precompiled-header-and-MOC.patch @@ -1,27 +1,8 @@ Description: Specify preprocessor and compiler flags for precompiled header and Qt object files Author: Nicholas Guriev <guriev-ns@ya.ru> -Last-Update: 2017-01-26 +Last-Update: 2017-03-31 -diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi -index 24ededb..0cfd178 100644 ---- a/Telegram/gyp/qt.gypi -+++ b/Telegram/gyp/qt.gypi -@@ -241,11 +231,12 @@ - '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp', - ], - 'action': [ -- '<(qt_loc)/bin/moc<(exe_ext)', -+ '/usr/bin/moc', - - # Silence "Note: No relevant classes found. No output generated." - '--no-notes', - -+ '<!@(echo $CPPFLAGS | grep -Po "[-]([IDU]\s*\S*|E)")', - '<!@(python -c "for s in \'<@(_defines)\'.split(\' \'): print(\'-D\' + s)")', - # '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")', - '<(RULE_INPUT_PATH)', diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake -index fc189e4..30becec 100644 --- a/Telegram/gyp/PrecompiledHeader.cmake +++ b/Telegram/gyp/PrecompiledHeader.cmake @@ -112,7 +112,7 @@ function(add_precompiled_header _target _input) @@ -42,3 +23,14 @@ index fc189e4..30becec 100644 DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}" IMPLICIT_DEPENDS CXX "${_pch_header}" COMMENT "Precompiling ${_name} for ${_target} (C++)") +diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi +--- a/Telegram/gyp/qt.gypi ++++ b/Telegram/gyp/qt.gypi +@@ -228,6 +228,7 @@ + # Silence "Note: No relevant classes found. No output generated." + '--no-notes', + ++ '<!@(echo $CPPFLAGS | grep -Po "[-]([IDU]\s*\S*|E)")', + '<!@(python -c "for s in \'<@(_defines)\'.split(\' \'): print(\'-D\' + s)")', + # '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")', + '<(RULE_INPUT_PATH)', |