Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bba49c4dcdc31f730d029e9f179104267480c570
commit bba49c4dcdc31f730d029e9f179104267480c570 Author: Marius Cirsta <[email protected]> Date: Wed Aug 27 12:12:42 2014 +0300 qwt-6.1.0-1-x86_64 * version bump diff --git a/source/xlib-extra/qwt/FrugalBuild b/source/xlib-extra/qwt/FrugalBuild index 61b2790..4c8e58a 100644 --- a/source/xlib-extra/qwt/FrugalBuild +++ b/source/xlib-extra/qwt/FrugalBuild @@ -2,18 +2,19 @@ # Maintainer: Melko <[email protected]> pkgname=qwt -pkgver=5.2.2 +pkgver=6.1.0 pkgrel=1 pkgdesc="2D plotting library (Qt4)" depends=('libqtsvg') makedepends=('qt4-designer') groups=('xlib-extra') archs=('i686' 'x86_64') +_F_archive_grepv="rc[0-9]" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge source=($source config.pri.patch) -sha1sums=('77de405c5f9867a001f0e0a668154023faccb0a0' \ - 'ab9bc30864e1fa710a2a9e7e2bcae7e412ed21c7') +sha1sums=('48a967038f7aa9a9c87c64bcb2eb07c5df375565' \ + '22c81a311fe64bbea10cd794e561fac5461fbbde') subpkgs=("$pkgname-docs" "$pkgname-designer-plugin") subdescs=('Documentation for Qwt' 'Qwt Qt4 Designer Plugin.') @@ -24,9 +25,6 @@ subarchs=('i686 x86_64' 'i686 x86_64') build() { - ## WOW what a nice build system ;) - unset MAKEFLAGS - Fcd Fpatchall /usr/bin/qmake qwt.pro || Fdie @@ -41,6 +39,8 @@ build() Fmv usr/share/html usr/share/doc/$pkgname-$pkgver/ Frm usr/share/man/man3/todo* Fsplit $pkgname-docs usr/share/doc/$pkgname-$pkgver/html + Fmkdir usr/lib/qt4 + Fmv usr/plugins usr/lib/qt4/ Fsplit $pkgname-designer-plugin usr/lib/qt4 } diff --git a/source/xlib-extra/qwt/config.pri.patch b/source/xlib-extra/qwt/config.pri.patch index 89f20e7..3cddc03 100644 --- a/source/xlib-extra/qwt/config.pri.patch +++ b/source/xlib-extra/qwt/config.pri.patch @@ -1,30 +1,19 @@ -diff -Naur qwt-5.1.0/qwtconfig.pri qwt-5.1.0-p/qwtconfig.pri ---- qwt-5.1.0/qwtconfig.pri 2008-05-01 15:43:56.000000000 +0200 -+++ qwt-5.1.0-p/qwtconfig.pri 2008-05-02 12:06:34.000000000 +0200 -@@ -8,7 +8,7 @@ - VERSION = $$VER_MAJ.$$VER_MIN.$$VER_PAT +--- qwt-6.1.0/qwtconfig.pri 2013-05-30 18:18:27.767341938 +0300 ++++ qwt-6.1.0.new/qwtconfig.pri 2014-08-27 11:41:09.768891342 +0300 +@@ -19,14 +19,14 @@ + QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] unix { -- INSTALLBASE = /usr/local/qwt-$$VERSION -+ INSTALLBASE = /usr +- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION ++ QWT_INSTALL_PREFIX = /usr } win32 { -@@ -17,7 +17,7 @@ + QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION + } target.path = $$INSTALLBASE/lib headers.path = $$INSTALLBASE/include -doc.path = $$INSTALLBASE/doc +doc.path = $$INSTALLBASE/share - - ###################################################################### - # qmake internal options -@@ -97,7 +97,7 @@ - # QwtSVGItem. - ###################################################################### - --#CONFIG += QwtSVGItem -+CONFIG += QwtSVGItem - - ###################################################################### - # If you have a commercial license you can use the MathML renderer + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
