From d9678627de5208f28f8216e584fab8a0f8f32e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 20 Feb 2017 18:25:40 +0100 Subject: [PATCH] qt: add workaround for moc parsing bug The moc-qt4 parser fails to recognize the redefinition of some macros like major(), minor() in the new version of the kernel-libc-headers-4.9.8 file sys/sysmacros.h. Add a patch to predefine the macro _SYS_SYSMACROS_H_OUTER which works around this bug and makes it possible again to build qt-webkit and possibly other packages depending on qt. --- srcpkgs/qt/patches/moc-syslib-workaround.patch | 11 +++++++++++ srcpkgs/qt/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/qt/patches/moc-syslib-workaround.patch diff --git a/srcpkgs/qt/patches/moc-syslib-workaround.patch b/srcpkgs/qt/patches/moc-syslib-workaround.patch new file mode 100644 index 00000000000..ac7d5e64830 --- /dev/null +++ b/srcpkgs/qt/patches/moc-syslib-workaround.patch @@ -0,0 +1,11 @@ +--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2017-02-20 18:21:15.826212874 +0100 ++++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2017-02-20 18:23:02.448342205 +0100 +@@ -192,6 +192,8 @@ + pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; + pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; + pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; ++ // Workaround a bug where newer kernel-libc-headers sys/sysmacros.h define macros like major, minor ++ pp.macros["_SYS_SYSMACROS_H_OUTER"]; + + QByteArray filename; + QByteArray output; diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index d030112f63e..aeda1c7b6ed 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,7 +1,7 @@ # Template file for 'qt' pkgname=qt version=4.8.7 -revision=18 +revision=19 _distname=qt-everywhere-opensource-src patch_args="-Np1" wrksrc=${_distname}-${version}