summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-10-02 17:17:02 +0200
committertnut <thierryn1 at hispeed dot ch>2010-10-02 17:17:02 +0200
commit62839f1551ac504e187e1a3e5e59fd51095cf908 (patch)
tree15594013e48f76b2c5ef1a39697fcf393178952f
parentfd561a0f955a0d9845d4fda0ffecd1a1ceb9d59a (diff)
downloadnutyx-extra-62839f1551ac504e187e1a3e5e59fd51095cf908.tar.gz
nutyx-extra-62839f1551ac504e187e1a3e5e59fd51095cf908.tar.bz2
nutyx-extra-62839f1551ac504e187e1a3e5e59fd51095cf908.tar.xz
nutyx-extra-62839f1551ac504e187e1a3e5e59fd51095cf908.zip
maj qt3#3.3.8b-3
-rw-r--r--kde3/qt3/.footprint5
-rw-r--r--kde3/qt3/.md5sum4
-rw-r--r--kde3/qt3/Pkgfile39
3 files changed, 37 insertions, 11 deletions
diff --git a/kde3/qt3/.footprint b/kde3/qt3/.footprint
index 4f8aa56de..b1cf2726a 100644
--- a/kde3/qt3/.footprint
+++ b/kde3/qt3/.footprint
@@ -7,3 +7,8 @@ lrwxrwxrwx root/root opt/qt/lib/libqt-mt.so -> libqt-mt.so.3.3.8
lrwxrwxrwx root/root opt/qt/lib/libqt-mt.so.3 -> libqt-mt.so.3.3.8
lrwxrwxrwx root/root opt/qt/lib/libqt-mt.so.3.3 -> libqt-mt.so.3.3.8
-rwxr-xr-x root/root opt/qt/lib/libqt-mt.so.3.3.8
+drwxr-xr-x root/root opt/qt/plugins/
+drwxr-xr-x root/root opt/qt/plugins/imageformats/
+-rwxr-xr-x root/root opt/qt/plugins/imageformats/libqjpeg.so
+-rwxr-xr-x root/root opt/qt/plugins/imageformats/libqmng.so
+-rwxr-xr-x root/root opt/qt/plugins/imageformats/libqpng.so
diff --git a/kde3/qt3/.md5sum b/kde3/qt3/.md5sum
index 3698ec0b4..da58a2025 100644
--- a/kde3/qt3/.md5sum
+++ b/kde3/qt3/.md5sum
@@ -1 +1,5 @@
+ce498b3d6994d765edc54dc08872813e qt-3.3.8b-png14-1.patch
+e0a3ede21ab2876d2295897d38f592b8 qt-copy-kde-patches.tar.bz2
+2f00e5c0c1e2c2a23dddc982cd79f3e0 qt-patches.tar.bz2
9f05b4125cfe477cc52c9742c3c09009 qt-x11-free-3.3.8b.tar.gz
+f6b3b39040f2b8f19ba1cf1445468c28 utf8-bug-qt3.diff
diff --git a/kde3/qt3/Pkgfile b/kde3/qt3/Pkgfile
index 14d54ad65..e2718806c 100644
--- a/kde3/qt3/Pkgfile
+++ b/kde3/qt3/Pkgfile
@@ -6,30 +6,47 @@
name=qt3
version=3.3.8b
-release=2
-source=( ftp://ftp.trolltech.com/qt/source/qt-x11-free-$version.tar.gz )
+release=3
+source=( ftp://ftp.trolltech.com/qt/source/qt-x11-free-$version.tar.gz \
+ 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
- export QTDIR=$PWD
+ 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
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
cd src && make
cd ..
- mkdir -p $PKG/opt/qt/lib
+ cd plugins/src
+ make sub-imageformats
+ cd ../..
+ mkdir -p $PKG/opt/qt/{lib,plugins/imageformats}
cp -a lib/libqt-mt.* $PKG/opt/qt/lib/
+ cp -a plugins/imageformats/* \
+ $PKG/opt/qt/plugins/imageformats/
}