1 |
bicatali 07/11/28 23:13:51 |
2 |
|
3 |
Added: qwtplot3d-doxygen.patch qwtplot3d-examples.patch |
4 |
digest-qwtplot3d-0.2.7 qwtplot3d-profile.patch |
5 |
Log: |
6 |
Version bump, modernized the ebuild. Now Qt4 only, Qt3 version split in x11-libs/qwplot3d-qt3 |
7 |
(Portage version: 2.1.4_rc3) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: qwtplot3d-doxygen.patch |
16 |
=================================================================== |
17 |
--- qwtplot3d/doc/Doxyfile.doxygen.orig 2007-11-26 22:30:57.000000000 +0000 |
18 |
+++ qwtplot3d/doc/Doxyfile.doxygen 2007-11-26 22:30:03.000000000 +0000 |
19 |
@@ -116,7 +116,7 @@ |
20 |
HTML_ALIGN_MEMBERS = YES |
21 |
GENERATE_HTMLHELP = NO |
22 |
CHM_FILE = qwtplot3d.chm |
23 |
-HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe" |
24 |
+#HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe" |
25 |
GENERATE_CHI = NO |
26 |
BINARY_TOC = YES |
27 |
TOC_EXPAND = YES |
28 |
@@ -181,7 +181,7 @@ |
29 |
MACRO_EXPANSION = NO |
30 |
EXPAND_ONLY_PREDEF = NO |
31 |
SEARCH_INCLUDES = YES |
32 |
-INCLUDE_PATH = V:/cvs/qwtplot3d/include/ |
33 |
+INCLUDE_PATH = ../include |
34 |
INCLUDE_FILE_PATTERNS = *.h |
35 |
PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \ |
36 |
QT_VERSION=0x040000 |
37 |
@@ -212,7 +212,6 @@ |
38 |
GRAPHICAL_HIERARCHY = YES |
39 |
DIRECTORY_GRAPH = YES |
40 |
DOT_IMAGE_FORMAT = png |
41 |
-DOT_PATH = V:/graphviz/Graphviz/bin/ |
42 |
DOTFILE_DIRS = |
43 |
MAX_DOT_GRAPH_WIDTH = 974 |
44 |
MAX_DOT_GRAPH_HEIGHT = 10000 |
45 |
|
46 |
|
47 |
|
48 |
1.1 x11-libs/qwtplot3d/files/qwtplot3d-examples.patch |
49 |
|
50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch?rev=1.1&view=markup |
51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch?rev=1.1&content-type=text/plain |
52 |
|
53 |
Index: qwtplot3d-examples.patch |
54 |
=================================================================== |
55 |
diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp |
56 |
--- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 |
57 |
+++ qwtplot3d/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:21:56.000000000 +0000 |
58 |
@@ -9,7 +9,7 @@ |
59 |
|
60 |
#include "axes.h" |
61 |
#include "axesmainwindow.h" |
62 |
-#include "../../../include/qwt3d_function.h" |
63 |
+#include <qwt3d_function.h> |
64 |
|
65 |
using namespace std; |
66 |
using namespace Qwt3D; |
67 |
diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro |
68 |
--- qwtplot3d.orig/examples/common.pro 2007-11-26 22:16:54.000000000 +0000 |
69 |
+++ qwtplot3d/examples/common.pro 2007-11-26 23:43:33.000000000 +0000 |
70 |
@@ -1,13 +1,13 @@ |
71 |
TEMPLATE = app |
72 |
-CONFIG += qt warn_on thread debug |
73 |
+CONFIG += qt warn_on thread |
74 |
UI_DIR = tmp |
75 |
MOC_DIR = tmp |
76 |
OBJECTS_DIR = tmp |
77 |
-INCLUDEPATH += ../../include |
78 |
+INCLUDEPATH += /usr/include/qwtplot3d |
79 |
DEPENDPATH = $$INCLUDEPATH |
80 |
DESTDIR = ../bin |
81 |
|
82 |
-unix:LIBS += -lqwtplot3d -L../../lib |
83 |
+unix:LIBS += -lqwtplot3d |
84 |
linux-g++:QMAKE_CXXFLAGS += -fno-exceptions |
85 |
|
86 |
win32{ |
87 |
@@ -25,7 +25,7 @@ |
88 |
ISQT4 = $$find(MYVERSION, ^[2-9]) |
89 |
|
90 |
!isEmpty( ISQT4 ) { |
91 |
-RESOURCES = ../images.qrc |
92 |
+#RESOURCES = ../images.qrc |
93 |
QT += opengl |
94 |
} |
95 |
|
96 |
diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp |
97 |
--- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 |
98 |
+++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:22:48.000000000 +0000 |
99 |
@@ -6,7 +6,7 @@ |
100 |
|
101 |
#include "enrichmentmainwindow.h" |
102 |
#include "enrichments.h" |
103 |
-#include "../../../include/qwt3d_function.h" |
104 |
+#include <qwt3d_function.h> |
105 |
|
106 |
using namespace Qwt3D; |
107 |
|
108 |
diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h |
109 |
--- qwtplot3d.orig/examples/mesh2/src/colormapreader.h 2007-11-26 22:16:54.000000000 +0000 |
110 |
+++ qwtplot3d/examples/mesh2/src/colormapreader.h 2007-11-26 22:23:19.000000000 +0000 |
111 |
@@ -5,7 +5,7 @@ |
112 |
#include <qframe.h> |
113 |
#include <qpixmap.h> |
114 |
|
115 |
-#include "../../../include/qwt3d_types.h" |
116 |
+#include <qwt3d_types.h> |
117 |
|
118 |
#if QT_VERSION < 0x040000 |
119 |
|
120 |
diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h |
121 |
--- qwtplot3d.orig/examples/mesh2/src/functions.h 2007-11-26 22:16:54.000000000 +0000 |
122 |
+++ qwtplot3d/examples/mesh2/src/functions.h 2007-11-26 22:23:47.000000000 +0000 |
123 |
@@ -2,8 +2,8 @@ |
124 |
#define __EXAMPLE_H__ |
125 |
|
126 |
#include <math.h> |
127 |
-#include "../../../include/qwt3d_parametricsurface.h" |
128 |
-#include "../../../include/qwt3d_function.h" |
129 |
+#include <qwt3d_parametricsurface.h> |
130 |
+#include <qwt3d_function.h> |
131 |
|
132 |
using namespace Qwt3D; |
133 |
|
134 |
diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h |
135 |
--- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h 2007-11-26 22:16:54.000000000 +0000 |
136 |
+++ qwtplot3d/examples/mesh2/src/lightingdlg.h 2007-11-26 22:24:41.000000000 +0000 |
137 |
@@ -3,10 +3,10 @@ |
138 |
|
139 |
#include <math.h> |
140 |
#include <qapplication.h> |
141 |
-#include "../../../include/qwt3d_parametricsurface.h" |
142 |
-#include "../../../include/qwt3d_surfaceplot.h" |
143 |
-#include "../../../include/qwt3d_enrichment.h" |
144 |
-#include "../../../include/qwt3d_color.h" |
145 |
+#include <qwt3d_parametricsurface.h> |
146 |
+#include <qwt3d_surfaceplot.h> |
147 |
+#include <qwt3d_enrichment.h> |
148 |
+#include <qwt3d_color.h> |
149 |
|
150 |
#if QT_VERSION < 0x040000 |
151 |
#include "lightingdlgbase.h" |
152 |
diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp |
153 |
--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 |
154 |
+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:25:33.000000000 +0000 |
155 |
@@ -33,9 +33,9 @@ |
156 |
#include "colormapreader.h" |
157 |
#include "lightingdlg.h" |
158 |
#include "femreader.h" |
159 |
-#include "../../../include/qwt3d_io.h" |
160 |
-#include "../../../include/qwt3d_io_gl2ps.h" |
161 |
-#include "../../../include/qwt3d_io_reader.h" |
162 |
+#include <qwt3d_io.h> |
163 |
+#include <qwt3d_io_gl2ps.h> |
164 |
+#include <qwt3d_io_reader.h> |
165 |
|
166 |
using namespace Qwt3D; |
167 |
using namespace std; |
168 |
diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h |
169 |
--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:16:54.000000000 +0000 |
170 |
+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:26:09.000000000 +0000 |
171 |
@@ -1,7 +1,7 @@ |
172 |
#ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code |
173 |
#define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code |
174 |
|
175 |
-#include "../../../include/qwt3d_surfaceplot.h" |
176 |
+#include <qwt3d_surfaceplot.h> |
177 |
|
178 |
|
179 |
#if QT_VERSION < 0x040000 |
180 |
|
181 |
|
182 |
|
183 |
1.1 x11-libs/qwtplot3d/files/digest-qwtplot3d-0.2.7 |
184 |
|
185 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qwtplot3d/files/digest-qwtplot3d-0.2.7?rev=1.1&view=markup |
186 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qwtplot3d/files/digest-qwtplot3d-0.2.7?rev=1.1&content-type=text/plain |
187 |
|
188 |
Index: digest-qwtplot3d-0.2.7 |
189 |
=================================================================== |
190 |
MD5 2f14660152e2e26bfeaaeec479ed9f2b qwtplot3d-0.2.7.tgz 183836 |
191 |
RMD160 0f28462cb95ef6091d73642c8b26ece60d50bfb8 qwtplot3d-0.2.7.tgz 183836 |
192 |
SHA256 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42 qwtplot3d-0.2.7.tgz 183836 |
193 |
|
194 |
|
195 |
|
196 |
1.1 x11-libs/qwtplot3d/files/qwtplot3d-profile.patch |
197 |
|
198 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch?rev=1.1&view=markup |
199 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch?rev=1.1&content-type=text/plain |
200 |
|
201 |
Index: qwtplot3d-profile.patch |
202 |
=================================================================== |
203 |
--- qwtplot3d.orig/qwtplot3d.pro 2007-11-26 22:16:54.000000000 +0000 |
204 |
+++ qwtplot3d/qwtplot3d.pro 2007-11-26 23:45:18.000000000 +0000 |
205 |
@@ -3,7 +3,7 @@ |
206 |
|
207 |
TARGET = qwtplot3d |
208 |
TEMPLATE = lib |
209 |
-CONFIG += qt warn_on opengl thread zlib debug |
210 |
+CONFIG += qt warn_on opengl thread zlib |
211 |
MOC_DIR = tmp |
212 |
OBJECTS_DIR = tmp |
213 |
INCLUDEPATH = include |
214 |
@@ -21,7 +21,7 @@ |
215 |
win32:CONFIG -= zlib |
216 |
|
217 |
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions |
218 |
-unix:VERSION = 0.2.6 |
219 |
+unix:VERSION = 0.2.7 |
220 |
|
221 |
# Input |
222 |
SOURCES += src/qwt3d_axis.cpp \ |
223 |
@@ -92,4 +92,4 @@ |
224 |
DEFINES += GL2PS_HAVE_ZLIB |
225 |
win32:LIBS += zlib.lib |
226 |
unix:LIBS += -lz |
227 |
-} |
228 |
\ No newline at end of file |
229 |
+} |
230 |
|
231 |
|
232 |
|
233 |
-- |
234 |
gentoo-commits@g.o mailing list |