Date: Sunday, April 24, 2011 @ 11:55:09 Author: andrea Revision: 120507
fix build with gcc 4.6 (FS#23915) Added: qt3/trunk/gcc-4.6.patch Modified: qt3/trunk/PKGBUILD ---------------+ PKGBUILD | 37 ++++++++++++++++++++++++------------- gcc-4.6.patch | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-04-24 14:51:31 UTC (rev 120506) +++ PKGBUILD 2011-04-24 15:55:09 UTC (rev 120507) @@ -17,7 +17,11 @@ optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt3-png14.patch qt.profile \ qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \ - qt-font-default-subst.diff mysql.patch eastern_asian_languagues.diff qt-odbc.patch) + qt-font-default-subst.diff + mysql.patch + eastern_asian_languagues.diff + qt-odbc.patch + gcc-4.6.patch) options=(!libtool) md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85' '1dc671df42b9030dbdf68bb61cd3375e' @@ -28,7 +32,8 @@ '9370d82e85f2c799335ed0dcc1d53189' '7d40ed1bd40d33d8b9b27a2076a5d22a' '616f1f3029cf8375256ad6a406de3549' - '2178ca88dfd75a230918593b30eb0dbe') + '2178ca88dfd75a230918593b30eb0dbe' + '75177de5b08e1efd437c887c6e606c5b') # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ # other qt-patches come from fedora and gentoo @@ -42,24 +47,26 @@ cd ${srcdir}/$pkgfqn # apply qt patches from kde.org for i in ../qt-copy-kde-patches/*; do - patch -Np0 -i $i || return 1 + patch -Np0 -i $i done # apply other qt patches and one security fix from debian/gentoo for i in ../qt-patches/*; do - patch -Np1 -i $i || return 1 + patch -Np1 -i $i done # fix utf8 bug - patch -Np0 -i ../utf8-bug-qt3.diff || return 1 + patch -Np0 -i ../utf8-bug-qt3.diff # fix asia fonts - patch -Np0 -i ../qt-font-default-subst.diff || return 1 + patch -Np0 -i ../qt-font-default-subst.diff # fix segfaults on exit when using mysql DB driver - patch -Np0 -i ../mysql.patch || return 1 + patch -Np0 -i ../mysql.patch # fix CJK font/chars select error (FS#11245) - patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1 + patch -p1 -i ${srcdir}/eastern_asian_languagues.diff # fix build problem against new unixODBC - patch -p1 -i ${srcdir}/qt-odbc.patch || return 1 + patch -p1 -i ${srcdir}/qt-odbc.patch + # fix build with gcc 4.6.0 + patch -p1 -i ${srcdir}/gcc-4.6.patch - patch -p0 -i ${srcdir}/qt3-png14.patch || return 1 + patch -p0 -i ${srcdir}/qt3-png14.patch # start compiling qt sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix rm -rf doc/html examples tutorial @@ -91,7 +98,7 @@ [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile cd ${srcdir}/$pkgfqn - make -C qmake || return 1 + make -C qmake cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql @@ -100,7 +107,11 @@ cd ${srcdir}/$pkgfqn # fix the broken makefiles #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile - make || return 1 + make +} + +package() { + cd ${srcdir}/$pkgfqn make INSTALL_ROOT=${pkgdir} install rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations} sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl @@ -110,7 +121,7 @@ rm -f ${pkgdir}/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH # install man pages - mkdir -p ${pkgdir}/opt/qt/man + install -d -m755 ${pkgdir}/opt/qt/man cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/ install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ Added: gcc-4.6.patch =================================================================== --- gcc-4.6.patch (rev 0) +++ gcc-4.6.patch 2011-04-24 15:55:09 UTC (rev 120507) @@ -0,0 +1,33 @@ +diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h +--- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 +@@ -49,6 +49,7 @@ + #include "qvaluelist.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <map> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h +--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 +@@ -47,6 +47,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <list> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h +--- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 +@@ -45,6 +45,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <vector> + #endif