Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mcirstabumps.git;a=commitdiff;h=2c36d51a2551a42d90c55c514b4c62ccccc5aee1
commit 2c36d51a2551a42d90c55c514b4c62ccccc5aee1 Author: DeX77 <[email protected]> Date: Mon May 25 17:17:34 2015 +0200 qt4-4.8.6-3-x86_64 + add patch to workaround boost problem diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index 7e6a220..5d3d86a 100644 --- a/source/xlib-extra/qt4/FrugalBuild +++ b/source/xlib-extra/qt4/FrugalBuild @@ -9,7 +9,7 @@ USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"} pkgname=qt4 _F_archive_name=qt-everywhere-opensource-src pkgver=4.8.6 -pkgrel=2 +pkgrel=3 pkgdesc="The QT4 GUI toolkit." url="http://qt.nokia.com/products/"; depends=() @@ -22,12 +22,17 @@ archs=('i686' 'x86_64') options=('scriptlet' 'nodocs') up2date="lynx --dump http://download.qt.io/archive/qt/4.8/ | egrep 'qt/4.8/[0-9\.]' | sed 's|.*4.8/\([0-9\.]*\)/|\1|' | head -n1" source=(http://download.qt.io/archive/qt/4.8/${pkgver}/$_F_archive_name-$pkgver.tar.gz \ - frugalware.patch glib-honor-ExcludeSocketNotifiers-flag.patch l-qclipboard_delay.patch l-qclipboard_fix_recursive.patch) + frugalware.patch \ + glib-honor-ExcludeSocketNotifiers-flag.patch \ + l-qclipboard_delay.patch \ + l-qclipboard_fix_recursive.patch \ + moc-boost-workaround.patch) sha1sums=('ddf9c20ca8309a116e0466c42984238009525da6' \ '39b67a38c74acc9bba9940cbb39af73fef030edb' \ '6ae0966c0d738ac52e6f5c4bebb1a852d3ace312' \ '234f44abc7866840bb456a81f895f0750f50d31f' \ - 'd67a6a06333941b76c7225d3b9986c5baca35073') + 'd67a6a06333941b76c7225d3b9986c5baca35073' \ + '10178d1771c09db0a0ed717a6338e5a1ccebe692') export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH} export YACC='yacc -d' diff --git a/source/xlib-extra/qt4/moc-boost-workaround.patch b/source/xlib-extra/qt4/moc-boost-workaround.patch new file mode 100644 index 0000000..027f806 --- /dev/null +++ b/source/xlib-extra/qt4/moc-boost-workaround.patch @@ -0,0 +1,12 @@ +diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp +--- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp 2014-04-10 21:37:12.000000000 +0300 ++++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp 2014-11-06 02:24:44.287305916 +0200 +@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv) + + // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 + pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; ++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; ++ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; + + QByteArray filename; + QByteArray output; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
