diff options
| author | tnut <thierryn1 at hispeed dot ch> | 2010-10-02 21:02:04 +0200 |
|---|---|---|
| committer | tnut <thierryn1 at hispeed dot ch> | 2010-10-02 21:02:04 +0200 |
| commit | fe7e46eebc2814e8ed980f3ac91b6370a59464ca (patch) | |
| tree | 54f2fa9aec43e8d4167e79e774bfc8200bf82590 | |
| parent | 920b8aa8bf7d66d19720349fbb499e2eb719cb2f (diff) | |
| download | nutyx-extra-fe7e46eebc2814e8ed980f3ac91b6370a59464ca.tar.gz nutyx-extra-fe7e46eebc2814e8ed980f3ac91b6370a59464ca.tar.bz2 nutyx-extra-fe7e46eebc2814e8ed980f3ac91b6370a59464ca.tar.xz nutyx-extra-fe7e46eebc2814e8ed980f3ac91b6370a59464ca.zip | |
maj qt3-devel#3.3.8b-2, ajout des patchs
| -rw-r--r-- | kde3/qt3-devel/.footprint | 3 | ||||
| -rw-r--r-- | kde3/qt3-devel/.md5sum | 3 | ||||
| -rw-r--r-- | kde3/qt3-devel/Pkgfile | 44 |
3 files changed, 32 insertions, 18 deletions
diff --git a/kde3/qt3-devel/.footprint b/kde3/qt3-devel/.footprint index 289012217..e56d5eed5 100644 --- a/kde3/qt3-devel/.footprint +++ b/kde3/qt3-devel/.footprint @@ -505,13 +505,16 @@ drwxr-xr-x root/root opt/qt/mkspecs/linux-ecc-64/ -rw-r--r-- root/root opt/qt/mkspecs/linux-ecc-64/qplatformdefs.h drwxr-xr-x root/root opt/qt/mkspecs/linux-g++-32/ -rw-r--r-- root/root opt/qt/mkspecs/linux-g++-32/qmake.conf +-rw-r--r-- root/root opt/qt/mkspecs/linux-g++-32/qmake.conf.orig -rw-r--r-- root/root opt/qt/mkspecs/linux-g++-32/qplatformdefs.h drwxr-xr-x root/root opt/qt/mkspecs/linux-g++-64/ -rw-r--r-- root/root opt/qt/mkspecs/linux-g++-64/qmake.conf +-rw-r--r-- root/root opt/qt/mkspecs/linux-g++-64/qmake.conf.orig -rw-r--r-- root/root opt/qt/mkspecs/linux-g++-64/qplatformdefs.h drwxr-xr-x root/root opt/qt/mkspecs/linux-g++/ lrwxrwxrwx root/root opt/qt/mkspecs/linux-g++/linux-g++ -> /tmp/work/src/qt-x11-free-3.3.8b/mkspecs/linux-g++ -rw-r--r-- root/root opt/qt/mkspecs/linux-g++/qmake.conf +-rw-r--r-- root/root opt/qt/mkspecs/linux-g++/qmake.conf.orig -rw-r--r-- root/root opt/qt/mkspecs/linux-g++/qplatformdefs.h drwxr-xr-x root/root opt/qt/mkspecs/linux-icc/ -rw-r--r-- root/root opt/qt/mkspecs/linux-icc/qmake.conf diff --git a/kde3/qt3-devel/.md5sum b/kde3/qt3-devel/.md5sum index f20f7229d..da58a2025 100644 --- a/kde3/qt3-devel/.md5sum +++ b/kde3/qt3-devel/.md5sum @@ -1,2 +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-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 } - - |