Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=a2bb4457f0afed8519a2aa07cd8a1384bc65f76e
commit a2bb4457f0afed8519a2aa07cd8a1384bc65f76e Author: Elentir <elen...@frugalware.org> Date: Tue May 17 19:30:15 2011 +0200 qtiplot-0.9.8.6-1-x86_64 * version bump diff --git a/source/xapps-extra/qtiplot/FrugalBuild b/source/xapps-extra/qtiplot/FrugalBuild index 5643747..8a7ebc2 100644 --- a/source/xapps-extra/qtiplot/FrugalBuild +++ b/source/xapps-extra/qtiplot/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Elentir <elen...@frugalware.org> pkgname=qtiplot -pkgver=0.9.8.5 -pkgrel=2 +pkgver=0.9.8.6 +pkgrel=1 pkgdesc="QtiPlot is a professional scientific data analysis and visualisation solution" depends=('libboost>=1.46.1' 'pyqt4' 'muparser' 'gsl' 'libglu' 'libqtassistantclient' \ 'libglu' 'libqt3support' 'libqtopengl' 'tamu_anova') @@ -19,14 +19,14 @@ _F_desktop_categories="Qt;Education;Science;" _F_desktop_mimetypes="application/x-qtiplot-project;application/x-qtiplot-project-compressed;application/x-qtiplot-project-backup" source=($source build.conf qtiplot.xml \ http://download.berlios.de/qtiplot/QTeXEngine-0.2-opensource.zip \ - qtiplot-0.9.8.5-tamuanova.patch \ + qtiplot-0.9.8.6-tamuanova.patch \ qtiplot-0.9.8.5-qtassist.patch) up2date="Flasttar http://soft.proindependent.com/download.html" -sha1sums=('0305097eb096adf332d319b0619c14fc42f01cf4' \ +sha1sums=('e8a5ea1e1fb0e87cf76985f63b25e263b03f5fa9' \ '04a1e263c1736c11cb42f87c6ee29522035fc077' \ '285f57d865956d93250ec548288c5bface096b6b' \ 'b484a4da7a0f3103e188539bfa6c1910dc9b55ca' \ - 'd46045ac63cdb7735121120054705be5c37f0649' \ + '830b518e3ef63625df84363a8047417124f243b0' \ '0e70e9bfd18295b395a1bbabe723d7261a0d748d') unset MAKEFLAGS diff --git a/source/xapps-extra/qtiplot/qtiplot-0.9.8.5-tamuanova.patch b/source/xapps-extra/qtiplot/qtiplot-0.9.8.5-tamuanova.patch deleted file mode 100644 index 61647be..0000000 --- a/source/xapps-extra/qtiplot/qtiplot-0.9.8.5-tamuanova.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro -index 95a5f0c..72e99ab 100755 ---- a/qtiplot/qtiplot.pro -+++ b/qtiplot/qtiplot.pro -@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) { - !isEmpty(TAMUANOVA_LIBS) { - DEFINES += HAVE_TAMUANOVA - INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH -- #LIBS += $$TAMUANOVA_LIBS -- -- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h -- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c -- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c -+ LIBS += $$TAMUANOVA_LIBS - } - - ############################################################### - - # At the very end: add global include- and lib path --#unix:INCLUDEPATH += $$SYS_INCLUDEPATH --#unix:LIBS += $$SYS_LIBS -+unix:INCLUDEPATH += $$SYS_INCLUDEPATH -+unix:LIBS += $$SYS_LIBS - - ############################################################### - ############### Building QtiPlot as a browser plugin ########## -@@ -230,14 +226,15 @@ contains(CONFIG, BrowserPlugin){ - } - - QT += sql --LIBS += src/plugins/libQtiPlotdBasePlugin.a --LIBS += src/plugins/libQtiPlotDatabasePlugin.a --LIBS += src/plugins/libQtiPlotCsvPlugin.a --LIBS += src/plugins/libQtiPlotTexPlugin.a --LIBS += src/plugins/libQtiPlotOdsPlugin.a --LIBS += src/plugins/libQtiPlotExcelPlugin.a --LIBS += src/plugins/libQtiPlotOriginPlugin.a --LIBS += src/plugins/libQtiPlotEmfExportPlugin.a --LIBS += ../3rdparty/quazip/lib/libquazip.a --LIBS += ../3rdparty/EmfEngine/libEmfEngine.a --LIBS += -lgdiplus -+#LIBS += src/plugins/libQtiPlotdBasePlugin.a -+#LIBS += src/plugins/libQtiPlotDatabasePlugin.a -+#LIBS += src/plugins/libQtiPlotCsvPlugin.a -+#LIBS += src/plugins/libQtiPlotTexPlugin.a -+#LIBS += src/plugins/libQtiPlotOdsPlugin.a -+#LIBS += src/plugins/libQtiPlotExcelPlugin.a -+#LIBS += src/plugins/libQtiPlotOriginPlugin.a -+#LIBS += src/plugins/libQtiPlotEmfExportPlugin.a -+#LIBS += -lquazip -+#LIBS += ../3rdparty/EmfEngine/libEmfEngine.a -+#LIBS += -lgdiplus -+ diff --git a/source/xapps-extra/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/source/xapps-extra/qtiplot/qtiplot-0.9.8.6-tamuanova.patch new file mode 100644 index 0000000..1644266 --- /dev/null +++ b/source/xapps-extra/qtiplot/qtiplot-0.9.8.6-tamuanova.patch @@ -0,0 +1,26 @@ +diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro +index 95a5f0c..72e99ab 100755 +--- a/qtiplot/qtiplot.pro ++++ b/qtiplot/qtiplot.pro +@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) { + !isEmpty(TAMUANOVA_LIBS) { + DEFINES += HAVE_TAMUANOVA + INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH +- #LIBS += $$TAMUANOVA_LIBS +- +- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h +- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c +- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c ++ LIBS += $$TAMUANOVA_LIBS + } + + ############################################################### + + # At the very end: add global include- and lib path +-#unix:INCLUDEPATH += $$SYS_INCLUDEPATH +-#unix:LIBS += $$SYS_LIBS ++unix:INCLUDEPATH += $$SYS_INCLUDEPATH ++unix:LIBS += $$SYS_LIBS + + ############################################################### + ############### Building QtiPlot as a browser plugin ########## _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git