Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=6d7d57dedc0a70241567026f68143fe75f1f9273
commit 6d7d57dedc0a70241567026f68143fe75f1f9273 Author: Elentir <[email protected]> Date: Thu May 3 22:14:35 2012 +0200 qtiplot-0.9.8.9-2-x86_64 * add patch to fix build diff --git a/source/xapps-extra/qtiplot/FrugalBuild b/source/xapps-extra/qtiplot/FrugalBuild index 4237200..d9972f7 100644 --- a/source/xapps-extra/qtiplot/FrugalBuild +++ b/source/xapps-extra/qtiplot/FrugalBuild @@ -19,13 +19,15 @@ _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-qtassist.patch) + qtiplot-0.9.8.5-qtassist.patch \ + qtiplot-missing-glu-header.patch) up2date="Flasttar http://soft.proindependent.com/download.html" sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30' \ - '04a1e263c1736c11cb42f87c6ee29522035fc077' \ + '79196d857a089365208cee0513383620c3e01e3e' \ '285f57d865956d93250ec548288c5bface096b6b' \ 'b484a4da7a0f3103e188539bfa6c1910dc9b55ca' \ - '0e70e9bfd18295b395a1bbabe723d7261a0d748d') + '0e70e9bfd18295b395a1bbabe723d7261a0d748d' \ + '12f323fc9c2f657a0379d71ea35482ea797fce13') unset MAKEFLAGS build() { diff --git a/source/xapps-extra/qtiplot/build.conf b/source/xapps-extra/qtiplot/build.conf index 5d50e5b..13772d0 100644 --- a/source/xapps-extra/qtiplot/build.conf +++ b/source/xapps-extra/qtiplot/build.conf @@ -9,7 +9,7 @@ isEmpty( QTI_ROOT ) { # Global include path which is always added at the end of the INCLUDEPATH SYS_INCLUDEPATH = /usr/include # Global lib path and libs which is ls always added at the end of LIBS -SYS_LIBS = -L/usr/lib +SYS_LIBS = -L/usr/lib -lGLU -lz ########################################################## ## zlib (http://www.zlib.net/) diff --git a/source/xapps-extra/qtiplot/qtiplot-missing-glu-header.patch b/source/xapps-extra/qtiplot/qtiplot-missing-glu-header.patch new file mode 100644 index 0000000..12165f2 --- /dev/null +++ b/source/xapps-extra/qtiplot/qtiplot-missing-glu-header.patch @@ -0,0 +1,22 @@ +diff -Naur qtiplot-0.9.8.9/3rdparty/qwtplot3d/include/qwt3d_global.h qtiplot-0.9.8.9new/3rdparty/qwtplot3d/include/qwt3d_global.h +--- qtiplot-0.9.8.9/3rdparty/qwtplot3d/include/qwt3d_global.h 2011-08-24 12:25:09.000000000 +0200 ++++ qtiplot-0.9.8.9new/3rdparty/qwtplot3d/include/qwt3d_global.h 2012-05-03 21:42:00.319533324 +0200 +@@ -2,6 +2,7 @@ + #define QWT3D_GLOBAL_H + + #include <qglobal.h> ++#include <GL/glu.h> + #if QT_VERSION < 0x040000 + #include <qmodules.h> + #endif +diff -Naur qtiplot-0.9.8.9/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.9new/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h +--- qtiplot-0.9.8.9/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2011-08-24 12:25:09.000000000 +0200 ++++ qtiplot-0.9.8.9new/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-05-03 21:42:27.350535011 +0200 +@@ -2,6 +2,7 @@ + #define __openglhelper_2003_06_06_15_49__ + + #include "qglobal.h" ++#include <GL/glu.h> + #if QT_VERSION < 0x040000 + #include <qgl.h> + #else _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
