diff --git a/qt4/.md5sum b/qt4/.md5sum index ef29c23ce..49d736317 100644 --- a/qt4/.md5sum +++ b/qt4/.md5sum @@ -1 +1,2 @@ a60490b36099bdd10c4d2f55430075b3 qt-x11-opensource-src-4.3.2.tar.gz +a65eb8658114698eaaaa7a4c44443669 qt4-4.3.2-x11-path-fix.patch diff --git a/qt4/Pkgfile b/qt4/Pkgfile index 6c92a6bfe..6a3d1dba4 100644 --- a/qt4/Pkgfile +++ b/qt4/Pkgfile @@ -7,14 +7,17 @@ name=qt4 version=4.3.2 -release=1 -source=(ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-$version.tar.gz) +release=2 +source=(ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-$version.tar.gz \ + qt4-$version-x11-path-fix.patch) mirror=(ftp://ftp.tu-chemnitz.de/pub/Qt/qt/source/qt-x11-opensource-src-$version.tar.gz) build() { cd qt-x11-opensource-src-$version + patch -p1 -i $SRC/qt4-$version-x11-path-fix.patch + # don't use distcc as it wont compile but use ccache if installed if pkginfo -i |grep '^distcc ' > /dev/null; then if pkginfo -i |grep '^ccache ' > /dev/null; then @@ -39,9 +42,9 @@ build() { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(pwd)/lib" # we don't want docs, sample code; please use our optimization flags - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf - sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix - sed -i 's|read acceptance|acceptance=yes|' configure + sed -i -e "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf + sed -i -e "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix + sed -i -e 's|read acceptance|acceptance=yes|' configure ./configure \ -prefix /usr/share/qt4 \ @@ -60,7 +63,7 @@ build() { make make INSTALL_ROOT=$PKG install_subtargets install_qmake - # install mkspecs without having to deleate more junk than it's worth using make install + # install mkspecs without having to delete more junk than it's worth using make install install -d $PKG/usr/share/qt4/mkspecs mv mkspecs/{linux-g++{,-32,-64},common,features} $PKG/usr/share/qt4/mkspecs/ ln -s linux-g++ $PKG/usr/share/qt4/mkspecs/default diff --git a/qt4/qt4-4.3.2-x11-path-fix.patch b/qt4/qt4-4.3.2-x11-path-fix.patch new file mode 100644 index 000000000..4e8a44330 --- /dev/null +++ b/qt4/qt4-4.3.2-x11-path-fix.patch @@ -0,0 +1,53 @@ +diff -pruN qt-x11-opensource-src-4.3.2.orig/mkspecs/common/linux.conf qt-x11-opensource-src-4.3.2/mkspecs/common/linux.conf +--- qt-x11-opensource-src-4.3.2.orig/mkspecs/common/linux.conf 2008-01-29 17:57:54.387185584 +1100 ++++ qt-x11-opensource-src-4.3.2/mkspecs/common/linux.conf 2008-01-29 18:00:28.979683952 +1100 +@@ -7,12 +7,12 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_ + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = /usr/X11/include ++QMAKE_LIBDIR_X11 = /usr/X11/lib + QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] + QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_OPENGL = /usr/X11/include ++QMAKE_LIBDIR_OPENGL = /usr/X11/lib + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +diff -pruN qt-x11-opensource-src-4.3.2.orig/mkspecs/linux-cxx/qmake.conf qt-x11-opensource-src-4.3.2/mkspecs/linux-cxx/qmake.conf +--- qt-x11-opensource-src-4.3.2.orig/mkspecs/linux-cxx/qmake.conf 2008-01-29 17:57:54.353190752 +1100 ++++ qt-x11-opensource-src-4.3.2/mkspecs/linux-cxx/qmake.conf 2008-01-29 18:00:21.716788080 +1100 +@@ -37,12 +37,12 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YAC + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = /usr/X11/include ++QMAKE_LIBDIR_X11 = /usr/X11/lib + QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] + QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_OPENGL = /usr/X11/include ++QMAKE_LIBDIR_OPENGL = /usr/X11/lib + + QMAKE_LINK = cxx + QMAKE_LINK_SHLIB = cxx +diff -pruN qt-x11-opensource-src-4.3.2.orig/mkspecs/linux-g++-64/qmake.conf qt-x11-opensource-src-4.3.2/mkspecs/linux-g++-64/qmake.conf +--- qt-x11-opensource-src-4.3.2.orig/mkspecs/linux-g++-64/qmake.conf 2008-01-29 17:57:54.358189992 +1100 ++++ qt-x11-opensource-src-4.3.2/mkspecs/linux-g++-64/qmake.conf 2008-01-29 18:00:21.716788080 +1100 +@@ -17,7 +17,7 @@ QMAKE_LFLAGS = -m64 + include(../common/g++.conf) + include(../common/linux.conf) + +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 ++QMAKE_LIBDIR_X11 = /usr/X11/lib64 ++QMAKE_LIBDIR_OPENGL = /usr/X11/lib64 + + load(qt_config)