[arch-commits] Commit in qwtplot3d/repos (4 files)

[Felix Yan]

    Date: Friday, November 9, 2018 @ 22:29:45
  Author: felixonmars
Revision: 338680

archrelease: copy trunk to staging-x86_64

Added:
  qwtplot3d/repos/staging-x86_64/
  qwtplot3d/repos/staging-x86_64/PKGBUILD
    (from rev 338679, qwtplot3d/trunk/PKGBUILD)
  qwtplot3d/repos/staging-x86_64/qwtplot3d-gcc44.patch
    (from rev 338679, qwtplot3d/trunk/qwtplot3d-gcc44.patch)
  qwtplot3d/repos/staging-x86_64/qwtplot3d-qt-4.8.0.patch
    (from rev 338679, qwtplot3d/trunk/qwtplot3d-qt-4.8.0.patch)

--------------------------+
 PKGBUILD                 |   49 +++++++++++++++++++++++++++++++++++++++++++++
 qwtplot3d-gcc44.patch    |   12 +++++++++++
 qwtplot3d-qt-4.8.0.patch |   34 +++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)

Copied: qwtplot3d/repos/staging-x86_64/PKGBUILD (from rev 338679, qwtplot3d/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-11-09 22:29:45 UTC (rev 338680)
@@ -0,0 +1,49 @@
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=qwtplot3d
+pkgver=0.2.7
+pkgrel=10
+pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
+arch=("x86_64")
+license=('custom:zlib')
+url="http://qwtplot3d.sourceforge.net/"
+depends=('qt4')
+makedepends=('mesa' 'glu')
+source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
+        qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
+sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
+          '52fa169b651a98550f8a8391ddf52e0eaeb2c215'
+          '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
+
+prepare() {
+    cd ${pkgname}
+    patch -p1 -i "${srcdir}"/qwtplot3d-gcc44.patch
+    patch -p1 -i "${srcdir}"/qwtplot3d-qt-4.8.0.patch
+}
+
+build() {
+    cd ${pkgname}
+    # build qwt:
+    qmake-qt4 qwtplot3d.pro
+    make
+}
+
+package() {
+    cd ${pkgname}
+
+    # install qwtplot3d: (by hand, because the Makefile do not provide a "install:")
+    install -d "${pkgdir}"/usr/{include/qwtplot3d,lib}
+
+    for n in include/* ; do
+     cp -d $n "${pkgdir}"/usr/include/qwtplot3d
+    done
+
+    for n in lib/libqwtplot3d.so* ; do
+     cp -d $n "${pkgdir}"/usr/lib
+    done
+
+    # install custom license
+    install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+

Copied: qwtplot3d/repos/staging-x86_64/qwtplot3d-gcc44.patch (from rev 338679, qwtplot3d/trunk/qwtplot3d-gcc44.patch)
===================================================================
--- staging-x86_64/qwtplot3d-gcc44.patch	                        (rev 0)
+++ staging-x86_64/qwtplot3d-gcc44.patch	2018-11-09 22:29:45 UTC (rev 338680)
@@ -0,0 +1,12 @@
+diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h
+--- qwtplot3d-orig/include/qwt3d_function.h	2009-07-25 18:18:58.000000000 -0400
++++ qwtplot3d/include/qwt3d_function.h	2009-07-25 18:19:19.000000000 -0400
+@@ -2,6 +2,7 @@
+ #define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code
+ 
+ #include "qwt3d_gridmapping.h"
++#include <cstdio>
+ 
+ namespace Qwt3D
+ {
+Only in qwtplot3d/tmp: qwt3d_function.o

Copied: qwtplot3d/repos/staging-x86_64/qwtplot3d-qt-4.8.0.patch (from rev 338679, qwtplot3d/trunk/qwtplot3d-qt-4.8.0.patch)
===================================================================
--- staging-x86_64/qwtplot3d-qt-4.8.0.patch	                        (rev 0)
+++ staging-x86_64/qwtplot3d-qt-4.8.0.patch	2018-11-09 22:29:45 UTC (rev 338680)
@@ -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
+ {