commit: 586fb80d994633f480fa50f66e0c72dc99094ef6 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Oct 14 15:38:36 2024 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Oct 15 21:45:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=586fb80d
x11-libs/qwtplot3d: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/38988 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> x11-libs/qwtplot3d/files/qwtplot3d-examples.patch | 125 --------------------- x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch | 34 ------ x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch | 31 ----- 3 files changed, 190 deletions(-) diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch deleted file mode 100644 index f142c3379274..000000000000 --- 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-qt-4.8.0.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch deleted file mode 100644 index ae10f48f0707..000000000000 --- 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 ee6534a5cfdb..000000000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/qwtplot3d.pro 2009-04-07 19:45:29.985645378 +0100 -+++ b/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 ---- a/src/qwt3d_io_gl2ps.cpp 2009-04-07 19:44:38.536418391 +0100 -+++ b/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" -
