gentoo resync : 31.05.2021

5 files changed, 230 insertions, 0 deletions

diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
new file mode 100644
index 000000000000..b0632a380a2a
--- /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 000000000000..f142c3379274
--- /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 000000000000..a76fe831ab91
--- /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-qt-4.8.0.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch
new file mode 100644
index 000000000000..ae10f48f0707
--- /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 000000000000..ee6534a5cfdb
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
@@ -0,0 +1,31 @@
+--- 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"

+