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.
This commit is contained in:
parent
9bbed59189
commit
d9678627de
2 changed files with 12 additions and 1 deletions
11
srcpkgs/qt/patches/moc-syslib-workaround.patch
Normal file
11
srcpkgs/qt/patches/moc-syslib-workaround.patch
Normal file
|
@ -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;
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'qt'
|
# Template file for 'qt'
|
||||||
pkgname=qt
|
pkgname=qt
|
||||||
version=4.8.7
|
version=4.8.7
|
||||||
revision=18
|
revision=19
|
||||||
_distname=qt-everywhere-opensource-src
|
_distname=qt-everywhere-opensource-src
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
wrksrc=${_distname}-${version}
|
wrksrc=${_distname}-${version}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue