* [gentoo-commits] proj/sci:master commit in: x11-libs/qwtplot3d/files/, x11-libs/qwtplot3d/
@ 2020-11-09 13:22 Benda XU
0 siblings, 0 replies; 2+ messages in thread
From: Benda XU @ 2020-11-09 13:22 UTC (permalink / raw
To: gentoo-commits
commit: 718586177ca45409ed649fd7177e34eed52dd599
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Oct 26 12:09:08 2020 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 13:22:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=71858617
x11-libs/qwtplot3d: 3d version of qwt
removed from ::gentoo on 2018 02 13 for not being qt5 compatible
minor patching actually does make this work with qt5 though
patches from the original ebuild and from the AUR(for qt5 compat)
https://github.com/gentoo/gentoo/commit/3b7c44cdd1e605ed5e35ae26e9f898306f431b87
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch | 28 +++++
x11-libs/qwtplot3d/files/qwtplot3d-examples.patch | 125 +++++++++++++++++++++
x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch | 12 ++
x11-libs/qwtplot3d/files/qwtplot3d-profile.patch | 27 +++++
x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch | 34 ++++++
x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch | 31 +++++
x11-libs/qwtplot3d/metadata.xml | 16 +++
x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild | 66 +++++++++++
8 files changed, 339 insertions(+)
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
new file mode 100644
index 000000000..b0632a380
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
@@ -0,0 +1,28 @@
+--- qwtplot3d/doc/Doxyfile.doxygen.orig 2007-11-26 22:30:57.000000000 +0000
++++ qwtplot3d/doc/Doxyfile.doxygen 2007-11-26 22:30:03.000000000 +0000
+@@ -116,7 +116,7 @@
+ HTML_ALIGN_MEMBERS = YES
+ GENERATE_HTMLHELP = NO
+ CHM_FILE = qwtplot3d.chm
+-HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
++#HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
+ GENERATE_CHI = NO
+ BINARY_TOC = YES
+ TOC_EXPAND = YES
+@@ -181,7 +181,7 @@
+ MACRO_EXPANSION = NO
+ EXPAND_ONLY_PREDEF = NO
+ SEARCH_INCLUDES = YES
+-INCLUDE_PATH = V:/cvs/qwtplot3d/include/
++INCLUDE_PATH = ../include
+ INCLUDE_FILE_PATTERNS = *.h
+ PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \
+ QT_VERSION=0x040000
+@@ -212,7 +212,6 @@
+ GRAPHICAL_HIERARCHY = YES
+ DIRECTORY_GRAPH = YES
+ DOT_IMAGE_FORMAT = png
+-DOT_PATH = V:/graphviz/Graphviz/bin/
+ DOTFILE_DIRS =
+ MAX_DOT_GRAPH_WIDTH = 974
+ MAX_DOT_GRAPH_HEIGHT = 10000
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
new file mode 100644
index 000000000..f142c3379
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
@@ -0,0 +1,125 @@
+diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp
+--- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:21:56.000000000 +0000
+@@ -9,7 +9,7 @@
+
+ #include "axes.h"
+ #include "axesmainwindow.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_function.h>
+
+ using namespace std;
+ using namespace Qwt3D;
+diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro
+--- qwtplot3d.orig/examples/common.pro 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/common.pro 2007-11-26 23:43:33.000000000 +0000
+@@ -1,13 +1,13 @@
+ TEMPLATE = app
+-CONFIG += qt warn_on thread debug
++CONFIG += qt warn_on thread
+ UI_DIR = tmp
+ MOC_DIR = tmp
+ OBJECTS_DIR = tmp
+-INCLUDEPATH += ../../include
++INCLUDEPATH += /usr/include/qwtplot3d
+ DEPENDPATH = $$INCLUDEPATH
+ DESTDIR = ../bin
+
+-unix:LIBS += -lqwtplot3d -L../../lib
++unix:LIBS += -lqwtplot3d
+ linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
+
+ win32{
+@@ -25,7 +25,7 @@
+ ISQT4 = $$find(MYVERSION, ^[2-9])
+
+ !isEmpty( ISQT4 ) {
+-RESOURCES = ../images.qrc
++#RESOURCES = ../images.qrc
+ QT += opengl
+ }
+
+diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp
+--- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:22:48.000000000 +0000
+@@ -6,7 +6,7 @@
+
+ #include "enrichmentmainwindow.h"
+ #include "enrichments.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_function.h>
+
+ using namespace Qwt3D;
+
+diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h
+--- qwtplot3d.orig/examples/mesh2/src/colormapreader.h 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/colormapreader.h 2007-11-26 22:23:19.000000000 +0000
+@@ -5,7 +5,7 @@
+ #include <qframe.h>
+ #include <qpixmap.h>
+
+-#include "../../../include/qwt3d_types.h"
++#include <qwt3d_types.h>
+
+ #if QT_VERSION < 0x040000
+
+diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h
+--- qwtplot3d.orig/examples/mesh2/src/functions.h 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/functions.h 2007-11-26 22:23:47.000000000 +0000
+@@ -2,8 +2,8 @@
+ #define __EXAMPLE_H__
+
+ #include <math.h>
+-#include "../../../include/qwt3d_parametricsurface.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_parametricsurface.h>
++#include <qwt3d_function.h>
+
+ using namespace Qwt3D;
+
+diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h
+--- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/lightingdlg.h 2007-11-26 22:24:41.000000000 +0000
+@@ -3,10 +3,10 @@
+
+ #include <math.h>
+ #include <qapplication.h>
+-#include "../../../include/qwt3d_parametricsurface.h"
+-#include "../../../include/qwt3d_surfaceplot.h"
+-#include "../../../include/qwt3d_enrichment.h"
+-#include "../../../include/qwt3d_color.h"
++#include <qwt3d_parametricsurface.h>
++#include <qwt3d_surfaceplot.h>
++#include <qwt3d_enrichment.h>
++#include <qwt3d_color.h>
+
+ #if QT_VERSION < 0x040000
+ #include "lightingdlgbase.h"
+diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp
+--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:25:33.000000000 +0000
+@@ -33,9 +33,9 @@
+ #include "colormapreader.h"
+ #include "lightingdlg.h"
+ #include "femreader.h"
+-#include "../../../include/qwt3d_io.h"
+-#include "../../../include/qwt3d_io_gl2ps.h"
+-#include "../../../include/qwt3d_io_reader.h"
++#include <qwt3d_io.h>
++#include <qwt3d_io_gl2ps.h>
++#include <qwt3d_io_reader.h>
+
+ using namespace Qwt3D;
+ using namespace std;
+diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h
+--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:26:09.000000000 +0000
+@@ -1,7 +1,7 @@
+ #ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
+ #define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
+
+-#include "../../../include/qwt3d_surfaceplot.h"
++#include <qwt3d_surfaceplot.h>
+
+
+ #if QT_VERSION < 0x040000
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
new file mode 100644
index 000000000..a76fe831a
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/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 <cstdio>
+
+ namespace Qwt3D
+ {
+Only in qwtplot3d/tmp: qwt3d_function.o
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
new file mode 100644
index 000000000..831ad558d
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
@@ -0,0 +1,27 @@
+--- qwtplot3d.orig/qwtplot3d.pro 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/qwtplot3d.pro 2007-11-26 23:45:18.000000000 +0000
+@@ -3,7 +3,7 @@
+
+ TARGET = qwtplot3d
+ TEMPLATE = lib
+-CONFIG += qt warn_on opengl thread zlib debug
++CONFIG += qt warn_on opengl thread zlib
+ MOC_DIR = tmp
+ OBJECTS_DIR = tmp
+ INCLUDEPATH = include
+@@ -21,7 +21,7 @@
+ win32:CONFIG -= zlib
+
+ linux-g++:TMAKE_CXXFLAGS += -fno-exceptions
+-unix:VERSION = 0.2.6
++unix:VERSION = 0.2.7
+
+ # Input
+ SOURCES += src/qwt3d_axis.cpp \
+@@ -92,4 +92,4 @@
+ DEFINES += GL2PS_HAVE_ZLIB
+ win32:LIBS += zlib.lib
+ unix:LIBS += -lz
+-}
+\ No newline at end of file
++}
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch
new file mode 100644
index 000000000..ae10f48f0
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/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
+ {
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
new file mode 100644
index 000000000..81a77e132
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
@@ -0,0 +1,31 @@
+--- qwtplot3d.pro.orig 2009-04-07 19:45:29.985645378 +0100
++++ qwtplot3d.pro 2009-04-07 19:46:50.095747068 +0100
+@@ -80,13 +80,11 @@
+ include/qwt3d_graphplot.h \
+ include/qwt3d_multiplot.h
+
+-# gl2ps support
+-HEADERS+=3rdparty/gl2ps/gl2ps.h \
+- include/qwt3d_io_gl2ps.h
++# gl2ps support taken from system libs
++HEADERS+=include/qwt3d_io_gl2ps.h
+
+-SOURCES+=src/qwt3d_io_gl2ps.cpp \
+- 3rdparty/gl2ps/gl2ps.c
+-
++SOURCES+=src/qwt3d_io_gl2ps.cpp
++unix:LIBS += -lgl2ps
+ # zlib support for gl2ps
+ zlib {
+ DEFINES += GL2PS_HAVE_ZLIB
+--- src/qwt3d_io_gl2ps.cpp.orig 2009-04-07 19:44:38.536418391 +0100
++++ src/qwt3d_io_gl2ps.cpp 2009-04-07 19:45:03.685133854 +0100
+@@ -4,7 +4,7 @@
+
+ #include <time.h>
+ #include "qwt3d_openglhelper.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include <gl2ps.h>
+ #include "qwt3d_io_gl2ps.h"
+ #include "qwt3d_plot.h"
+
diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml
new file mode 100644
index 000000000..bfd320fe9
--- /dev/null
+++ b/x11-libs/qwtplot3d/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ QwtPlot3D is a graphics extension to the Qt GUI application framework.
+ It provides a 3D plotting widget for scientific data and mathematical expressions.
+ It compares to the existing Qwt Project.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">qwtplot3d</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild
new file mode 100644
index 000000000..954735573
--- /dev/null
+++ b/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="3D plotting library for Qt5"
+HOMEPAGE="http://qwtplot3d.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="ZLIB"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE="doc examples"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ x11-libs/gl2ps
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-profile.patch"
+ "${FILESDIR}/${PN}-examples.patch"
+ "${FILESDIR}/${PN}-doxygen.patch"
+ "${FILESDIR}/${PN}-gcc44.patch"
+ "${FILESDIR}/${PN}-qt-4.8.0.patch"
+)
+
+src_prepare() {
+ default
+ eapply -p0 "${FILESDIR}/${PN}-sys-gl2ps.patch"
+ cat >> ${PN}.pro <<-EOF
+ target.path = "${EPREFIX}/usr/$(get_libdir)"
+ headers.path = "${EPREFIX}/usr/include/${PN}"
+ headers.files = \$\$HEADERS
+ INSTALLS = target headers
+ EOF
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_compile() {
+ default
+ if use doc ; then
+ cd doc || die
+ doxygen Doxyfile.doxygen || die "doxygen failed"
+ HTML_DOCS="doc/web/doxygen/"
+ fi
+}
+
+src_install () {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+ if use examples; then
+ insinto /usr/share/${PN}
+ doins -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: x11-libs/qwtplot3d/files/, x11-libs/qwtplot3d/
@ 2021-05-23 12:47 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2021-05-23 12:47 UTC (permalink / raw
To: gentoo-commits
commit: b9b7bb15c33c320aa1d027f5d01b26bc9505123a
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 11:24:28 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun May 23 11:24:28 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b9b7bb15
x11-libs/qwtplot3d: move to ::gentoo
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch | 28 -----
x11-libs/qwtplot3d/files/qwtplot3d-examples.patch | 125 ---------------------
x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch | 12 --
x11-libs/qwtplot3d/files/qwtplot3d-profile.patch | 27 -----
x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch | 34 ------
x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch | 31 -----
x11-libs/qwtplot3d/metadata.xml | 16 ---
x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild | 66 -----------
8 files changed, 339 deletions(-)
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
deleted file mode 100644
index b0632a380..000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- qwtplot3d/doc/Doxyfile.doxygen.orig 2007-11-26 22:30:57.000000000 +0000
-+++ qwtplot3d/doc/Doxyfile.doxygen 2007-11-26 22:30:03.000000000 +0000
-@@ -116,7 +116,7 @@
- HTML_ALIGN_MEMBERS = YES
- GENERATE_HTMLHELP = NO
- CHM_FILE = qwtplot3d.chm
--HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
-+#HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
- GENERATE_CHI = NO
- BINARY_TOC = YES
- TOC_EXPAND = YES
-@@ -181,7 +181,7 @@
- MACRO_EXPANSION = NO
- EXPAND_ONLY_PREDEF = NO
- SEARCH_INCLUDES = YES
--INCLUDE_PATH = V:/cvs/qwtplot3d/include/
-+INCLUDE_PATH = ../include
- INCLUDE_FILE_PATTERNS = *.h
- PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \
- QT_VERSION=0x040000
-@@ -212,7 +212,6 @@
- GRAPHICAL_HIERARCHY = YES
- DIRECTORY_GRAPH = YES
- DOT_IMAGE_FORMAT = png
--DOT_PATH = V:/graphviz/Graphviz/bin/
- DOTFILE_DIRS =
- MAX_DOT_GRAPH_WIDTH = 974
- MAX_DOT_GRAPH_HEIGHT = 10000
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
deleted file mode 100644
index f142c3379..000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp
---- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:21:56.000000000 +0000
-@@ -9,7 +9,7 @@
-
- #include "axes.h"
- #include "axesmainwindow.h"
--#include "../../../include/qwt3d_function.h"
-+#include <qwt3d_function.h>
-
- using namespace std;
- using namespace Qwt3D;
-diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro
---- qwtplot3d.orig/examples/common.pro 2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/common.pro 2007-11-26 23:43:33.000000000 +0000
-@@ -1,13 +1,13 @@
- TEMPLATE = app
--CONFIG += qt warn_on thread debug
-+CONFIG += qt warn_on thread
- UI_DIR = tmp
- MOC_DIR = tmp
- OBJECTS_DIR = tmp
--INCLUDEPATH += ../../include
-+INCLUDEPATH += /usr/include/qwtplot3d
- DEPENDPATH = $$INCLUDEPATH
- DESTDIR = ../bin
-
--unix:LIBS += -lqwtplot3d -L../../lib
-+unix:LIBS += -lqwtplot3d
- linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
-
- win32{
-@@ -25,7 +25,7 @@
- ISQT4 = $$find(MYVERSION, ^[2-9])
-
- !isEmpty( ISQT4 ) {
--RESOURCES = ../images.qrc
-+#RESOURCES = ../images.qrc
- QT += opengl
- }
-
-diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp
---- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:22:48.000000000 +0000
-@@ -6,7 +6,7 @@
-
- #include "enrichmentmainwindow.h"
- #include "enrichments.h"
--#include "../../../include/qwt3d_function.h"
-+#include <qwt3d_function.h>
-
- using namespace Qwt3D;
-
-diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h
---- qwtplot3d.orig/examples/mesh2/src/colormapreader.h 2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/mesh2/src/colormapreader.h 2007-11-26 22:23:19.000000000 +0000
-@@ -5,7 +5,7 @@
- #include <qframe.h>
- #include <qpixmap.h>
-
--#include "../../../include/qwt3d_types.h"
-+#include <qwt3d_types.h>
-
- #if QT_VERSION < 0x040000
-
-diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h
---- qwtplot3d.orig/examples/mesh2/src/functions.h 2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/mesh2/src/functions.h 2007-11-26 22:23:47.000000000 +0000
-@@ -2,8 +2,8 @@
- #define __EXAMPLE_H__
-
- #include <math.h>
--#include "../../../include/qwt3d_parametricsurface.h"
--#include "../../../include/qwt3d_function.h"
-+#include <qwt3d_parametricsurface.h>
-+#include <qwt3d_function.h>
-
- using namespace Qwt3D;
-
-diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h
---- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h 2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/mesh2/src/lightingdlg.h 2007-11-26 22:24:41.000000000 +0000
-@@ -3,10 +3,10 @@
-
- #include <math.h>
- #include <qapplication.h>
--#include "../../../include/qwt3d_parametricsurface.h"
--#include "../../../include/qwt3d_surfaceplot.h"
--#include "../../../include/qwt3d_enrichment.h"
--#include "../../../include/qwt3d_color.h"
-+#include <qwt3d_parametricsurface.h>
-+#include <qwt3d_surfaceplot.h>
-+#include <qwt3d_enrichment.h>
-+#include <qwt3d_color.h>
-
- #if QT_VERSION < 0x040000
- #include "lightingdlgbase.h"
-diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp
---- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:25:33.000000000 +0000
-@@ -33,9 +33,9 @@
- #include "colormapreader.h"
- #include "lightingdlg.h"
- #include "femreader.h"
--#include "../../../include/qwt3d_io.h"
--#include "../../../include/qwt3d_io_gl2ps.h"
--#include "../../../include/qwt3d_io_reader.h"
-+#include <qwt3d_io.h>
-+#include <qwt3d_io_gl2ps.h>
-+#include <qwt3d_io_reader.h>
-
- using namespace Qwt3D;
- using namespace std;
-diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h
---- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:26:09.000000000 +0000
-@@ -1,7 +1,7 @@
- #ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
- #define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
-
--#include "../../../include/qwt3d_surfaceplot.h"
-+#include <qwt3d_surfaceplot.h>
-
-
- #if QT_VERSION < 0x040000
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
deleted file mode 100644
index a76fe831a..000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
deleted file mode 100644
index 831ad558d..000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- qwtplot3d.orig/qwtplot3d.pro 2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/qwtplot3d.pro 2007-11-26 23:45:18.000000000 +0000
-@@ -3,7 +3,7 @@
-
- TARGET = qwtplot3d
- TEMPLATE = lib
--CONFIG += qt warn_on opengl thread zlib debug
-+CONFIG += qt warn_on opengl thread zlib
- MOC_DIR = tmp
- OBJECTS_DIR = tmp
- INCLUDEPATH = include
-@@ -21,7 +21,7 @@
- win32:CONFIG -= zlib
-
- linux-g++:TMAKE_CXXFLAGS += -fno-exceptions
--unix:VERSION = 0.2.6
-+unix:VERSION = 0.2.7
-
- # Input
- SOURCES += src/qwt3d_axis.cpp \
-@@ -92,4 +92,4 @@
- DEFINES += GL2PS_HAVE_ZLIB
- win32:LIBS += zlib.lib
- unix:LIBS += -lz
--}
-\ No newline at end of file
-+}
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch
deleted file mode 100644
index ae10f48f0..000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
- {
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
deleted file mode 100644
index 81a77e132..000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- qwtplot3d.pro.orig 2009-04-07 19:45:29.985645378 +0100
-+++ qwtplot3d.pro 2009-04-07 19:46:50.095747068 +0100
-@@ -80,13 +80,11 @@
- include/qwt3d_graphplot.h \
- include/qwt3d_multiplot.h
-
--# gl2ps support
--HEADERS+=3rdparty/gl2ps/gl2ps.h \
-- include/qwt3d_io_gl2ps.h
-+# gl2ps support taken from system libs
-+HEADERS+=include/qwt3d_io_gl2ps.h
-
--SOURCES+=src/qwt3d_io_gl2ps.cpp \
-- 3rdparty/gl2ps/gl2ps.c
--
-+SOURCES+=src/qwt3d_io_gl2ps.cpp
-+unix:LIBS += -lgl2ps
- # zlib support for gl2ps
- zlib {
- DEFINES += GL2PS_HAVE_ZLIB
---- src/qwt3d_io_gl2ps.cpp.orig 2009-04-07 19:44:38.536418391 +0100
-+++ src/qwt3d_io_gl2ps.cpp 2009-04-07 19:45:03.685133854 +0100
-@@ -4,7 +4,7 @@
-
- #include <time.h>
- #include "qwt3d_openglhelper.h"
--#include "../3rdparty/gl2ps/gl2ps.h"
-+#include <gl2ps.h>
- #include "qwt3d_io_gl2ps.h"
- #include "qwt3d_plot.h"
-
diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml
deleted file mode 100644
index bfd320fe9..000000000
--- a/x11-libs/qwtplot3d/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription lang="en">
- QwtPlot3D is a graphics extension to the Qt GUI application framework.
- It provides a 3D plotting widget for scientific data and mathematical expressions.
- It compares to the existing Qwt Project.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">qwtplot3d</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild
deleted file mode 100644
index 954735573..000000000
--- a/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="3D plotting library for Qt5"
-HOMEPAGE="http://qwtplot3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="ZLIB"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE="doc examples"
-
-RDEPEND="
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- x11-libs/gl2ps
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-profile.patch"
- "${FILESDIR}/${PN}-examples.patch"
- "${FILESDIR}/${PN}-doxygen.patch"
- "${FILESDIR}/${PN}-gcc44.patch"
- "${FILESDIR}/${PN}-qt-4.8.0.patch"
-)
-
-src_prepare() {
- default
- eapply -p0 "${FILESDIR}/${PN}-sys-gl2ps.patch"
- cat >> ${PN}.pro <<-EOF
- target.path = "${EPREFIX}/usr/$(get_libdir)"
- headers.path = "${EPREFIX}/usr/include/${PN}"
- headers.files = \$\$HEADERS
- INSTALLS = target headers
- EOF
-}
-
-src_configure() {
- eqmake5
-}
-
-src_compile() {
- default
- if use doc ; then
- cd doc || die
- doxygen Doxyfile.doxygen || die "doxygen failed"
- HTML_DOCS="doc/web/doxygen/"
- fi
-}
-
-src_install () {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
- if use examples; then
- insinto /usr/share/${PN}
- doins -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-23 12:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-23 12:47 [gentoo-commits] proj/sci:master commit in: x11-libs/qwtplot3d/files/, x11-libs/qwtplot3d/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2020-11-09 13:22 Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox