Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

1 files changed, 15 insertions, 25 deletions

diff --git a/kde3/qt3/Pkgfile b/kde3/qt3/Pkgfile
index 4ca812439..14d54ad65 100644
--- a/kde3/qt3/Pkgfile
+++ b/kde3/qt3/Pkgfile
@@ -2,44 +2,34 @@
 # 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, libcups, qt3-devel
 
 name=qt3
 version=3.3.8b
-release=1
-source=( ftp://ftp.trolltech.com/qt/source/qt-x11-free-$version.tar.gz \
-	qt-3.3.8b-png14-1.patch )
+release=2
+source=( ftp://ftp.trolltech.com/qt/source/qt-x11-free-$version.tar.gz )
 
 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
         export PATH=$PWD/bin:$PATH
-        export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pwd`/lib"
 
-        ./configure -prefix /opt/qt \
+	echo "yes"|./configure -prefix /opt/qt \
             -docdir /opt/qt/share/doc/qt \
             -sysconfdir /etc/qt3 \
             -qt-gif \
-            -system-zlib \
-            -system-libpng \
-            -system-libjpeg \
-            -system-libmng \
-            -plugin-imgfmt-png \
-            -plugin-imgfmt-jpeg \
-            -plugin-imgfmt-mng \
+            -qt-zlib \
+            -qt-libpng \
+            -qt-libjpeg \
+            -qt-libmng \
+            -qt-imgfmt-png \
+            -qt-imgfmt-jpeg \
+            -qt-imgfmt-mng \
             -no-exceptions \
             -thread \
             -tablet
-        make src-moc sub-src
-        find . -name Makefile -exec sed -i "s|,/usr/lib|,`pwd`/lib|" {} \;
-        find . -name Makefile -exec sed -i "s|,/opt/qt/lib|,`pwd`/lib|" {} \;
-        make sub-tools
-        make INSTALL_ROOT=$PKG install
-
-        # 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 -rf $PKG/opt/qt/share/doc
+        cd src && make
+	cd ..
+	mkdir -p $PKG/opt/qt/lib
+	cp -a lib/libqt-mt.* $PKG/opt/qt/lib/
 }