diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-25 23:14:53 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-25 23:14:53 +0000 |
| commit | a61c6fb05ec1cbc6845b2ed4077ce0c5950c36ed (patch) | |
| tree | 7f7f0f3918738e6a508485da2242eec835d6e2ea /extra/qwtplot3d | |
| parent | 2aa2acfff38de7de825868995e49792ecfc03126 (diff) | |
Wed Jan 25 23:14:53 UTC 2012
Diffstat (limited to 'extra/qwtplot3d')
| -rw-r--r-- | extra/qwtplot3d/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch | 34 |
2 files changed, 43 insertions, 5 deletions
diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD index 8bd7c546b..b72402f4a 100644 --- a/extra/qwtplot3d/PKGBUILD +++ b/extra/qwtplot3d/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 131790 2011-07-15 09:16:14Z ronald $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 147208 2012-01-24 18:38:05Z ronald $ +# Maintainer: Ronald van Haren <ronald@archlinux.org> +# Contributor: damir <damir@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 diff --git a/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch new file mode 100644 index 000000000..ae10f48f0 --- /dev/null +++ b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch @@ -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
+ {
|