Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=37e059b1ef89cf36eb6ab088fad329571ceac22a
commit 37e059b1ef89cf36eb6ab088fad329571ceac22a Author: Marius Cirsta <[email protected]> Date: Wed Jan 1 07:35:59 2014 +0200 qt5-5.2.0-2-x86_64 * removed libdir as it was causing path problems * added conf option to use some system libraries diff --git a/source/xlib-extra/qt5/FrugalBuild b/source/xlib-extra/qt5/FrugalBuild index 23829ab..ae125f4 100644 --- a/source/xlib-extra/qt5/FrugalBuild +++ b/source/xlib-extra/qt5/FrugalBuild @@ -10,7 +10,7 @@ USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"} pkgname=qt5 _F_archive_name=qt-everywhere-opensource-src pkgver=5.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="The Qt5 GUI toolkit." url="http://qt-project.org/" depends=() @@ -613,8 +613,8 @@ build() do_libsplit() { local pkgname="libqt5${1,,}" - Fsplit $pkgname "usr/lib/qt5/libQt5$1*" - Fsplit $pkgname "usr/lib/qt5/pkgconfig/Qt5$1*" + Fsplit $pkgname "usr/lib/libQt5$1*" + Fsplit $pkgname "usr/lib/pkgconfig/Qt5$1*" } @@ -627,7 +627,7 @@ build() do_cmakesplit() { local pkgname="libqt5${1,,}" - Fsplit $pkgname "usr/lib/qt5/cmake/Qt5$1*" + Fsplit $pkgname "usr/lib/cmake/Qt5$1*" } do_mkspecssplit() @@ -666,12 +666,13 @@ build() Fconfopts+=" -prefix /usr \ -bindir /usr/lib/qt5/bin \ -headerdir /usr/include/qt5 \ - -libdir /usr/lib/qt5 \ -archdatadir /usr/share/qt5 \ -plugindir /usr/lib/qt5/plugins \ -datadir /usr/share/qt5 \ -docdir /usr/share/doc/qt5 \ -sysconfdir /etc/qt5 \ + -system-sqlite \ + -no-rpath \ -release \ -opensource \ -confirm-license \ @@ -680,7 +681,8 @@ build() -optimized-qmake \ -dbus-linked \ -reduce-relocations \ - -cups -nis -pch -opengl" + -cups -nis -pch -opengl + -system-libpng -system-libjpeg -system-zlib" Fmake make INSTALL_ROOT=$Fdestdir install || Fdie Ffile /usr/share/applications/linguist5.desktop @@ -699,7 +701,7 @@ build() Fexec sed -i -e "s:-L$Fsrcdir/$_F_cd_path/qtbase/lib:-L/usr/lib/qt5:g" $i done sed -i "s|$Fsrcdir/$_F_cd_path/qtbase/bin/qmake|/usr/bin/qmake-qt5|" $Fdestdir/usr/share/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri || Fdie - perl -pi -e "s, -L$Fsrcdir/$_F_cd_path/?\S+,,g" $Fdestdir/usr/lib/qt5/pkgconfig/Qt5WebKit.pc + perl -pi -e "s, -L$Fsrcdir/$_F_cd_path/?\S+,,g" $Fdestdir/usr/lib/pkgconfig/Qt5WebKit.pc # Make Qt4 compatible command name in /usr/bin. @@ -761,7 +763,7 @@ build() do_split Multimedia Fsplit libqt5multimedia /usr/share/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools* - Fsplit libqt5multimedia /usr/lib/qt5/libqgsttools_p* + Fsplit libqt5multimedia /usr/lib/libqgsttools_p* Fsplit libqt5multimedia /usr/lib/qt5/plugins/audio Fsplit libqt5multimedia /usr/lib/qt5/plugins/mediaservice Fsplit libqt5multimedia /usr/lib/qt5/plugins/playlistformats @@ -843,7 +845,7 @@ build() Fsplit qt5-linguist /usr/share/qt5/phrasebooks Fsplit qt5-linguist /usr/share/qt5/translations/linguist* - Fsplit qt5-linguist /usr/lib/qt5/cmake/Qt5LinguistTools + Fsplit qt5-linguist /usr/lib/cmake/Qt5LinguistTools do_binsplit qt5-linguist lupdate do_binsplit qt5-linguist lrelease do_binsplit qt5-linguist linguist @@ -867,15 +869,15 @@ build() do_cmakesplit Core do_incsplit Core Fsplit libqt5core /usr/share/qt5/mkspecs - Fsplit libqt5core /usr/lib/qt5/cmake/Qt5 + Fsplit libqt5core /usr/lib/cmake/Qt5 do_binsplit libqt5core rcc do_binsplit libqt5core moc do_binsplit libqt5core qmake do_binsplit libqt5core syncqt do_binsplit libqt5core uic Fsplit libqt5core /usr/share/qt5/translations - Fsplit libqt5core /usr/lib/qt5/libQt5Bootstrap* - Fsplit libqt5core /usr/lib/qt5/pkgconfig/Qt5Bootstrap* + Fsplit libqt5core /usr/lib/libQt5Bootstrap* + Fsplit libqt5core /usr/lib/pkgconfig/Qt5Bootstrap* if Fuse $USE_EXAMPLES; then Fsplit qt5-examples /usr/share/doc/qt5/examples _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
