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
