From 6f23476cefe7577659cd2351bdd2ee46dfe407a4 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 3 Jun 2020 13:36:37 +0200 Subject: qwtplot3d-qt5 neu --- qwtplot3d-qt5/PKGBUILD | 57 ++++++++++++++++++++++++++++++++++ qwtplot3d-qt5/qwtplot3d-gcc44.patch | 12 +++++++ qwtplot3d-qt5/qwtplot3d-qt-4.8.0.patch | 34 ++++++++++++++++++++ qwtplot3d-qt5/qwtplot3d-qt5.patch | 19 ++++++++++++ 4 files changed, 122 insertions(+) create mode 100644 qwtplot3d-qt5/PKGBUILD create mode 100644 qwtplot3d-qt5/qwtplot3d-gcc44.patch create mode 100644 qwtplot3d-qt5/qwtplot3d-qt-4.8.0.patch create mode 100644 qwtplot3d-qt5/qwtplot3d-qt5.patch (limited to 'qwtplot3d-qt5') diff --git a/qwtplot3d-qt5/PKGBUILD b/qwtplot3d-qt5/PKGBUILD new file mode 100644 index 00000000..0d4db8fd --- /dev/null +++ b/qwtplot3d-qt5/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Erich Eckner +# Contributor: Mirko Scholz +# modeled after qwtplot3d +# Contributor: Ronald van Haren +# Contributor: damir + +pkgname=qwtplot3d-qt5 +pkgver=0.2.7 +pkgrel=3 +pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets" +arch=('i686' 'pentium4' 'x86_64') +license=('custom:zlib') +url="http://qwtplot3d.sourceforge.net/" +depends=('qt5-base') +makedepends=('mesa' 'glu') +source=("https://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz" + qwtplot3d-gcc44.patch + qwtplot3d-qt-4.8.0.patch + qwtplot3d-qt5.patch) +sha512sums=('88e6d270695931775f3c1c0e718118e31118dbfe9f5f582834de09ab515fdf9e8a0f90d424f276653fdf1cf0b39e2060282385701a4ab48843420fe55a1dcf0c' + '4f10bfabc68ec313aa8f3f624632c59bfad18f701bc802cd222607ac551b2ad6736dca14e3b63bd238c9c2b68128cb0b66eb1801dc6efebc800e71b0d03cbd31' + '7cb30ea968e491b0bdfd6a27ce6a47dfbf9888048a4368b14947988e29f4041814d9f452960851d959177a5ced58fda74f4cfdac1f178bb6b44fb9ccc98d53c7' + '7cd4def315f238acb61f8416c06012c16967985bda8762fd6aff512b1690ae3d2c29fb5fc35c61bd1c95df99344f245fd1cff12542a87dfa9baaf7a80c58f67b') + +prepare() { + cd qwtplot3d + patch -p1 -i "${srcdir}"/qwtplot3d-gcc44.patch + patch -p1 -i "${srcdir}"/qwtplot3d-qt-4.8.0.patch + patch -p1 -i "${srcdir}"/qwtplot3d-qt5.patch +} + +build() { + cd qwtplot3d + # build qwt: + qmake-qt5 qwtplot3d.pro "CONFIG+=staticlib" + make +} + +package() { + cd qwtplot3d + + # install qwtplot3d: (by hand, because the Makefile do not provide a "install:") + install -d "${pkgdir}"/usr/{include/qt/qwtplot3d-qt5,lib} + + for n in include/* ; do + install -Dm644 $n "${pkgdir}"/usr/include/qt/qwtplot3d-qt5 + done + +# for n in lib/libqwtplot3d-qt5.so* ; do +# cp -d $n "${pkgdir}"/usr/lib +# done + install -Dm644 lib/libqwtplot3d-qt5.a "${pkgdir}"/usr/lib + + # install custom license + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + diff --git a/qwtplot3d-qt5/qwtplot3d-gcc44.patch b/qwtplot3d-qt5/qwtplot3d-gcc44.patch new file mode 100644 index 00000000..a76fe831 --- /dev/null +++ b/qwtplot3d-qt5/qwtplot3d-gcc44.patch @@ -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 + + namespace Qwt3D + { +Only in qwtplot3d/tmp: qwt3d_function.o diff --git a/qwtplot3d-qt5/qwtplot3d-qt-4.8.0.patch b/qwtplot3d-qt5/qwtplot3d-qt-4.8.0.patch new file mode 100644 index 00000000..ae10f48f --- /dev/null +++ b/qwtplot3d-qt5/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 +- +-#if QT_VERSION < 0x040000 +-#include +-#else +-#include +-#endif ++#include + + #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 +-#else +-#include +-#endif ++#include ++#include + + namespace Qwt3D + { diff --git a/qwtplot3d-qt5/qwtplot3d-qt5.patch b/qwtplot3d-qt5/qwtplot3d-qt5.patch new file mode 100644 index 00000000..3af95c31 --- /dev/null +++ b/qwtplot3d-qt5/qwtplot3d-qt5.patch @@ -0,0 +1,19 @@ +diff -u10 -r qwtplot3d/qwtplot3d.pro qwtplot3d.1/qwtplot3d.pro +--- qwtplot3d/qwtplot3d.pro 2007-05-20 17:51:50.000000000 +0200 ++++ qwtplot3d.1/qwtplot3d.pro 2019-07-05 13:12:47.367738983 +0200 +@@ -1,14 +1,14 @@ + # pro file for building the makefile for qwtplot3d + # + +-TARGET = qwtplot3d ++TARGET = qwtplot3d-qt5 + TEMPLATE = lib + CONFIG += qt warn_on opengl thread zlib debug + MOC_DIR = tmp + OBJECTS_DIR = tmp + INCLUDEPATH = include + DEPENDPATH = include src + DESTDIR = lib + #DESTDIR = ../../../lib + QT += opengl + -- cgit v1.2.3-54-g00ecf