Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0172d4f16c9afe4800e31f05fcf0abf92cd115ae
commit 0172d4f16c9afe4800e31f05fcf0abf92cd115ae
Author: crazy <[EMAIL PROTECTED]>
Date: Sun May 18 04:48:21 2008 +0200
qt4-4.4.0-1-x86_64
QA: auto-correction for trailing whitespace test failure
diff --git a/source/xlib-extra/qt4/FrugalBuild
b/source/xlib-extra/qt4/FrugalBuild
index 64ac019..4053c3a 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -100,7 +100,7 @@ subdepends=('' \
'libqtscript libqtxml libqtgui libice libxrender libxext libqtdesigner' \
'libqtscript libqtxml libqtgui libice libxrender libxext' \
'qt4-qdbus libqtscript libqtgui libice libxrender libxext')
-# NOTE: almost all need be moved to main .. but not yet
+# NOTE: almost all need be moved to main .. but not yet
subgroups=('docs-extra' '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' \
'lib-extra qt4-libs' 'lib-extra qt4-libs' 'lib-extra qt4-libs' 'xapps-extra'
'xapps-extra' \
@@ -135,12 +135,12 @@ build()
Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "-L/usr/lib"
$Fdestdir/usr/lib/*.prl
fi
}
-
+
do_install()
{
make -C "$1" INSTALL_ROOT=$Fdestdir install || Fdie
}
-
+
do_split()
{
do_install "$1"
@@ -152,7 +152,7 @@ build()
Fpatchall
Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing -Wno-deprecated"
mkspecs/common/g++.conf
mv $Fsrcdir/{patches,apply_patches} $Fsrcdir/$origname-$pkgmore-$pkgver || Fdie
- ## compiler error with this patch
+ ## compiler error with this patch
rm -f patches/0226-qtreeview-column_resize_when_needed.diff || Fdie
chmod +x apply_patches || Fdie
./apply_patches || Fdie
@@ -183,35 +183,35 @@ build()
## Here we go
Fmessage "Running make.."
make || Fdie
-
+
## -qtestlib
do_split "src/testlib" libqttest
-
+
## -qdbus
do_install "tools/qdbus"
do_install "src/dbus"
clean_junk
-
+
# HACK!
Fmkdir tools
- Fmv usr/bin/qdbusviewer tools/qdbusviewer
+ Fmv usr/bin/qdbusviewer tools/qdbusviewer
Fsplit $pkgname-qdbus /usr
-
+
## -assistant*
do_install "tools/assistant"
clean_junk
-
+
Fmkdir usr/share/applications usr/share/pixmaps
cp -a ../assistant4.desktop $Fdestdir/usr/share/applications/ || Fdie
cp -a ../assistant4-compat.desktop $Fdestdir/usr/share/applications/ || Fdie
cp -a tools/assistant/compat/images/assistant-128.png
$Fdestdir/usr/share/pixmaps/assistant.png || Fdie
cp -a tools/assistant/compat/images/assistant-128.png
$Fdestdir/usr/share/pixmaps/assistant-compat.png || Fdie
-
+
## -libqthelp
Fsplit libqthelp usr/lib/libQtHelp.*
Fsplit libqthelp usr/lib/pkgconfig/QtHelp.*
Fsplit libqthelp usr/include/{Qt,QtHelp}
-
+
## -libqtclucene
Fsplit libqtclucene usr/lib/libQtCLucene.*
Fsplit libqtclucene usr/lib/pkgconfig/QtCLucene.*
@@ -225,18 +225,18 @@ build()
Fsplit $pkgname-assistant-compat
usr/share/applications/assistant4-compat.desktop
Fsplit $pkgname-assistant-compat usr/share/pixmaps/assistant-compat.png
Fsplit $pkgname-assistant-compat usr/bin/assistant_adp
-
+
Fsplit $pkgname-assistant /usr
-
+
## -designer
do_install "tools/designer"
clean_junk
-
+
Fmkdir usr/share/applications usr/share/pixmaps
cp -a ../designer4.desktop $Fdestdir/usr/share/applications/ || Fdie
cp -a examples/widgets/icons/images/designer.png $Fdestdir/usr/share/pixmaps/
|| Fdie
- ## broken at the moment , fix it
+ ## broken at the moment , fix it
Fsed "include/QtDesignerComponents" "include/QtDesigner"
$Fdestdir/usr/lib/pkgconfig/QtDesignerComponents.pc || Fdie
## -libqtuitools
@@ -252,27 +252,27 @@ build()
## -libqtdesigner
Fsplit libqtdesigner usr/include
- Fsplit libqtdesigner usr/lib/pkgconfig/QtDesigner.pc
+ Fsplit libqtdesigner usr/lib/pkgconfig/QtDesigner.pc
Fsplit libqtdesigner usr/lib/libQtDesigner.*
-
+
Fsplit $pkgname-designer /usr
## -linguist
do_install "tools/linguist"
clean_junk
-
+
Fmkdir usr/share/applications usr/share/pixmaps
cp -a ../linguist4.desktop $Fdestdir/usr/share/applications/ || Fdie
cp -a tools/linguist/linguist/images/icons/linguist-128-32.png \
$Fdestdir/usr/share/pixmaps/linguist.png || Fdie
Fsplit $pkgname-linguist /usr
-
+
## -tools
for tool in qtconfig pixeltool
do
do_install "tools/$tool"
done
-
+
Fmv tools/qdbusviewer usr/bin/qdbusviewer
Frm tools
Fmkdir usr/share/applications usr/share/pixmaps
@@ -287,14 +287,14 @@ build()
do
libb="libqt`echo $lib|sed 's/lib//g;s/qt//g'`"
if [ "$lib" == "corelib" ]; then
-
+
## Core lib is always needed and while we don't do -dev packages
## actually put that stuff here
for p in mkspecs qmake
do
make INSTALL_ROOT=$Fdestdir install_${p} || Fdie
done
-
+
## WTF 'tools' should have just one folder ..
for bin in moc rcc uic
do
@@ -302,11 +302,11 @@ build()
done
do_install "src/plugins/codecs"
do_install "src/$lib"
-
+
Fmkdir usr/share/$pkgname/translations etc/$pkgname
cp -a translations/*.qm $Fdestdir/usr/share/$pkgname/translations || 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*}
@@ -315,12 +315,12 @@ build()
Frm
usr/share/$pkgname/mkspecs/{features/qws/{solaris*,freebsd*,macx*,linux-{mips*,arm*,ipaq*,zylonite*,cellon*}}}
Fln linux-g++ /usr/share/$pkgname/mkspecs/default
- ## License etc
+ ## License etc
for l in *TXT GPL_* LICENSE* README INSTALL
do
Fdocrel $l
done
-
+
clean_junk
## and finally split it =)
## wrong installed , and twice
@@ -333,18 +333,18 @@ build()
do_install "src/plugins/accessible"
do_install "src/$lib"
clean_junk
-
+
## that is qt3support remove from here
- Frm
usr/lib/$pkgname/plugins/accessible/libqtaccessiblecompatwidgets.so
+ Frm
usr/lib/$pkgname/plugins/accessible/libqtaccessiblecompatwidgets.so
Fsplit $libb /usr
elif [ "$lib" == "qt3support" ]; then
-
+
do_install "src/tools/uic3"
do_install "src/$lib"
do_install "src/plugins/accessible"
do_install "tools/porting"
clean_junk
-
+
## already in qui
Frm usr/lib/$pkgname/plugins/accessible/libqtaccessiblewidgets.so
Fsplit $libb /usr
@@ -352,16 +352,16 @@ build()
do_split "src/$lib" $libb
fi
done
-
+
## -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.
do_install "demos"
@@ -372,21 +372,21 @@ build()
cp -a examples/opengl/framebufferobject/qt4-logo.png \
$Fdestdir/usr/share/pixmaps/qtdemo.png || Fdie
cp -a ../qtdemo.desktop $Fdestdir/usr/share/applications/ || Fdie
-
+
Fsplit $pkgname-demos /usr
-
+
## -plugins 'SQL' , all the other are already installed
do_install "src/plugins/sqldrivers"
-
+
## -sqlite3
Fsplit $pkgname-plugin-sqlite3
usr/lib/$pkgname/plugins/sqldrivers/libqsqlite.so
## -sqlite2
Fsplit $pkgname-plugin-sqlite2
usr/lib/$pkgname/plugins/sqldrivers/libqsqlite2.so
-
+
## -mysql
Fsplit $pkgname-plugin-mysql
usr/lib/$pkgname/plugins/sqldrivers/libqsqlmysql.so
-
+
## -odbc
Fsplit $pkgname-plugin-odbc usr/lib/$pkgname/plugins/sqldrivers/libqsqlodbc.so
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
