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

Reply via email to