Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b2440a85f2bb4064fe04b77df13dc828ceae44ce
commit b2440a85f2bb4064fe04b77df13dc828ceae44ce Author: crazy <[email protected]> Date: Tue Mar 24 09:06:30 2009 +0100 qt4-4.5.0-1-x86_64 * Version bump * TEMP disabled qt-copy patches * added phonon / phonon-backend(s) subpackages * added some new plugins * GTK style support is enabled now diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index 1959381..93b2483 100644 --- a/source/xlib-extra/qt4/FrugalBuild +++ b/source/xlib-extra/qt4/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qt4 origname=qt -pkgver=4.4.3 +pkgver=4.5.0 pkgrel=1 pkgmore=x11-opensource-src ## Dummy package is empty .. @@ -13,7 +13,7 @@ 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' 'linuxwacom' 'libice' 'libxrender' 'libxext' \ - 'libxi') + 'libxi' 'gst-plugins-base' 'libxdamage' 'gtk+2') ## 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") @@ -23,7 +23,6 @@ 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|grep -v tp[1-9]|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.bz2 \ http://ftp.frugalware.org/pub/other/sources/kde/qt4/patches-917018.tar.bz2 \ - uitools-shared.patch \ assistant4.desktop \ assistant4-compat.desktop \ designer4.desktop \ @@ -33,10 +32,9 @@ source=(ftp://ftp.trolltech.com/qt/source/$origname-$pkgmore-$pkgver.tar.bz2 \ qtdemo.desktop \ frugalware.patch \ Trolltech.conf \ - apply_patches) -sha1sums=('099bcc2dfda73f093f7e80e9004114d41db40b51' \ + apply_patches qt4-odbc.patch) +sha1sums=('db136bbed1715c155ceb610309d33f943c1df8fd' \ '5c0996849aee33089621a12655392f9d9e6c1705' \ - 'a65d9b29f2eb4c7323d33e04ccc24e7f8934aa17' \ '70413a58f1d4b7260ab407482675b8028cea4e47' \ 'ae0a66ad4fafbaa009635a9ae286949d895046e3' \ '957376dd30fdf1bbc2ff5545f2f808f90d44c4dc' \ @@ -46,15 +44,16 @@ sha1sums=('099bcc2dfda73f093f7e80e9004114d41db40b51' \ '7c47da506d5118b87a0cae775886f99fd7de4fd9' \ '8e7005b4def3722b545bbb33e3a92287076ba62e' \ '2468fea7b127253832148115d5aa9e85b2e0aea6' \ - '5a2341286f6d766ab943294aec90a8ad25d0ee1d') + '5a2341286f6d766ab943294aec90a8ad25d0ee1d' \ + 'df909e257a6663c1949a1ebda2c667cf754c7e99') 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' -## NOTE: phonon is not build yet we use the one from KDE4 untill things get sorted out -src_libs=('corelib' 'gui' 'network' 'opengl' 'qt3support' 'script' 'sql' 'svg' 'xml') + +src_libs=('corelib' 'gui' 'network' 'opengl' 'qt3support' 'script' 'sql' 'svg' 'xml' 'phonon' 'scripttools') subpkgs=("$pkgname-demos" "libqtcore" "libqtgui" "libqtnetwork" \ "libqtopengl" "libqt3support" "libqtscript" "libqtsql" "libqtsvg" \ @@ -62,14 +61,16 @@ subpkgs=("$pkgname-demos" "libqtcore" "libqtgui" "libqtnetwork" \ "$pkgname-linguist" "$pkgname-tools" "$pkgname-plugin-sqlite3" "$pkgname-plugin-sqlite2" \ "$pkgname-plugin-mysql" "$pkgname-plugin-odbc" "$pkgname-plugin-psql" "libqtwebkit" \ "libqthelp" "libqtclucene" "libqtassistantclient" "$pkgname-assistant-compat" \ - "libqtuitools" "libqtdesignercomponents" "libqtdesigner" "$pkgname-plugin-script-qtdbus") + "libqtuitools" "libqtdesignercomponents" "libqtdesigner" "$pkgname-plugin-script-qtdbus" \ + "libqtphonon" "libqtscripttools" "$pkgname-plugin-graphicssystems" "$pkgname-plugin-phonon-backend") subdescs=('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' 'Qt4 Xml Library' 'Qt4 Unit Testing Library' 'Qt4 DBus module' 'Qt4 Document Browser' \ 'Qt4 Interface Designer' 'Qt4 Translation Tool' 'Qt4 Tools' 'Qt4 SQlite3 plugin' 'Qt4 SQlite2 plugin' \ 'Qt4 MySql plugin' 'Qt4 ODBC plugin' 'Qt4 ODBC plugin' 'Qt4 WebKit Library' \ 'Qt4 Help Library' 'Qt4 CLucene Library' 'Qt4 AssistantClient Library' 'Qt4 Document Browser ( Compat )' \ - 'Qt4 QtUiTools Library' 'Qt4 QtDesignerComponents Library' 'Qt4 QtDesigner Library' 'Qt4 Dbus Script Plugin') + 'Qt4 UiTools Library' 'Qt4 DesignerComponents Library' 'Qt4 Designer Library' 'Qt4 Dbus Script Plugin' \ + 'Qt4 Phonon Library' 'Qt4 ScriptTools Library' 'Qt4 GraphicsSystems Plugin' 'Qt4 Phonon Backend(s) Plugin') subdepends=('libqthelp libqtassistantclient libqtopengl libpng libsm libxi libxrandr libxinerama fontconfig glib2 libgl libstdc++ libxdamage libqtscript libqtdesigner qt4-qdbus libqtuitools libqt3support libqtsvg libqttest libqtwebkit' \ 'libstdc++ zlib glib2' \ @@ -84,7 +85,7 @@ subdepends=('libqthelp libqtassistantclient libqtopengl libpng libsm libxi libxr 'libqtcore libgcc' \ 'dbus libqtxml libgcc' \ 'libqthelp libx11 glib2 libstdc++ libqtnetwork' \ - 'libqtdesignercomponents libqtdesigner libqtscript libpng libsm libxi libxrandr libxinerama fontconfig glib2 libstdc++ libqt3support libqtwebkit' \ + 'libqtdesignercomponents libqtdesigner libqtphonon libqtscript libpng libsm libxi libxrandr libxinerama fontconfig glib2 libstdc++ libqt3support libqtwebkit' \ 'libx11 libqtnetwork libqtuitools' \ 'libpng libsm libxi libxrandr libxinerama fontconfig glib2 libstdc++ libqt3support qt4-qdbus' \ 'sqlite3 libqtsql libgcc' \ @@ -99,7 +100,11 @@ subdepends=('libqthelp libqtassistantclient libqtopengl libpng libsm libxi libxr 'libqtxml libqtgui libice libxrender libxext libgcc' \ 'libqtscript libqtxml libqtgui libice libxrender libxext libqtdesigner' \ 'libqtscript libqtxml libqtgui libice libxrender libxext' \ - 'qt4-qdbus libqtscript libqtgui libice libxrender libxext') + 'qt4-qdbus libqtscript libqtgui libice libxrender libxext' \ + 'qt4-qdbus libqtgui libice libxrender libxext' \ + 'libqtscript libqtgui libice libxrender libxext' \ + 'libqtopengl libice libxext libgl libxdamage' \ + 'gst-plugins-base libqtphonon qt4-qdbus libqtopengl libice libxext libgl libxdamage') # NOTE: almost all need be moved to main .. but not yet subgroups=('xapps-extra' 'lib-extra qt4-libs' 'xlib-extra qt4-libs' 'lib-extra qt4-libs' \ 'xlib-extra qt4-libs' 'xlib-extra qt4-libs' 'lib-extra qt4-libs' 'lib-extra qt4-libs' 'xlib-extra qt4-libs' \ @@ -107,14 +112,14 @@ subgroups=('xapps-extra' 'lib-extra qt4-libs' 'xlib-extra qt4-libs' 'lib-extra q 'xapps-extra' 'xapps-extra' 'lib-extra qt4-libs' 'lib-extra qt4-libs' 'lib-extra qt4-libs' \ 'lib-extra qt4-libs' 'lib-extra qt4-libs' 'xlib-extra qt4-libs' 'xlib-extra qt4-libs' 'lib-extra qt4-libs' \ 'xlib-extra qt4-libs' 'xapps-extra' 'xlib-extra qt4-libs' 'xlib-extra qt4-libs' 'xlib-extra qt4-libs' \ - 'xlib-extra qt4-libs') + 'xlib-extra qt4-libs' 'xlib-extra qt4-libs' 'xlib-extra qt4-libs' 'xlib-extra qt4-libs' 'xlib-extra qt4-libs') subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ - 'i686 x86_64 ppc') + 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') build() { @@ -127,12 +132,26 @@ build() Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "-L/usr/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" "-L/usr/lib" $Fdestdir/usr/lib/*.la + Fsed "-pthread" "" $Fdestdir/usr/lib/pkgconfig/*.pc + Fsed "-L/usr/X11R6/lib64" "" $Fdestdir/usr/lib/pkgconfig/*.pc + Fsed "-L/usr/lib" "" $Fdestdir/usr/lib/pkgconfig/*.pc + Fsed "Libs.private:" "Libs.private: -L/usr/lib -pthread" $Fdestdir/usr/lib/pkgconfig/*.pc + Fsed " " " " $Fdestdir/usr/lib/pkgconfig/*.pc + Fsed " " " " $Fdestdir/usr/lib/pkgconfig/*.pc fi if ls "$Fdestdir"/usr/lib/*.prl 2>/dev/null 1>/dev/null; then Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "-L/usr/lib" $Fdestdir/usr/lib/*.prl + Fsed "-pthread" "" $Fdestdir/usr/lib/*.prl + Fsed "-L/usr/x11R6/lib64" "" $Fdestdir/usr/lib/*.prl + Fsed "-L/usr/lib" "" $Fdestdir/usr/lib/*.prl + Fsed "QMAKE_PRL_LIBS =" "QMAKE_PRL_LIBS = -L/usr/lib -pthread" $Fdestdir/usr/lib/*.prl + Fsed " " " " $Fdestdir/usr/lib/*.prl + Fsed " " " " $Fdestdir/usr/lib/*.prl + fi + if ls "$Fdestdir"/usr/lib/*.la 2>/dev/null 1>/dev/null; then + Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "-L/usr/lib" $Fdestdir/usr/lib/*.la + Fsed "-pthread" "" $Fdestdir/usr/lib/*.la + Fsed "-L/usr/x11R6/lib64" "" $Fdestdir/usr/lib/*.la fi } @@ -155,30 +174,30 @@ build() ## compiler errors / broken patches rm -fv patches/{0226-*,0242-*,0250-*,0251-*} || Fdie chmod +x apply_patches || Fdie - ./apply_patches || Fdie + #./apply_patches || Fdie ./configure \ -v -confirm-license \ -prefix /usr \ -libdir /usr/lib \ - -docdir /usr/share/doc/$pkgname-$pkgver \ + -docdir /usr/share/doc/$pkgname \ -datadir /usr/share/$pkgname \ -sysconfdir /etc/$pkgname \ -translationdir /usr/share/$pkgname/translations \ - -demosdir /usr/share/doc/$pkgname-$pkgver/demos \ - -examplesdir /usr/share/doc/$pkgname-$pkgver/examples \ + -demosdir /usr/share/doc/$pkgname/demos \ + -examplesdir /usr/share/doc/$pkgname/examples \ -plugindir /usr/lib/$pkgname/plugins \ -shared -nis -qt-gif -stl -pch -sm \ -system-libpng -system-libjpeg -system-libmng \ -system-zlib -system-sqlite -system-libtiff \ -openssl -accessibility -fontconfig \ - -no-nas-sound -no-rpath -no-phonon -no-exceptions \ + -no-nas-sound -no-rpath -no-exceptions \ -no-separate-debug-info -no-optimized-qmake -no-xmlpatterns \ - -qt3support -tablet -xinerama \ - -xrender -xkb -xshape -xrandr -cups \ + -qt3support -xinerama -xrender -xkb -xshape -xrandr \ + -cups -gtkstyle -phonon \ -plugin-sql-mysql -I/usr/include -I/usr/include/mysql/ \ -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ -plugin-sql-sqlite -plugin-sql-sqlite2 -plugin-sql-odbc \ - -qdbus -glib -fast -reduce-relocations -webkit || return 1 + -dbus -glib -fast -reduce-relocations -webkit -phonon-backend -scripttools -opengl || return 1 ## Here we go Fmessage "Running make.." @@ -316,7 +335,7 @@ build() Fln linux-g++ /usr/share/$pkgname/mkspecs/default ## License etc - for l in *TXT GPL_* LICENSE* README INSTALL + for l in *.txt *GPL_* LICENSE* README INSTALL do Fdocrel $l done @@ -356,11 +375,6 @@ build() ## -webkit do_split "src/3rdparty/webkit/WebCore" libqtwebkit - ## -docs - ##Fmkdir usr/share/doc/$pkgname-$pkgver - ##cp -ra doc/* $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie - ##Fln $pkgname-$pkgver /usr/share/doc/$pkgname - ##Fsplit $pkgname-docs /usr ## -demos and -examples both will qo to -demos subpkg ## while 'qtdemos' need that. @@ -396,6 +410,12 @@ build() ## plugins/script/qtdbus do_split "src/plugins/script/qtdbus" $pkgname-plugin-script-qtdbus + ## -graphicssystems + do_split "src/plugins/graphicssystems" $pkgname-plugin-graphicssystems + + ## -phonon backend + do_split "src/plugins/phonon" $pkgname-plugin-phonon-backend + } # optimization OK diff --git a/source/xlib-extra/qt4/qt4-odbc.patch b/source/xlib-extra/qt4/qt4-odbc.patch new file mode 100644 index 0000000..bc68216 --- /dev/null +++ b/source/xlib-extra/qt4/qt4-odbc.patch @@ -0,0 +1,25 @@ +qt-bugs@ issue: +QtSw task ID: +applied: no +author: Alex Merry + +Index: src/sql/drivers/odbc/qsql_odbc.cpp +=================================================================== +--- src/sql/drivers/odbc/qsql_odbc.cpp (revision 928726) ++++ src/sql/drivers/odbc/qsql_odbc.cpp (working copy) +@@ -64,13 +64,13 @@ QT_BEGIN_NAMESPACE + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#if defined(SQLLEN) || defined(Q_OS_WIN64) ++#if defined(SQLLEN) || defined(Q_OS_WIN64) || (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) + # define QSQLLEN SQLLEN + #else + # define QSQLLEN SQLINTEGER + #endif + +-#if defined(SQLULEN) || defined(Q_OS_WIN64) ++#if defined(SQLULEN) || defined(Q_OS_WIN64) || (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) + # define QSQLULEN SQLULEN + #else + # define QSQLULEN SQLUINTEGER _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
