[Frugalware-git] frugalware-current: qt4-4.3.2-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d8b7695c451d2d25b965ee4b190b7851366b800a
commit d8b7695c451d2d25b965ee4b190b7851366b800a
Author: crazy [EMAIL PROTECTED]
Date: Thu Nov 8 21:56:49 2007 +0100
qt4-4.3.2-2-i686
* removed qt4.sh and added QTDIR and QMAKESPECS so qmake.conf
* removed dummy patch and added frugalware.patch
* disabled sse2 , breaks older CPU's we still support
* removed more crap from /mkspecs/ folder
diff --git a/source/xlib-extra/qt4/FrugalBuild
b/source/xlib-extra/qt4/FrugalBuild
index 1ab0cf0..a64a06e 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -28,7 +28,7 @@
source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.gz \
qt4config.desktop \
qdbusviewer.desktop \
qtdemo.desktop \
- dummy.patch qt4.sh \
+ frugalware.patch \
Trolltech.conf \
apply_patches)
sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \
@@ -39,8 +39,7 @@ sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \
'1097be47724cda110a0d099c58a2f2ff6dcacc1e' \
'2099d1e1ef2172369c2b5f51e3dcf88fd66ba38c' \
'7c47da506d5118b87a0cae775886f99fd7de4fd9' \
- '6868adc53c2037a83b0601c92ea39dd3394a8fdf' \
- 'bafdd4d0fe8d2c0caae0720f5f6b9f193d4744e0' \
+ '98e3beebe7540262ed2f33d36373650aaca5cf14' \
'2468fea7b127253832148115d5aa9e85b2e0aea6' \
'5a2341286f6d766ab943294aec90a8ad25d0ee1d')
@@ -159,7 +158,8 @@ build()
-no-separate-debug-info \
-optimized-qmake \
-fast \
- -reduce-relocations || return 1
+ -reduce-relocations \
+ -no-sse2 || return 1
## Here we go
Fmessage Running make..
@@ -244,14 +244,15 @@ build()
do_install src/plugins/codecs
do_install src/$lib
- Fmkdir usr/share/$pkgname/translations
etc/{$pkgname,profile.d}
+ Fmkdir usr/share/$pkgname/translations etc/$pkgname
cp -a translations/*.qm $Fdestdir/usr/share/$pkgname/translations || Fdie
- cp -a ../qt4.sh $Fdestdir/etc/profile.d/qt4.sh || Fdie
cp -a ../Trolltech.conf $Fdestdir/etc/$pkgname/Trolltech.conf || Fdie
## delete things we don't want / need
Frm usr/share/$pkgname/mkspecs/{win32*,*bsd*,aix-*,hpux*,darwin*,irix-*,macx*}
Frm usr/share/$pkgname/mkspecs/{solaris*,sco*,tru64*,unixware*,hurd*,default*}
+ Frm
usr/share/$pkgname/mkspecs/{linux-{ecc*,icc*,kcc*,lsb*,pgcc,cxx*}}
+ Frm
usr/share/$pkgname/mkspecs/{features/{mac,win32},qws/{solaris*,freebsd*,macx*,linux-{mips*,arm*,ipaq*,zylonite*,cellon*}}}
Fln linux-g++ /usr/share/$pkgname/mkspecs/default
## License etc
diff --git a/source/xlib-extra/qt4/dummy.patch
b/source/xlib-extra/qt4/dummy.patch
deleted file mode 100644
index b160579..000
--- a/source/xlib-extra/qt4/dummy.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur qt-x11-opensource-src-4.2.0/mkspecs/common/g++.conf
qt-x11-opensource-src-4.2.0-p/mkspecs/common/g++.conf
qt-x11-opensource-src-4.2.0/mkspecs/common/g++.conf2006-09-29
16:44:55.0 +0200
-+++ qt-x11-opensource-src-4.2.0-p/mkspecs/common/g++.conf 2006-10-05
15:38:30.0 +0200
-@@ -11,7 +11,7 @@
- QMAKE_CFLAGS_DEPS += -M
- QMAKE_CFLAGS_WARN_ON += -Wall -W
- QMAKE_CFLAGS_WARN_OFF += -w
--QMAKE_CFLAGS_RELEASE += -O2
-+QMAKE_CFLAGS_RELEASE += DUMMY
- QMAKE_CFLAGS_DEBUG+= -g
- QMAKE_CFLAGS_SHLIB+= -fPIC
- QMAKE_CFLAGS_STATIC_LIB += -fPIC
-diff -Naur qt-x11-opensource-src-4.2.0/mkspecs/common/linux.conf
qt-x11-opensource-src-4.2.0-p/mkspecs/common/linux.conf
qt-x11-opensource-src-4.2.0/mkspecs/common/linux.conf 2006-09-29
16:44:55.0 +0200
-+++ qt-x11-opensource-src-4.2.0-p/mkspecs/common/linux.conf2006-10-05
15:53:38.0 +0200
-@@ -3,12 +3,12 @@
-
- QMAKE_INCDIR =
- QMAKE_LIBDIR =
--QMAKE_INCDIR_X11 = /usr/X11R6/include
--QMAKE_LIBDIR_X11 = /usr/X11R6/lib
-+QMAKE_INCDIR_X11 = /usr/X11/include
-+QMAKE_LIBDIR_X11 = /usr/X11/lib
- QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
- QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
--QMAKE_INCDIR_OPENGL = /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-+QMAKE_INCDIR_OPENGL = /usr/X11/include
-+QMAKE_LIBDIR_OPENGL = /usr/X11/lib
-
- QMAKE_LIBS=
- QMAKE_LIBS_DYNLOAD= -ldl
diff --git a/source/xlib-extra/qt4/frugalware.patch
b/source/xlib-extra/qt4/frugalware.patch
new file mode 100644
index 000..40a8c55
--- /dev/null
+++ b/source/xlib-extra/qt4/frugalware.patch
@@ -0,0 +1,44 @@
+diff -Naur qt-x11-opensource-src-4.3.2/mkspecs/common/g++.conf
qt-x11-opensource-src-4.3.2-no-qt4.sh/mkspecs/common/g++.conf
+--- qt-x11-opensource-src-4.3.2/mkspecs/common/g++.conf2007-10-01
15:05:55.0 +0200
qt-x11-opensource-src-4.3.2-no-qt4.sh/mkspecs/common/g++.conf
2007-11-08 21:18:19.0 +0100
+@@ -7,7 +7,7 @@
+ QMAKE_CFLAGS_DEPS += -M
+ QMAKE_CFLAGS_WARN_ON += -Wall -W
+
[Frugalware-git] frugalware-current: qt4-4.3.2-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f12ca7a8095833b4081e02d5303f1dd9a4d2265e
commit f12ca7a8095833b4081e02d5303f1dd9a4d2265e
Author: crazy [EMAIL PROTECTED]
Date: Tue Nov 6 15:34:23 2007 +0100
qt4-4.3.2-2-i686
* release bump ( uhh an somewhat big one from one fpm make 23 :P )
* all is split off , qt4 is by now a dummy package but
* it has rodepends() so nothing breaks till I correct the depends
* added missing desktop files , fixed icons
* re-added glib2 to depends , enabled openssl support
* corrected group(s)
diff --git a/source/kde-extra/qt4/CVE-2007-4137.patch
b/source/kde-extra/qt4/CVE-2007-4137.patch
deleted file mode 100644
index e2bbdd0..000
--- a/source/kde-extra/qt4/CVE-2007-4137.patch
+++ /dev/null
@@ -1,11 +0,0 @@
src/corelib/codecs/qutfcodec.cpp
-+++ src/corelib/codecs/qutfcodec.cpp
-@@ -140,7 +140,7 @@ void QUtf8Codec::convertToUnicode(QString *target, const
char *chars, int len, C
-
- int originalLength = target-length();
- QString result = *target;
--result.resize(originalLength + len); // worst case
-+result.resize(originalLength + len + 1); // worst case
- QChar *qch = result.data() + originalLength;
- uchar ch;
- int invalid = 0;
diff --git a/source/kde-extra/qt4/FrugalBuild b/source/kde-extra/qt4/FrugalBuild
index 7f0a484..87943a2 100644
--- a/source/kde-extra/qt4/FrugalBuild
+++ b/source/kde-extra/qt4/FrugalBuild
@@ -4,48 +4,124 @@
pkgname=qt4
origname=qt
pkgver=4.3.2
-pkgrel=1
+pkgrel=2
pkgmore=x11-opensource-src
+## Dummy package is empty ..
pkgdesc=The QT4 GUI toolkit.
url=http://www.trolltech.com/products/qt;
-depends=('libxrandr' 'mesa=6.5.3' 'libxft' 'libmng' 'libjpeg' 'libxcursor'
'libxinerama' 'freetype2' \
- 'libsm' 'libpng' 'libxtst' 'fontconfig' 'dbus=0.93')
-makedepends=('mysql=5.0.15' 'postgresql=8.2' 'cups' 'bison' 'flex'
'unixodbc' 'imake' 'sqlite3' 'sqlite2')
-rodepends=('dejavu-ttf')
-groups=('kde-extra')
+depends=()
+makedepends=('libxrandr' 'mesa=6.5.3' 'libxft' 'libmng' 'libjpeg'
'libxcursor' 'libxinerama' 'freetype2' \
+ 'libsm' 'libpng' 'libxtst' 'fontconfig' 'dbus=0.93' 'mysql=5.0.15'
'postgresql=8.2' 'cups' 'bison' \
+ 'flex' 'unixodbc' 'imake' 'sqlite3' 'sqlite2' 'openssl')
+## this is here till I've fixed all reverse depends so we not break all apps
using qt4 by now
+rodepends=(libqtcore libqtgui libqtnetwork libqtopengl libqt3support
libqtscript libqtsql \
+ libqtsvg libqtxml libqttest qt4-qdbus $pkgname-tools)
+groups=('xlib-extra')
archs=('i686' 'x86_64')
-options=('nodocs' 'scriptlet')
+options=('scriptlet' 'nodocs')
up2date=lynx -dump ftp://ftp.trolltech.com/qt/source/|grep
'qt-x11-opensource-src'|grep -v rc[1-9]|grep -v beta|sort -n -r|head -n 1|sed
's/.*-\(.*\).t.*/\1/'
source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.gz \
http://ftp.frugalware.org/pub/other/sources/kde/qt4/patches-r732042.tar.bz2 \
- assistant4.desktop designer4.desktop linguist4.desktop
qt4config.desktop \
- dummy.patch qt4.sh.off Trolltech.conf apply_patches)
-
+ assistant4.desktop \
+ designer4.desktop \
+ linguist4.desktop \
+ qt4config.desktop \
+ qdbusviewer.desktop \
+ qtdemo.desktop \
+ dummy.patch qt4.sh \
+ Trolltech.conf \
+ apply_patches)
+sha1sums=('265fb56ded2e7ff101ebd722bd2bc1638f96057d' \
+ 'f30fcd8715ee711956ba51387b441d71eaef05dc' \
+ '70413a58f1d4b7260ab407482675b8028cea4e47' \
+ '957376dd30fdf1bbc2ff5545f2f808f90d44c4dc' \
+ 'bc6527ee1d672cc192c667aeb49540b166e96949' \
+ '1097be47724cda110a0d099c58a2f2ff6dcacc1e' \
+ '2099d1e1ef2172369c2b5f51e3dcf88fd66ba38c' \
+ '7c47da506d5118b87a0cae775886f99fd7de4fd9' \
+ '6868adc53c2037a83b0601c92ea39dd3394a8fdf' \
+ 'bafdd4d0fe8d2c0caae0720f5f6b9f193d4744e0' \
+ '2468fea7b127253832148115d5aa9e85b2e0aea6' \
+ '5a2341286f6d766ab943294aec90a8ad25d0ee1d')
export QTDIR=$startdir/src/$origname-$pkgmore-$pkgver
export PATH=${QTDIR}/bin:${PATH}
export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
export YACC='yacc -d'
-## corelib gui network opengl qt3support
-## script sql svg tools xml
+src_libs=('corelib' 'gui' 'network' 'opengl' 'qt3support' 'script' 'sql' 'svg'
'xml')
+
+subpkgs=($pkgname-docs $pkgname-demos libqtcore libqtgui
libqtnetwork \
+libqtopengl libqt3support libqtscript libqtsql libqtsvg \
+libqtxml libqttest $pkgname-qdbus $pkgname-assistant
$pkgname-designer \
+$pkgname-linguist $pkgname-tools $pkgname-plugin-sqlite3
$pkgname-plugin-sqlite2 \
+$pkgname-plugin-mysql $pkgname-plugin-odbc $pkgname-plugin-psql)
+subdescs=('Qt4 Documentation.' 'Qt4 Demo and Example Programs.' 'Qt4 Core
Library' 'Qt4 Gui Library' \
+ 'Qt4 Network Library' 'Qt4 OpenGL Library' 'Qt4 Qt3support Library'
'Qt4 Script Library' 'Qt4 Sql Library' \
+ 'Qt4 Svg Library'
[Frugalware-git] frugalware-current: qt4-4.3.2-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9b05068dd3ac2bc4c37a02282b82df1e0bfb0d2
commit e9b05068dd3ac2bc4c37a02282b82df1e0bfb0d2
Author: crazy [EMAIL PROTECTED]
Date: Tue Nov 6 20:04:27 2007 +0100
qt4-4.3.2-2-i686
* fix missmerged huncks
diff --git a/source/xlib-extra/qt4/FrugalBuild
b/source/xlib-extra/qt4/FrugalBuild
index 87943a2..e64e2b0 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -70,7 +70,7 @@ subdepends=('' 'libqtopengl glib2 qt4-designer qt4-qdbus
libqt3support libqtsvg
'qt4-qdbus libqtxml libqtgui libqtnetwork libqtcore' \
'qt4-assistant libqtscript libqtxml libqtgui libqtnetwork libqtcore libqtsql' \
'libqtnetwork libqtxml libqtgui libqtcore qt4-assistant' \
- 'libqtxml libqtcore qt4-assistant libqtgui libqtnetwork
libqt3support libqtsql' \
+ 'qt4-qdbus libqtxml libqtcore qt4-assistant libqtgui libqtnetwork
libqt3support libqtsql' \
'sqlite3 libqtsql' 'sqlite2 libqtsql' 'libmysqlclient libqtsql' 'unixodbc
libqtsql' \
'libpq libqtsql')
# NOTE: almost all need be moved to main .. but not yet
@@ -93,15 +93,15 @@ build()
## TODO: GOD! , write an patch for this and send upstream ...
find $Fdestdir/usr/lib -type f -name '*prl' -print -exec sed -i -e
/^QMAKE_PRL_BUILD_DIR/d {} \;
if [ -d $Fdestdir/usr/lib/pkgconfig ]; then
- Fsed -L$startdir/src/$origname-$pkgmore-$pkgver/lib
$Fdestdir/usr/lib/pkgconfig/*.pc
+ Fsed -L$startdir/src/$origname-$pkgmore-$pkgver/lib
$Fdestdir/usr/lib/pkgconfig/*.pc
Fsed $startdir/src/$origname-$pkgmore-$pkgver/bin/moc /usr/bin/moc
$Fdestdir/usr/lib/pkgconfig/*.pc
Fsed $startdir/src/$origname-$pkgmore-$pkgver/bin/uic /usr/bin/uic
$Fdestdir/usr/lib/pkgconfig/*.pc
fi
if ls $Fdestdir/usr/lib/*.la 2/dev/null 1/dev/null; then
- Fsed -L$startdir/src/$origname-$pkgmore-$pkgver/lib
$Fdestdir/usr/lib/*.la
+ Fsed -L$startdir/src/$origname-$pkgmore-$pkgver/lib
$Fdestdir/usr/lib/*.la
fi
if ls $Fdestdir/usr/lib/*.prl 2/dev/null 1/dev/null; then
- Fsed -L$startdir/src/$origname-$pkgmore-$pkgver/lib
$Fdestdir/usr/lib/*.prl
+ Fsed -L$startdir/src/$origname-$pkgmore-$pkgver/lib
$Fdestdir/usr/lib/*.prl
fi
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
