[Frugalware-git] xfcetesting: qt4-4.7.1-4-i686

[Michel Hermier]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=432eeb81bd78182df8b9618807d035950cbedc86

commit 432eeb81bd78182df8b9618807d035950cbedc86
Author: Michel Hermier herm...@frugalware.org
Date:   Fri Feb 4 20:21:14 2011 +0100

qt4-4.7.1-4-i686

* Remove assistantclient and assistant compatibility leftovers.

diff --git a/source/xlib-extra/qt4/FrugalBuild 
b/source/xlib-extra/qt4/FrugalBuild
index 5497ee9..7ed04a7 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -35,7 +35,6 @@ export YACC='yacc -d'

# Subpackage versions checking
LIBQT3SUPPORTDEP=libqt3support=$pkgver-$pkgrel
-#LIBQTASSISTANTCLIENTDEP=libqtassistantclient=$pkgver-$pkgrel
LIBQTCLUCENEDEP=libqtclucene=$pkgver-$pkgrel
LIBQTCOREDEP=libqtcore=$pkgver-$pkgrel
LIBQTDBUSDEP=libqtdbus=$pkgver-$pkgrel
@@ -78,16 +77,6 @@ subconflicts=(${subconflicts[@]} '')
subreplaces=(${subreplaces[@]} '')
subprovides=(${subprovides[@]} '')

-#subpkgs=(${subpkgs[@]} libqtassistantclient)
-#subdescs=(${subdescs[@]} 'Qt4 AssistantClient Library')
-#subdepends=(${subdepends[@]} libice libxrender libxext)
-#subrodepends=(${subrodepends[@]} $LIBQTGUIDEP $LIBQTNETWORKDEP)
-#subgroups=(${subgroups[@]} 'xlib qt4-libs')
-#subarchs=(${subarchs[@]} 'i686 x86_64 ppc')
-#subconflicts=(${subconflicts[@]} '')
-#subreplaces=(${subreplaces[@]} '')
-#subprovides=(${subprovides[@]} '')
-
subpkgs=(${subpkgs[@]} libqtclucene)
subdescs=(${subdescs[@]} 'Qt4 CLucene Library')
subdepends=(${subdepends[@]} )
@@ -289,23 +278,12 @@ subconflicts=(${subconflicts[@]} '')
subreplaces=(${subreplaces[@]} '')
subprovides=(${subprovides[@]} '')

-#subpkgs=(${subpkgs[@]} $pkgname-assistant-compat)
-#subdescs=(${subdescs[@]} 'Qt4 Document Browser ( Compat )')
-#subdepends=(${subdepends[@]} )
-#subrodepends=(${subrodepends[@]} $LIBQTDBUSDEP $LIBQTGUIDEP 
$LIBQTNETWORKDEP)
-#subgroups=(${subgroups[@]} 'xapps-extra')
-#subarchs=(${subarchs[@]} 'i686 x86_64 ppc')
-#subconflicts=(${subconflicts[@]} '')
-#subreplaces=(${subreplaces[@]} '')
-#subprovides=(${subprovides[@]} '')
-
if Fuse $USE_DEMOS; then
Fconfopts=$Fconfopts -demosdir /usr/share/doc/$pkgname/demos -examplesdir 
/usr/share/doc/$pkgname/examples
subpkgs=(${subpkgs[@]} $pkgname-demos)
subdescs=(${subdescs[@]} 'Qt4 Demo and Example Programs.')
subdepends=(${subdepends[@]} libxdamage)
subrodepends=(${subrodepends[@]} $LIBQTDESIGNERDEP $LIBQTDBUSDEP 
$LIBQTHELPDEP $LIBQTOPENGLDEP $LIBQTSCRIPTDEP $LIBQTUITOOLSDEP 
$LIBQT3SUPPORTDEP $LIBQTSVGDEP $LIBQTTESTDEP $LIBQTWEBKITDEP)
-#subrodepends=(${subrodepends[@]} $LIBQTASSISTANTCLIENTDEP 
$LIBQTDESIGNERDEP $LIBQTDBUSDEP $LIBQTHELPDEP $LIBQTOPENGLDEP $LIBQTSCRIPTDEP 
$LIBQTUITOOLSDEP $LIBQT3SUPPORTDEP $LIBQTSVGDEP $LIBQTTESTDEP $LIBQTWEBKITDEP)
subgroups=(${subgroups[@]} 'xapps-extra')
subarchs=(${subarchs[@]} 'i686 x86_64 ppc')
subconflicts=(${subconflicts[@]} '')
@@ -536,7 +514,6 @@ build()

# Early splits.
Fsplit libqthelp /usr/share/$pkgname/translations/qt_help_\*.qm
-   #Fsplit $pkgname-assistant-compat 
/usr/share/$pkgname/translations/assistant_\*.qm
Fsplit $pkgname-tools /usr/bin/qdbusviewer

# Main splits.
@@ -546,10 +523,6 @@ build()
Fsplit libqt3support /usr/lib/$pkgname/plugins/designer/libqt3supportwidgets.so
Fsplit libqt3support /usr/share/$pkgname/q3porting.xml

-#  do_libincdirsplit libqtassistantclient /usr/include/QtAssistant
-#  Fsplit libqtassistantclient /usr/lib/libQtAssistantClient.\*
-#  Fsplit libqtassistantclient /usr/lib/pkgconfig/QtAssistantClient.\*
-
Fsplit libqtclucene /usr/lib/libQtCLucene.\*
Fsplit libqtclucene /usr/lib/pkgconfig/QtCLucene.\*

@@ -606,8 +579,6 @@ build()
Fsplit $pkgname-assistant 
/usr/bin/{assistant,qcollectiongenerator,qhelpconverter,qhelpgenerator}
Fsplit $pkgname-assistant /usr/share/$pkgname/translations/assistant_\*.qm

-   #Fsplit $pkgname-assistant-compat /usr/bin/assistant_adp
-
if Fuse $USE_DEMOS; then
Fsplit $pkgname-demos /usr/bin/qtdemo
Fsplit $pkgname-demos 
/usr/lib/$pkgname/plugins/designer/{libarthurplugin,libcontainerextension,libcustomwidgetplugin,libtaskmenuextension,libworldtimeclockplugin}.so
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] xfcetesting: qt4-4.7.1-4-i686

[Michel Hermier]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=ce3f1dbe9cb894b46914029b244ce4cf45712add

commit ce3f1dbe9cb894b46914029b244ce4cf45712add
Author: Michel Hermier herm...@frugalware.org
Date:   Fri Jan 28 14:50:55 2011 +0100

qt4-4.7.1-4-i686

* Split QtDeclarative.

diff --git a/source/xlib-extra/qt4/FrugalBuild 
b/source/xlib-extra/qt4/FrugalBuild
index 8c90996..5497ee9 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -6,7 +6,7 @@ USE_DEMOS=${USE_DEMOS:-n}
pkgname=qt4
_F_archive_name=qt-everywhere-opensource-src
pkgver=4.7.1
-pkgrel=3
+pkgrel=4
pkgdesc=The QT4 GUI toolkit.
url=http://qt.nokia.com/products/;
depends=()
@@ -39,6 +39,7 @@ LIBQT3SUPPORTDEP=libqt3support=$pkgver-$pkgrel
LIBQTCLUCENEDEP=libqtclucene=$pkgver-$pkgrel
LIBQTCOREDEP=libqtcore=$pkgver-$pkgrel
LIBQTDBUSDEP=libqtdbus=$pkgver-$pkgrel
+LIBQTDECLARATIVE=libqtdeclarative=$pkgver-$pkgrel
LIBQTDESIGNERDEP=libqtdesigner=$pkgver-$pkgrel
LIBQTGUIDEP=libqtgui=$pkgver-$pkgrel
LIBQTHELPDEP=libqthelp=$pkgver-$pkgrel
@@ -118,6 +119,16 @@ subconflicts=(${subconflicts[@]} 'qt4-qdbus')
subreplaces=(${subreplaces[@]} 'qt4-qdbus')
subprovides=(${subprovides[@]} 'qt4-qdbus')

+subpkgs=(${subpkgs[@]} libqtdeclarative)
+subdescs=(${subdescs[@]} 'Qt4 Declarative Library')
+subdepends=(${subdepends[@]} )
+subrodepends=(${subrodepends[@]} $LIBQTGUIDEP $LIBQTSCRIPTDEP $LIBQTXMLDEP)
+subgroups=(${subgroups[@]} 'lib qt4-libs')
+subarchs=(${subarchs[@]} 'i686 x86_64 ppc')
+subconflicts=(${subconflicts[@]} '')
+subreplaces=(${subreplaces[@]} '')
+subprovides=(${subprovides[@]} '')
+
subpkgs=(${subpkgs[@]} libqtdesigner)
subdescs=(${subdescs[@]} 'Qt4 Designer Library')
subdepends=(${subdepends[@]} )
@@ -551,6 +562,10 @@ build()
do_libsplit QtDBus
Fsplit libqtdbus /usr/bin/qdbus\*

+   do_libsplit QtDeclarative
+   Fsplit libqtdeclarative /usr/imports/
+   Fsplit libqtdeclarative 
/usr/lib/$pkgname/plugins/designer/libqdeclarativeview.so
+
do_libsplit QtDesigner
Fsplit libqtdesigner /usr/lib/libQtDesignerComponents.\*
Fsplit libqtdesigner /usr/lib/pkgconfig/QtDesignerComponents.\*
@@ -562,6 +577,7 @@ build()
do_libsplit QtMultimedia

do_libsplit QtNetwork
+   Fsplit libqtnetwork /usr/lib/$pkgname/plugins/bearer/

do_libsplit QtOpenGL

@@ -580,7 +596,7 @@ build()
do_libsplit QtUiTools

do_libsplit QtWebKit
-   Fsplit libqtwebkit /usr/lib/qt4/plugins/designer/libqwebview.so
+   Fsplit libqtwebkit /usr/lib/$pkgname/plugins/designer/libqwebview.so

do_libsplit QtXml
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git