maj qt3-devel#3.3.8b-2, ajout des patchs

1 files changed, 26 insertions, 18 deletions

diff --git a/kde3/qt3-devel/Pkgfile b/kde3/qt3-devel/Pkgfile
index d57019d30..137ec2dfd 100644
--- a/kde3/qt3-devel/Pkgfile
+++ b/kde3/qt3-devel/Pkgfile
@@ -2,33 +2,41 @@
 # URL: http://trolltech.com/products/qt/qt3
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: xorg, libjpeg, libmng, libcups
+# Depends on: xorg, libjpeg, libmng, libcups, qt3
 
 name=qt3-devel
 version=3.3.8b
-release=1
+release=2
 source=( ftp://ftp.trolltech.com/qt/source/qt-x11-free-$version.tar.gz \
-	qt-3.3.8b-png14-1.patch )
+	http://nutyx.meticul.eu/files/patchs/qt3/qt-3.3.8b-png14-1.patch \
+	http://nutyx.meticul.eu/files/patchs/qt3/qt-patches.tar.bz2 \
+	http://nutyx.meticul.eu/files/patchs/qt3/qt-copy-kde-patches.tar.bz2\
+	http://nutyx.meticul.eu/files/patchs/qt3/utf8-bug-qt3.diff)
 
 build() {
         cd qt-x11-free-$version
-#	patch -Np1 -i ../qt-3.3.8b-png14-1.patch
-        export QTDIR=$PWD
-        sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf
+	for i in ../qt-copy-kde-patches/*
+		do patch -Np0 -i $i
+	done
+	for i in ../qt-patches/*
+		do patch -Np1 -i $i
+	done
+	patch -Np1 -i ../qt-3.3.8b-png14-1.patch
+#        patch -Np0 -i ../utf8-bug-qt3.diff
+	export QTDIR=$PWD
         export PATH=$PWD/bin:$PATH
-        export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pwd`/lib"
 
-        echo "yes"|./configure -prefix /opt/qt \
+	echo "yes"|./configure -prefix /opt/qt \
             -docdir /opt/qt/share/doc/qt \
             -sysconfdir /etc/qt3 \
             -qt-gif \
-            -qt-zlib \
-            -qt-libpng \
-            -qt-libjpeg \
-            -qt-libmng \
-            -qt-imgfmt-png \
-            -qt-imgfmt-jpeg \
-            -qt-imgfmt-mng \
+            -system-zlib \
+            -system-libpng \
+            -system-libjpeg \
+            -system-libmng \
+            -plugin-imgfmt-png \
+            -plugin-imgfmt-jpeg \
+            -plugin-imgfmt-mng \
             -no-exceptions \
             -thread \
             -tablet
@@ -38,10 +46,10 @@ build() {
         make sub-tools
         make INSTALL_ROOT=$PKG install
 
-        # correct qmake's PRL files (the libraries were placed into /usr/lib*/ and
+        # correct qmake's PRL files (the libraries were placed into
+        # /usr/lib*/ and
         # not in our temporary build directory ./work/src/..)
         sed -i "s|-L$SRC/qt-x11-free-$version/lib ||g" $PKG/opt/qt/lib/*.prl
 	rm $PKG/opt/qt/lib/libqt-mt.*
+	rm -r $PKG/opt/qt/plugins/imageformats
 }
-
-