[arch-commits] Commit in qtiplot/trunk (4 files)

[Eric Bélanger]

    Date: Sunday, January 29, 2012 @ 20:35:05
  Author: eric
Revision: 148019

upgpkg: qtiplot 0.9.8.8-2

Rebuild against libpng 1.5 and libtiff 4.0

Added:
  qtiplot/trunk/qwtplot3d-libpng15.patch
  qtiplot/trunk/qwtplot3d-qt-4.8.0.patch
Modified:
  qtiplot/trunk/PKGBUILD
  qtiplot/trunk/build.conf.archlinux

--------------------------+
 PKGBUILD                 |   14 ++++++++++----
 build.conf.archlinux     |    3 ++-
 qwtplot3d-libpng15.patch |   10 ++++++++++
 qwtplot3d-qt-4.8.0.patch |   34 ++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-30 01:00:56 UTC (rev 148018)
+++ PKGBUILD	2012-01-30 01:35:05 UTC (rev 148019)
@@ -5,7 +5,7 @@
 
 pkgname=qtiplot
 pkgver=0.9.8.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://soft.proindependent.com/qtiplot.html"
 pkgdesc="Data analysis and scientific plotting - free clone of Origin"
@@ -24,16 +24,20 @@
         qtiplot.xml
 	qtiplot-0.9.8.6-gold.patch
 	qtiplot-0.9.8.6-kde.patch
-	qtiplot-0.9.8.6-tamuanova.patch)
+	qtiplot-0.9.8.6-tamuanova.patch
+        qwtplot3d-qt-4.8.0.patch
+        qwtplot3d-libpng15.patch)
 sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48'
           '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
           '4301cb2a36024a10108b689990d28c4fe5c7416e'
-          'b3af6c866b3e63b537b418b6d00e57ef468f8f2b'
+          '326ee6bc623a637d058ab7ee9f65fede40a23a09'
           '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
           '285f57d865956d93250ec548288c5bface096b6b'
           'b534a609f317cf3117d6495909854cdacea20124'
           'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
-          '830b518e3ef63625df84363a8047417124f243b0')
+          '830b518e3ef63625df84363a8047417124f243b0'
+          '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
+          '4a45ee21f028f34da75d83c0d3e1d08c5f928892')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -58,6 +62,8 @@
 
   # Make qwtplot3d
   cd ../qwtplot3d
+  patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
+  patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
   qmake
   make
 

Modified: build.conf.archlinux
===================================================================
--- build.conf.archlinux	2012-01-30 01:00:56 UTC (rev 148018)
+++ build.conf.archlinux	2012-01-30 01:35:05 UTC (rev 148019)
@@ -3,7 +3,7 @@
 }
 
 SYS_INCLUDEPATH = /usr/include
-SYS_LIBS = -L/usr/lib
+SYS_LIBS = -L/usr/lib -lGLU
 
 MUPARSER_LIBS = -lmuparser 
 GSL_LIBS = -lgsl -lgslcblas
@@ -18,6 +18,7 @@
 QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine
 TAMUANOVA_LIBS = -ltamuanova
 TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova
+LIBPNG_LIBS = -lpng
 
 PYTHON = python2
 LUPDATE = lupdate

Added: qwtplot3d-libpng15.patch
===================================================================
--- qwtplot3d-libpng15.patch	                        (rev 0)
+++ qwtplot3d-libpng15.patch	2012-01-30 01:35:05 UTC (rev 148019)
@@ -0,0 +1,10 @@
+--- 3rdparty/gl2ps/gl2ps.c.orig	2012-01-29 18:15:34.000000000 -0500
++++ 3rdparty/gl2ps/gl2ps.c	2012-01-29 18:16:08.000000000 -0500
+@@ -47,6 +47,7 @@
+ #endif
+ 
+ #if defined(GL2PS_HAVE_LIBPNG)
++#include <zlib.h>
+ #include <png.h>
+ #endif
+ 

Added: qwtplot3d-qt-4.8.0.patch
===================================================================
--- qwtplot3d-qt-4.8.0.patch	                        (rev 0)
+++ qwtplot3d-qt-4.8.0.patch	2012-01-30 01:35:05 UTC (rev 148019)
@@ -0,0 +1,34 @@
+diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
+--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:42:01.000000000 -0500
++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:58:30.000000000 -0500
+@@ -2,12 +2,7 @@
+ #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
+ 
+ #include <time.h>
+-
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
+ 
+ #include "qwt3d_types.h"
+ #include "qwt3d_io.h"
+diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+--- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:42:01.000000000 -0500
++++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:57:21.000000000 -0500
+@@ -2,11 +2,8 @@
+ #define __openglhelper_2003_06_06_15_49__
+ 
+ #include "qglobal.h"
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
++#include <GL/glu.h>
+ 
+ namespace Qwt3D
+ {