Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07d5c4030474d7e1e835f1635f6442f96b6668ac
commit 07d5c4030474d7e1e835f1635f6442f96b6668ac Author: crazy <[EMAIL PROTECTED]> Date: Fri Dec 14 12:31:09 2007 +0100 qt-3.3.8-7-i686 * Release bump * disabled OOo symlinks ( Ok @ vmiklos ) * updated qt3-copy patches diff --git a/source/xlib/qt/FrugalBuild b/source/xlib/qt/FrugalBuild index bf4fecf..36436e1 100644 --- a/source/xlib/qt/FrugalBuild +++ b/source/xlib/qt/FrugalBuild @@ -4,7 +4,7 @@ pkgname=qt pkgver=3.3.8 -pkgrel=6 +pkgrel=7 pkgmore=x11-free pkgdesc="The QT GUI toolkit." url="http://www.trolltech.com/products/qt"; @@ -16,7 +16,7 @@ options=('nodocs' 'scriptlet') removes=('usr/lib/qt/mkspecs/default') up2date="lynx -dump ftp://ftp.trolltech.com/qt/source|grep '.tar.bz2$'|grep 'qt-x11-free-'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=(ftp://ftp.trolltech.com/qt/source/$pkgname-$pkgmore-$pkgver.tar.bz2 \ - http://ftp.frugalware.org/pub/other/sources/qt/patches-510500.tar.bz2 \ + http://ftp.frugalware.org/pub/other/sources/qt/patches-748368.tar.bz2 \ qt.sh apply_patches \ 01-qt-gcc4.patch \ 02-qt-rpath+FW.patch \ @@ -25,6 +25,17 @@ source=(ftp://ftp.trolltech.com/qt/source/$pkgname-$pkgmore-$pkgver.tar.bz2 \ Qt-3.3.8-UTF-8-fix.diff \ CVE-2007-3388.patch \ CVE-2007-4137.patch) +sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' \ + '540a7111b03b0ca4c0f792e7398e49f2a55fd919' \ + 'e281176c76dc9ef0f06aba57f107ccb074eb317d' \ + '7562323175ec47483dcb45c2857519f6276e0a51' \ + '54d37e3988c4b195ae960ef2c59e678151115211' \ + '0d5fcbe569723792700bad3c82abe34d5e5163c4' \ + 'dba54b91b2b00c1d052ac512d824b29d31aefb89' \ + '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871' \ + '418b09fee387959f45f75fb20fb1e54c0f14b1cb' \ + 'f7634fb0419bda723053adb885facd270ccb10ec' \ + '12c6e2c9091c710ebd031c5e82ff33f02fe7e210') export QTDIR=$startdir/src/$pkgname-$pkgmore-$pkgver export PATH=${QTDIR}/bin:${PATH} @@ -45,16 +56,20 @@ build() Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing" mkspecs/linux-g++/qmake.conf mv $Fsrcdir/{patches,apply_patches} $Fsrcdir/$pkgname-$pkgmore-$pkgver chmod +x apply_patches - echo "0007" >> patches/DISABLED + echo "0077" >> patches/DISABLED + echo "0081" >> patches/DISABLED ./apply_patches || return 1 - ./configure -v -platform linux-g++ -prefix /usr/lib/qt -release -shared \ - -qt-gif -system-libpng -system-libjpeg -system-libmng -system-zlib \ - -plugin-imgfmt-png -plugin-imgfmt-jpeg -plugin-imgfmt-mng -largefile \ - -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite \ - -thread -stl -no-g++-exceptions \ - -enable-{dialogs,iconview,workspace,network,tools,kernel,widgets,opengl,stl,canvas,table,xml,sql,input} \ - -nis -pch -sm -tablet -xft -xinerama -xrender -xkb -ipv6 \ - -I /usr/include -L /usr/lib || return 1 + ./configure \ + -v -platform linux-g++ \ + -prefix /usr/lib/qt \ + -release -shared -qt-gif \ + -system-libpng -system-libjpeg -system-libmng -system-zlib \ + -plugin-imgfmt-png -plugin-imgfmt-jpeg -plugin-imgfmt-mng -largefile \ + -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite \ + -thread -stl -no-g++-exceptions \ + -enable-{dialogs,iconview,workspace,network,tools,kernel,widgets,opengl,stl,canvas,table,xml,sql,input} \ + -nis -pch -sm -tablet -xft -xinerama -xrender -xkb -ipv6 \ + -I /usr/include -L /usr/lib || return 1 Fmkdir /usr/lib/qt/mkspecs cp -r mkspecs/linux-g++ $Fdestdir/usr/lib/qt/mkspecs/linux-g++ ##Fixme need patch## @@ -68,7 +83,7 @@ build() make || return 1 make INSTALL_ROOT=$Fdestdir install || return 1 Fmkdir /usr/lib/$pkgname/man - cp -r $Fsrcdir/$pkgname-$pkgmore-$pkgver/doc/man/{man1,man3} $Fdestdir/usr/lib/$pkgname/man + cp -r $Fsrcdir/$pkgname-$pkgmore-$pkgver/doc/man/{man1,man3} $Fdestdir/usr/lib/$pkgname/man || Fdie Fsed "-L$startdir/src/$pkgname-$pkgmore-$pkgver/lib" "" $Fdestdir/usr/lib/$pkgname/lib/*.prl Fexe /etc/profile.d/qt.sh (cd $Fdestdir/usr/lib/qt/mkspecs; ln -sf linux-g++ default) @@ -79,22 +94,11 @@ build() Fln /usr/lib/qt/lib /usr/lib/qt/lib64 fi # symlinks for who don't care about ld.so.conf (OpenOffice.org) - Fln qt3/lib/libqt-mt.so.3 /usr/lib/libqt-mt.so.3 - Fln qt3/lib/libqui.so.1 /usr/lib/libqui.so.1 + #Fln qt/lib/libqt-mt.so.3 /usr/lib/libqt-mt.so.3 + #Fln qt/lib/libqui.so.1 /usr/lib/libqui.so.1 Fsplit qt-docs usr/lib/qt/phrasebooks Fsplit qt-docs usr/lib/qt/templates Fsplit qt-docs usr/lib/qt/doc } -sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' \ - '8fd70a87d8640915cdfff1eb26177b96fb8cb5d0' \ - 'e281176c76dc9ef0f06aba57f107ccb074eb317d' \ - '7562323175ec47483dcb45c2857519f6276e0a51' \ - '54d37e3988c4b195ae960ef2c59e678151115211' \ - '0d5fcbe569723792700bad3c82abe34d5e5163c4' \ - 'dba54b91b2b00c1d052ac512d824b29d31aefb89' \ - '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871' \ - '418b09fee387959f45f75fb20fb1e54c0f14b1cb' \ - 'f7634fb0419bda723053adb885facd270ccb10ec' \ - '12c6e2c9091c710ebd031c5e82ff33f02fe7e210') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
