1 |
commit: c900914ed16732bb5404483793e98984dedfa755 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Dec 2 08:04:18 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 12 20:14:52 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c900914e |
7 |
|
8 |
app-office/scribus: remove unused patches. |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/6390 |
11 |
|
12 |
.../scribus/files/scribus-1.5.0-QObject.patch | 15 -- |
13 |
.../scribus/files/scribus-1.5.0-docdir.patch | 42 ----- |
14 |
app-office/scribus/files/scribus-1.5.0-fpic.patch | 178 --------------------- |
15 |
.../scribus/files/scribus-1.5.2-cmake-qt57.patch | 31 ---- |
16 |
.../scribus/files/scribus-1.5.2-cxx-build.patch | 24 --- |
17 |
app-office/scribus/files/scribus-1.5.2-fpic.patch | 16 -- |
18 |
.../scribus/files/scribus-1.5.2-gcc6-warn.patch | 87 ---------- |
19 |
.../scribus/files/scribus-1.5.2-qt57-build.patch | 21 --- |
20 |
8 files changed, 414 deletions(-) |
21 |
|
22 |
diff --git a/app-office/scribus/files/scribus-1.5.0-QObject.patch b/app-office/scribus/files/scribus-1.5.0-QObject.patch |
23 |
deleted file mode 100644 |
24 |
index 1ad2d1a575c..00000000000 |
25 |
--- a/app-office/scribus/files/scribus-1.5.0-QObject.patch |
26 |
+++ /dev/null |
27 |
@@ -1,15 +0,0 @@ |
28 |
- scribus/sclayer.cpp | 1 + |
29 |
- 1 file changed, 1 insertion(+) |
30 |
- |
31 |
-diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp |
32 |
-index 502112b..4da7bd5 100644 |
33 |
---- a/scribus/sclayer.cpp |
34 |
-+++ b/scribus/sclayer.cpp |
35 |
-@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place. |
36 |
- |
37 |
- #include <QHash> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates |
38 |
- #include <QVector> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates |
39 |
-+#include <QObject> |
40 |
- #include <QtAlgorithms> |
41 |
- |
42 |
- ScLayer::ScLayer(void) |
43 |
|
44 |
diff --git a/app-office/scribus/files/scribus-1.5.0-docdir.patch b/app-office/scribus/files/scribus-1.5.0-docdir.patch |
45 |
deleted file mode 100644 |
46 |
index 2ff316a91b5..00000000000 |
47 |
--- a/app-office/scribus/files/scribus-1.5.0-docdir.patch |
48 |
+++ /dev/null |
49 |
@@ -1,42 +0,0 @@ |
50 |
- CMakeLists.txt | 28 +++++++++++++++------------- |
51 |
- 1 file changed, 15 insertions(+), 13 deletions(-) |
52 |
- |
53 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
54 |
-index 29d66f3..1c08cdd 100644 |
55 |
---- a/CMakeLists.txt |
56 |
-+++ b/CMakeLists.txt |
57 |
-@@ -244,19 +244,21 @@ ELSE() |
58 |
- ENDIF() |
59 |
- |
60 |
- #SHARE - use the default on Apple as TAG_VERSION is empty |
61 |
--IF(WIN32 OR OS2) |
62 |
-- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") |
63 |
--ELSE (WIN32 OR OS2) |
64 |
-- IF(TAG_VERSION OR BUILD_OSX_BUNDLE) |
65 |
-- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") |
66 |
-- ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) |
67 |
-- IF(NOT WANT_VERSIONING) |
68 |
-- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") |
69 |
-- ELSE(NOT WANT_VERSIONING) |
70 |
-- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") |
71 |
-- ENDIF(NOT WANT_VERSIONING) |
72 |
-- ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE) |
73 |
--ENDIF (WIN32 OR OS2) |
74 |
-+IF(NOT DOCDIR) |
75 |
-+ IF(WIN32 OR OS2) |
76 |
-+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") |
77 |
-+ ELSE (WIN32 OR OS2) |
78 |
-+ IF(TAG_VERSION OR BUILD_OSX_BUNDLE) |
79 |
-+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") |
80 |
-+ ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) |
81 |
-+ IF(NOT WANT_VERSIONING) |
82 |
-+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") |
83 |
-+ ELSE(NOT WANT_VERSIONING) |
84 |
-+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") |
85 |
-+ ENDIF(NOT WANT_VERSIONING) |
86 |
-+ ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE) |
87 |
-+ ENDIF (WIN32 OR OS2) |
88 |
-+ENDIF(NOT DOCDIR) |
89 |
- IF(NOT IS_ABSOLUTE ${DOCDIR}) |
90 |
- ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") |
91 |
- ELSE() |
92 |
|
93 |
diff --git a/app-office/scribus/files/scribus-1.5.0-fpic.patch b/app-office/scribus/files/scribus-1.5.0-fpic.patch |
94 |
deleted file mode 100644 |
95 |
index 9f6a6c4e0ab..00000000000 |
96 |
--- a/app-office/scribus/files/scribus-1.5.0-fpic.patch |
97 |
+++ /dev/null |
98 |
@@ -1,178 +0,0 @@ |
99 |
- CMakeLists.txt | 15 +++++++++++++++ |
100 |
- scribus/colormgmt/CMakeLists.txt | 2 ++ |
101 |
- scribus/desaxe/CMakeLists.txt | 1 + |
102 |
- scribus/fonts/CMakeLists.txt | 1 + |
103 |
- scribus/styles/CMakeLists.txt | 2 ++ |
104 |
- scribus/text/CMakeLists.txt | 1 + |
105 |
- scribus/third_party/lib2geom/CMakeLists.txt | 8 +------- |
106 |
- scribus/third_party/pgf/CMakeLists.txt | 2 ++ |
107 |
- scribus/third_party/prc/CMakeLists.txt | 2 ++ |
108 |
- scribus/third_party/wpg/CMakeLists.txt | 7 ++++--- |
109 |
- scribus/third_party/zip/CMakeLists.txt | 2 ++ |
110 |
- 11 files changed, 33 insertions(+), 10 deletions(-) |
111 |
- |
112 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
113 |
-index 29d66f3..a92da7e 100644 |
114 |
---- a/CMakeLists.txt |
115 |
-+++ b/CMakeLists.txt |
116 |
-@@ -131,6 +131,21 @@ IF (_machine_sparc64) |
117 |
- SET(ARCH64BIT 1) |
118 |
- ENDIF (_machine_sparc64) |
119 |
- |
120 |
-+STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}") |
121 |
-+IF (_machine_hppa) |
122 |
-+ MESSAGE(STATUS "Found target Hppa") |
123 |
-+ SET(ARCH_HPPA 1) |
124 |
-+ENDIF (_machine_hppa) |
125 |
-+ |
126 |
-+ |
127 |
-+# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See: |
128 |
-+# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and |
129 |
-+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133 |
130 |
-+ |
131 |
-+IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1) |
132 |
-+ SET(CMAKE_CXX_FLAGS_FPIC "-fPIC") |
133 |
-+ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1) |
134 |
-+ |
135 |
- ## Do our Apple OSX version setup |
136 |
- IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1)) |
137 |
- STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}") |
138 |
-diff --git a/scribus/colormgmt/CMakeLists.txt b/scribus/colormgmt/CMakeLists.txt |
139 |
-index 7298a28..87c4f5e 100644 |
140 |
---- a/scribus/colormgmt/CMakeLists.txt |
141 |
-+++ b/scribus/colormgmt/CMakeLists.txt |
142 |
-@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR} |
143 |
- ${CMAKE_SOURCE_DIR}/scribus |
144 |
- ) |
145 |
- |
146 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
147 |
-+ |
148 |
- INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} ) |
149 |
- SET(SCRIBUS_LCMS_IMPL_SOURCES |
150 |
- sclcms2colormgmtengineimpl.cpp |
151 |
-diff --git a/scribus/desaxe/CMakeLists.txt b/scribus/desaxe/CMakeLists.txt |
152 |
-index 0098028..85e76b6 100644 |
153 |
---- a/scribus/desaxe/CMakeLists.txt |
154 |
-+++ b/scribus/desaxe/CMakeLists.txt |
155 |
-@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus |
156 |
- ${FREETYPE_INCLUDE_DIRS} |
157 |
- ) |
158 |
- |
159 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
160 |
- |
161 |
- SET(SCRIBUS_DESAXE_LIB_SOURCES |
162 |
- saxXML.cpp |
163 |
-diff --git a/scribus/fonts/CMakeLists.txt b/scribus/fonts/CMakeLists.txt |
164 |
-index 799e102..f04c680 100644 |
165 |
---- a/scribus/fonts/CMakeLists.txt |
166 |
-+++ b/scribus/fonts/CMakeLists.txt |
167 |
-@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus |
168 |
- ${FREETYPE_INCLUDE_DIRS} |
169 |
- ) |
170 |
- |
171 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
172 |
- |
173 |
- SET(SCRIBUS_FONTS_LIB_SOURCES |
174 |
- scface.cpp |
175 |
-diff --git a/scribus/styles/CMakeLists.txt b/scribus/styles/CMakeLists.txt |
176 |
-index 6e0cf0a..2839689 100644 |
177 |
---- a/scribus/styles/CMakeLists.txt |
178 |
-+++ b/scribus/styles/CMakeLists.txt |
179 |
-@@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES( |
180 |
- ${FREETYPE_INCLUDE_DIRS} |
181 |
- ) |
182 |
- |
183 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
184 |
-+ |
185 |
- SET(SCRIBUS_STYLES_MOC_CLASSES |
186 |
- ) |
187 |
- |
188 |
-diff --git a/scribus/text/CMakeLists.txt b/scribus/text/CMakeLists.txt |
189 |
-index 1cd112f..4f658e3 100644 |
190 |
---- a/scribus/text/CMakeLists.txt |
191 |
-+++ b/scribus/text/CMakeLists.txt |
192 |
-@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES( |
193 |
- ${FREETYPE_INCLUDE_DIRS} |
194 |
- ) |
195 |
- |
196 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
197 |
- |
198 |
- SET(SCRIBUS_TEXT_MOC_CLASSES |
199 |
- storytext.h |
200 |
-diff --git a/scribus/third_party/lib2geom/CMakeLists.txt b/scribus/third_party/lib2geom/CMakeLists.txt |
201 |
-index 6187d96..3106f6e 100755 |
202 |
---- a/scribus/third_party/lib2geom/CMakeLists.txt |
203 |
-+++ b/scribus/third_party/lib2geom/CMakeLists.txt |
204 |
-@@ -5,13 +5,7 @@ ${CMAKE_SOURCE_DIR}/scribus |
205 |
- |
206 |
- SET(2GEOM_VERSION 0.1.0) |
207 |
- |
208 |
--# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See: |
209 |
--# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and |
210 |
--# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133 |
211 |
-- |
212 |
--IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1) |
213 |
-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") |
214 |
--ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1) |
215 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
216 |
- |
217 |
- OPTION(2GEOM_BUILD_SHARED |
218 |
- "Build lib2geom and libtoy as shared libraries." |
219 |
-diff --git a/scribus/third_party/pgf/CMakeLists.txt b/scribus/third_party/pgf/CMakeLists.txt |
220 |
-index f84b3d4..d3b1db6 100644 |
221 |
---- a/scribus/third_party/pgf/CMakeLists.txt |
222 |
-+++ b/scribus/third_party/pgf/CMakeLists.txt |
223 |
-@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR} |
224 |
- ${CMAKE_SOURCE_DIR}/scribus |
225 |
- ) |
226 |
- |
227 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
228 |
-+ |
229 |
- SET(SCRIBUS_PGF_LIB_SOURCES |
230 |
- Decoder.cpp |
231 |
- Encoder.cpp |
232 |
-diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt |
233 |
-index 5f7c2c6..1da7177 100644 |
234 |
---- a/scribus/third_party/prc/CMakeLists.txt |
235 |
-+++ b/scribus/third_party/prc/CMakeLists.txt |
236 |
-@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR} |
237 |
- ${FREETYPE_INCLUDE_DIRS} |
238 |
- ) |
239 |
- |
240 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
241 |
-+ |
242 |
- SET(SCRIBUS_PRC_LIB_SOURCES |
243 |
- oPRCFile.cc |
244 |
- PRCbitStream.cc |
245 |
-diff --git a/scribus/third_party/wpg/CMakeLists.txt b/scribus/third_party/wpg/CMakeLists.txt |
246 |
-index ff31e9f..fbc5cd4 100644 |
247 |
---- a/scribus/third_party/wpg/CMakeLists.txt |
248 |
-+++ b/scribus/third_party/wpg/CMakeLists.txt |
249 |
-@@ -2,10 +2,11 @@ INCLUDE_DIRECTORIES( |
250 |
- ${CMAKE_SOURCE_DIR} |
251 |
- ${CMAKE_SOURCE_DIR}/scribus |
252 |
- ) |
253 |
-+ |
254 |
- SET(LIB_TYPE STATIC) |
255 |
--IF (ARCH_X86_64 EQUAL 1) |
256 |
-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") |
257 |
--ENDIF (ARCH_X86_64 EQUAL 1) |
258 |
-+ |
259 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
260 |
-+ |
261 |
- SET(WPG_SOURCES |
262 |
- WPG1Parser.cpp |
263 |
- WPG2Parser.cpp |
264 |
-diff --git a/scribus/third_party/zip/CMakeLists.txt b/scribus/third_party/zip/CMakeLists.txt |
265 |
-index edf9683..f7676ab 100644 |
266 |
---- a/scribus/third_party/zip/CMakeLists.txt |
267 |
-+++ b/scribus/third_party/zip/CMakeLists.txt |
268 |
-@@ -4,6 +4,8 @@ ${CMAKE_SOURCE_DIR}/scribus |
269 |
- ${ZLIB_INCLUDE_DIR} |
270 |
- ) |
271 |
- |
272 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
273 |
-+ |
274 |
- SET(SCRIBUS_ZIP_LIB_SOURCES |
275 |
- unzip.cpp |
276 |
- zip.cpp |
277 |
|
278 |
diff --git a/app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch b/app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch |
279 |
deleted file mode 100644 |
280 |
index 214fab4257e..00000000000 |
281 |
--- a/app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch |
282 |
+++ /dev/null |
283 |
@@ -1,31 +0,0 @@ |
284 |
-commit 413c8c8a0ded5aa4b0f8d85dbc335082e809f3b2 |
285 |
-Author: Craig Bradney <mrb@×××××××.info> |
286 |
-Date: Thu Jun 16 20:01:34 2016 +0000 |
287 |
- |
288 |
- Add better support for C++11/Qt 5.7.0. CMAKE minimum bumped to 3.2 |
289 |
- |
290 |
- git-svn-id: svn://scribus.net/trunk/Scribus@21377 11d20701-8431-0410-a711-e3c959e3b870 |
291 |
- |
292 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
293 |
-index bc1ec57..9e92a38 100644 |
294 |
---- a/CMakeLists.txt |
295 |
-+++ b/CMakeLists.txt |
296 |
-@@ -3,8 +3,9 @@ |
297 |
- |
298 |
- #Set our CMake minimum version |
299 |
- #Require 2.8.9 for Qt5 |
300 |
-+#Require 3.1.0 for Qt 5.7 C++ 11 easy support |
301 |
- #Require 3.2.0 for add_custom_target with byproducts |
302 |
--CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9 FATAL_ERROR) |
303 |
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0 FATAL_ERROR) |
304 |
- |
305 |
- #Pretty colors |
306 |
- SET(CMAKE_COLOR_MAKEFILE ON) |
307 |
-@@ -382,6 +383,7 @@ ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"") |
308 |
- #C++11 Support |
309 |
- IF(WANT_CPP11) |
310 |
- MESSAGE(STATUS "Enabling C++11 compiler features") |
311 |
-+ set(CMAKE_CXX_STANDARD 11) |
312 |
- ADD_DEFINITIONS("-std=c++11") |
313 |
- ENDIF(WANT_CPP11) |
314 |
- |
315 |
|
316 |
diff --git a/app-office/scribus/files/scribus-1.5.2-cxx-build.patch b/app-office/scribus/files/scribus-1.5.2-cxx-build.patch |
317 |
deleted file mode 100644 |
318 |
index da8d50dee92..00000000000 |
319 |
--- a/app-office/scribus/files/scribus-1.5.2-cxx-build.patch |
320 |
+++ /dev/null |
321 |
@@ -1,24 +0,0 @@ |
322 |
-commit 1a9bdbc7ab793b15e93f1ab29ce06dd69c061f58 |
323 |
-Author: Jean Ghali <jghali@×××××××××××.fr> |
324 |
-Date: Sat Jun 18 12:49:45 2016 +0000 |
325 |
- |
326 |
- fix build issue when not compiling with c++11 : std::isinf is c++11 only |
327 |
- |
328 |
- git-svn-id: svn://scribus.net/trunk/Scribus@21382 11d20701-8431-0410-a711-e3c959e3b870 |
329 |
- |
330 |
-diff --git a/scribus/third_party/fparser/fpoptimizer.cc b/scribus/third_party/fparser/fpoptimizer.cc |
331 |
-index 673e1b6..0c1bad5 100644 |
332 |
---- a/scribus/third_party/fparser/fpoptimizer.cc |
333 |
-+++ b/scribus/third_party/fparser/fpoptimizer.cc |
334 |
-@@ -7296,7 +7296,11 @@ namespace FPoptimizer_CodeTree |
335 |
- //if(imm >= 0.0) |
336 |
- { |
337 |
- double new_base_immed = std::pow(base_immed, imm); |
338 |
-+#if __cplusplus < 201103L |
339 |
-+ if(isinf(new_base_immed) || new_base_immed == 0.0) |
340 |
-+#else |
341 |
- if(std::isinf(new_base_immed) || new_base_immed == 0.0) |
342 |
-+#endif |
343 |
- { |
344 |
- // It produced an infinity. Do not change. |
345 |
- break; |
346 |
|
347 |
diff --git a/app-office/scribus/files/scribus-1.5.2-fpic.patch b/app-office/scribus/files/scribus-1.5.2-fpic.patch |
348 |
deleted file mode 100644 |
349 |
index 58283645e72..00000000000 |
350 |
--- a/app-office/scribus/files/scribus-1.5.2-fpic.patch |
351 |
+++ /dev/null |
352 |
@@ -1,16 +0,0 @@ |
353 |
- scribus/third_party/prc/CMakeLists.txt | 2 ++ |
354 |
- 1 file changed, 2 insertions(+) |
355 |
- |
356 |
-diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt |
357 |
-index 5f7c2c6..1da7177 100644 |
358 |
---- a/scribus/third_party/prc/CMakeLists.txt |
359 |
-+++ b/scribus/third_party/prc/CMakeLists.txt |
360 |
-@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR} |
361 |
- ${FREETYPE_INCLUDE_DIRS} |
362 |
- ) |
363 |
- |
364 |
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
365 |
-+ |
366 |
- SET(SCRIBUS_PRC_LIB_SOURCES |
367 |
- oPRCFile.cc |
368 |
- PRCbitStream.cc |
369 |
|
370 |
diff --git a/app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch b/app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch |
371 |
deleted file mode 100644 |
372 |
index 224ebe40d99..00000000000 |
373 |
--- a/app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch |
374 |
+++ /dev/null |
375 |
@@ -1,87 +0,0 @@ |
376 |
-commit bb3066704e987210c324ec7f3bfb2c8153d9710e |
377 |
-Author: Jean Ghali <jghali@×××××××××××.fr> |
378 |
-Date: Sat Aug 20 12:18:31 2016 +0000 |
379 |
- |
380 |
- fix a few gcc 6 warnings related to auto_ptr deprecation in c++11 by replacing it with QScopedPointer |
381 |
- |
382 |
- git-svn-id: svn://scribus.net/trunk/Scribus@21430 11d20701-8431-0410-a711-e3c959e3b870 |
383 |
- |
384 |
-diff --git a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h |
385 |
-index 044d45a..a067b79 100644 |
386 |
---- a/scribus/sclistboxpixmap.h |
387 |
-+++ b/scribus/sclistboxpixmap.h |
388 |
-@@ -13,6 +13,7 @@ for which a new license (GPL+exception) is in place. |
389 |
- #include <QDebug> |
390 |
- #include <QPainter> |
391 |
- #include <QPixmap> |
392 |
-+#include <QScopedPointer> |
393 |
- #include <QVariant> |
394 |
- |
395 |
- #include "scguardedptr.h" |
396 |
-@@ -30,19 +31,19 @@ public: |
397 |
- virtual QSize sizeHint (const QStyleOptionViewItem & option, const QModelIndex & index ) const; |
398 |
- virtual void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const; |
399 |
- protected: |
400 |
-- static std::auto_ptr<QPixmap> pmap; |
401 |
-+ static QScopedPointer<QPixmap> pmap; |
402 |
- // The drawPixmap function must not modify pixmap size |
403 |
- virtual void redraw(const QVariant&) const = 0; |
404 |
- }; |
405 |
- |
406 |
- template<unsigned int pixWidth, unsigned int pixHeight> |
407 |
--std::auto_ptr<QPixmap> ScListBoxPixmap<pixWidth, pixHeight>::pmap; |
408 |
-+QScopedPointer<QPixmap> ScListBoxPixmap<pixWidth, pixHeight>::pmap; |
409 |
- |
410 |
- |
411 |
- template<unsigned int pixWidth, unsigned int pixHeight> |
412 |
- ScListBoxPixmap<pixWidth, pixHeight>::ScListBoxPixmap(void) : QAbstractItemDelegate() |
413 |
- { |
414 |
-- if (!pmap.get()) |
415 |
-+ if (pmap.isNull()) |
416 |
- { |
417 |
- pmap.reset( new QPixmap(pixWidth, pixHeight) ); |
418 |
- } |
419 |
-diff --git a/scribus/ui/colorlistbox.cpp b/scribus/ui/colorlistbox.cpp |
420 |
-index 9f3897b..99f280f 100644 |
421 |
---- a/scribus/ui/colorlistbox.cpp |
422 |
-+++ b/scribus/ui/colorlistbox.cpp |
423 |
-@@ -83,7 +83,7 @@ public: |
424 |
- |
425 |
- void ColorSmallItemDelegate::redraw(const QVariant& data) const |
426 |
- { |
427 |
-- QPixmap* pPixmap = ScListBoxPixmap<15,15>::pmap.get(); |
428 |
-+ QPixmap* pPixmap = ScListBoxPixmap<15,15>::pmap.data(); |
429 |
- pPixmap->fill(Qt::transparent); |
430 |
- if (data.canConvert<ColorPixmapValue>()) |
431 |
- { |
432 |
-@@ -101,7 +101,7 @@ void ColorSmallItemDelegate::redraw(const QVariant& data) const |
433 |
- |
434 |
- void ColorWideItemDelegate::redraw(const QVariant& data) const |
435 |
- { |
436 |
-- QPixmap* pPixmap = ScListBoxPixmap<30,15>::pmap.get(); |
437 |
-+ QPixmap* pPixmap = ScListBoxPixmap<30,15>::pmap.data(); |
438 |
- pPixmap->fill(Qt::transparent); |
439 |
- if (data.canConvert<ColorPixmapValue>()) |
440 |
- { |
441 |
-@@ -134,7 +134,7 @@ void ColorFancyItemDelegate::redraw(const QVariant& data) const |
442 |
- iconsInitialized = true; |
443 |
- } |
444 |
- |
445 |
-- QPixmap* pPixmap = ScListBoxPixmap<60,15>::pmap.get(); |
446 |
-+ QPixmap* pPixmap = ScListBoxPixmap<60,15>::pmap.data(); |
447 |
- pPixmap->fill(Qt::transparent); |
448 |
- |
449 |
- if (data.canConvert<ColorPixmapValue>()) |
450 |
-diff --git a/scribus/ui/propertiespalette_utils.cpp b/scribus/ui/propertiespalette_utils.cpp |
451 |
-index f76743c..cadbb11 100644 |
452 |
---- a/scribus/ui/propertiespalette_utils.cpp |
453 |
-+++ b/scribus/ui/propertiespalette_utils.cpp |
454 |
-@@ -66,7 +66,7 @@ void LineFormatItemDelegate::redraw(const QVariant& data) const |
455 |
- QColor tmpf; |
456 |
- pmap->fill(Qt::white); |
457 |
- QPainter p; |
458 |
-- p.begin(pmap.get()); |
459 |
-+ p.begin(pmap.data()); |
460 |
- for (int its = item.m_Line.size()-1; its > -1; its--) |
461 |
- { |
462 |
- const ScColor& col = item.m_doc->PageColors[item.m_Line[its].Color]; |
463 |
|
464 |
diff --git a/app-office/scribus/files/scribus-1.5.2-qt57-build.patch b/app-office/scribus/files/scribus-1.5.2-qt57-build.patch |
465 |
deleted file mode 100644 |
466 |
index 0584c290791..00000000000 |
467 |
--- a/app-office/scribus/files/scribus-1.5.2-qt57-build.patch |
468 |
+++ /dev/null |
469 |
@@ -1,21 +0,0 @@ |
470 |
-commit ddb5688ae4f4ff40ba1204a413fcf15279b35f2b |
471 |
-Author: Franz Schmid <Franz.Schmid@×××××××××××.de> |
472 |
-Date: Sat Jun 18 09:14:21 2016 +0000 |
473 |
- |
474 |
- Compile Fix for compiling with Qt-5.7 |
475 |
- |
476 |
- git-svn-id: svn://scribus.net/trunk/Scribus@21381 11d20701-8431-0410-a711-e3c959e3b870 |
477 |
- |
478 |
-diff --git a/scribus/third_party/fparser/fpoptimizer.cc b/scribus/third_party/fparser/fpoptimizer.cc |
479 |
-index ae8c0f6..673e1b6 100644 |
480 |
---- a/scribus/third_party/fparser/fpoptimizer.cc |
481 |
-+++ b/scribus/third_party/fparser/fpoptimizer.cc |
482 |
-@@ -7296,7 +7296,7 @@ namespace FPoptimizer_CodeTree |
483 |
- //if(imm >= 0.0) |
484 |
- { |
485 |
- double new_base_immed = std::pow(base_immed, imm); |
486 |
-- if(isinf(new_base_immed) || new_base_immed == 0.0) |
487 |
-+ if(std::isinf(new_base_immed) || new_base_immed == 0.0) |
488 |
- { |
489 |
- // It produced an infinity. Do not change. |
490 |
- break; |