summaryrefslogtreecommitdiff
path: root/qt4/qt4-glibc-2.25.patch
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-12-12 14:00:20 +0100
committerErich Eckner <git@eckner.net>2019-12-12 14:00:20 +0100
commitaea50ea70924ce64a580e4df9d4860a917bfd54e (patch)
tree0dd928c0bb230a71984dc7f27306fb5ba06c8842 /qt4/qt4-glibc-2.25.patch
parentb8d841f4773f344f3e89b6c9d692ad8af0d3818e (diff)
downloadarchlinuxewe-aea50ea70924ce64a580e4df9d4860a917bfd54e.tar.xz
qt4 neu
Diffstat (limited to 'qt4/qt4-glibc-2.25.patch')
-rw-r--r--qt4/qt4-glibc-2.25.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/qt4/qt4-glibc-2.25.patch b/qt4/qt4-glibc-2.25.patch
new file mode 100644
index 000000000..ca7b98bd5
--- /dev/null
+++ b/qt4/qt4-glibc-2.25.patch
@@ -0,0 +1,30 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin
+qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h
+--- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin 2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h 2016-12-08 12:10:29.677359701 -0600
+@@ -52,7 +52,7 @@
+ /*
+ can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
+ */
+-#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
++#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
+
+ #define QT_PACKAGEDATE_STR "2015-05-07"
+
+diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 2015-05-07 09:14:44.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2016-12-08 12:32:46.638962448 -0600
+@@ -188,10 +188,12 @@ int runMoc(int _argc, char **_argv)
+ pp.macros["Q_MOC_RUN"];
+ pp.macros["__cplusplus"];
+
+- // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
++ // Workaround a bugs while parsing some boost headers. See QTBUG-22829
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++ pp.macros["BOOST_TYPE_TRAITS_HPP"];
++ pp.macros["_SYS_SYSMACROS_H_OUTER"];
+
+ QByteArray filename;
+ QByteArray output;