[arch-commits] Commit in qwtplot3d/trunk (PKGBUILD qwtplot3d-qt-4.8.0.patch)

Ronald van Haren ronald at archlinux.org
Tue Jan 24 18:37:10 UTC 2012


    Date: Tuesday, January 24, 2012 @ 13:37:09
  Author: ronald
Revision: 147207

upgpkg: qwtplot3d 0.2.7-4

qt 4.8.0 fix

Added:
  qwtplot3d/trunk/qwtplot3d-qt-4.8.0.patch
Modified:
  qwtplot3d/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   12 ++++++++----
 qwtplot3d-qt-4.8.0.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-24 17:51:49 UTC (rev 147206)
+++ PKGBUILD	2012-01-24 18:37:09 UTC (rev 147207)
@@ -1,21 +1,25 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
 
 pkgname=qwtplot3d
 pkgver=0.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
 arch=("i686" "x86_64")
 license=('custom:zlib')
 url="http://qwtplot3d.sourceforge.net/"
 depends=('qt' 'qwt' 'mesa')
 source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
-        qwtplot3d-gcc44.patch)
-sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215')
+        qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
+sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
+          '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
+          '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
 
 build() {
     cd ${srcdir}/${pkgname}
     patch -p1 < ../qwtplot3d-gcc44.patch
+    patch -p1 < ../qwtplot3d-qt-4.8.0.patch
 
     # build qwt:
     qmake qwtplot3d.pro

Added: qwtplot3d-qt-4.8.0.patch
===================================================================
--- qwtplot3d-qt-4.8.0.patch	                        (rev 0)
+++ qwtplot3d-qt-4.8.0.patch	2012-01-24 18:37:09 UTC (rev 147207)
@@ -0,0 +1,34 @@
+diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h
+--- qwtplot3d/include/qwt3d_io_gl2ps.h	2005-07-10 16:54:52.000000000 +0300
++++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h	2012-01-21 22:15:20.000000000 +0200
+@@ -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 -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h
+--- qwtplot3d/include/qwt3d_openglhelper.h	2005-07-19 17:40:28.000000000 +0300
++++ qwtplot3d.patched/include/qwt3d_openglhelper.h	2012-01-21 22:29:56.000000000 +0200
+@@ -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
+ {




More information about the arch-commits mailing list