1 |
commit: 419db5bfcc58960fb15f8a108014995d8a207d67 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 30 10:45:14 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 30 10:45:14 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419db5bf |
7 |
|
8 |
app-office/scribus: removed obsolete 1.5.6.1 |
9 |
|
10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
app-office/scribus/Manifest | 1 - |
14 |
.../files/scribus-1.5.6.1-poppler-21.03.0-1.patch | 53 ------- |
15 |
.../files/scribus-1.5.6.1-poppler-21.03.0-2.patch | 27 ---- |
16 |
.../files/scribus-1.5.6.1-poppler-21.04.0.patch | 27 ---- |
17 |
app-office/scribus/scribus-1.5.6.1.ebuild | 161 --------------------- |
18 |
5 files changed, 269 deletions(-) |
19 |
|
20 |
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest |
21 |
index 0d731f62af6..1ef4d5a62e0 100644 |
22 |
--- a/app-office/scribus/Manifest |
23 |
+++ b/app-office/scribus/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245 |
26 |
DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01 |
27 |
|
28 |
diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch |
29 |
deleted file mode 100644 |
30 |
index 18c1edcaaa9..00000000000 |
31 |
--- a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch |
32 |
+++ /dev/null |
33 |
@@ -1,53 +0,0 @@ |
34 |
-From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001 |
35 |
-From: Jean Ghali <jghali@×××××××××××.fr> |
36 |
-Date: Mon, 1 Mar 2021 21:52:54 +0000 |
37 |
-Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler |
38 |
- 21.03.0 |
39 |
- |
40 |
-git-svn-id: svn://scribus.net/trunk/Scribus@24537 11d20701-8431-0410-a711-e3c959e3b870 |
41 |
---- |
42 |
- scribus/plugins/import/pdf/slaoutput.cpp | 12 +++++++++++- |
43 |
- scribus/plugins/import/pdf/slaoutput.h | 4 ++++ |
44 |
- 2 files changed, 15 insertions(+), 1 deletion(-) |
45 |
- |
46 |
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp |
47 |
-index 7cbc73e8d4..d1b37a0c21 100644 |
48 |
---- a/scribus/plugins/import/pdf/slaoutput.cpp |
49 |
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp |
50 |
-@@ -2292,9 +2292,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh |
51 |
- return gTrue; |
52 |
- } |
53 |
- |
54 |
--GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) |
55 |
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) |
56 |
-+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) |
57 |
-+#else |
58 |
-+GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) |
59 |
-+#endif |
60 |
- { |
61 |
- // qDebug() << "SlaOutputDev::tilingPatternFill"; |
62 |
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) |
63 |
-+ const double *bbox = tPat->getBBox(); |
64 |
-+ const double *pmat = tPat->getMatrix(); |
65 |
-+ Dict *resDict = tPat->getResDict(); |
66 |
-+#endif |
67 |
-+ |
68 |
- PDFRectangle box; |
69 |
- Gfx *gfx; |
70 |
- QString id; |
71 |
-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h |
72 |
-index 5149f19e31..66c34203ae 100644 |
73 |
---- a/scribus/plugins/import/pdf/slaoutput.h |
74 |
-+++ b/scribus/plugins/import/pdf/slaoutput.h |
75 |
-@@ -197,7 +197,11 @@ class SlaOutputDev : public OutputDev |
76 |
- void stroke(GfxState *state) override; |
77 |
- void fill(GfxState *state) override; |
78 |
- void eoFill(GfxState *state) override; |
79 |
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) |
80 |
-+ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override; |
81 |
-+#else |
82 |
- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override; |
83 |
-+#endif |
84 |
- GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) override { qDebug() << "Function Shaded Fill"; return gFalse; } |
85 |
- GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override; |
86 |
- GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override { return (shading->getExtend0() == shading->getExtend1()); } |
87 |
|
88 |
diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch |
89 |
deleted file mode 100644 |
90 |
index bff1c08b39a..00000000000 |
91 |
--- a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch |
92 |
+++ /dev/null |
93 |
@@ -1,27 +0,0 @@ |
94 |
-From 6b9ff916959bcb941866f0bd86da639a421337f8 Mon Sep 17 00:00:00 2001 |
95 |
-From: Jean Ghali <jghali@×××××××××××.fr> |
96 |
-Date: Mon, 1 Mar 2021 22:00:02 +0000 |
97 |
-Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler |
98 |
- 21.03.0 |
99 |
- |
100 |
-git-svn-id: svn://scribus.net/trunk/Scribus@24538 11d20701-8431-0410-a711-e3c959e3b870 |
101 |
---- |
102 |
- scribus/plugins/import/pdf/slaoutput.cpp | 4 ++++ |
103 |
- 1 file changed, 4 insertions(+) |
104 |
- |
105 |
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp |
106 |
-index d1b37a0c21..de0a4145ef 100644 |
107 |
---- a/scribus/plugins/import/pdf/slaoutput.cpp |
108 |
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp |
109 |
-@@ -2336,7 +2336,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *c |
110 |
- // Unset the clip path as it is unrelated to the pattern's coordinate space. |
111 |
- QPainterPath savedClip = m_currentClipPath; |
112 |
- m_currentClipPath = QPainterPath(); |
113 |
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) |
114 |
-+ gfx->display(tPat->getContentStream()); |
115 |
-+#else |
116 |
- gfx->display(str); |
117 |
-+#endif |
118 |
- m_currentClipPath = savedClip; |
119 |
- inPattern--; |
120 |
- gElements = m_groupStack.pop(); |
121 |
|
122 |
diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch |
123 |
deleted file mode 100644 |
124 |
index bb821ea5c9a..00000000000 |
125 |
--- a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch |
126 |
+++ /dev/null |
127 |
@@ -1,27 +0,0 @@ |
128 |
-From c62844064cd6d85802d21e188b0f479463e22095 Mon Sep 17 00:00:00 2001 |
129 |
-From: Jean Ghali <jghali@×××××××××××.fr> |
130 |
-Date: Sun, 4 Apr 2021 21:37:04 +0000 |
131 |
-Subject: [PATCH] #16536: Page::getFormWidgets() returns unique_ptr in poppler |
132 |
- 21.04.0 |
133 |
- |
134 |
-git-svn-id: svn://scribus.net/trunk/Scribus@24599 11d20701-8431-0410-a711-e3c959e3b870 |
135 |
---- |
136 |
- scribus/plugins/import/pdf/slaoutput.h | 4 ++++ |
137 |
- 1 file changed, 4 insertions(+) |
138 |
- |
139 |
-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h |
140 |
-index 66c34203ae..cb191b1023 100644 |
141 |
---- a/scribus/plugins/import/pdf/slaoutput.h |
142 |
-+++ b/scribus/plugins/import/pdf/slaoutput.h |
143 |
-@@ -379,7 +379,11 @@ class SlaOutputDev : public OutputDev |
144 |
- Catalog *catalog {nullptr}; |
145 |
- SplashFontEngine *m_fontEngine {nullptr}; |
146 |
- SplashFont *m_font {nullptr}; |
147 |
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0) |
148 |
-+ std::unique_ptr<FormPageWidgets> m_formWidgets; |
149 |
-+#else |
150 |
- FormPageWidgets *m_formWidgets {nullptr}; |
151 |
-+#endif |
152 |
- QHash<QString, QList<int> > m_radioMap; |
153 |
- QHash<int, PageItem*> m_radioButtons; |
154 |
- int m_actPage; |
155 |
|
156 |
diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild |
157 |
deleted file mode 100644 |
158 |
index 5e803e2024d..00000000000 |
159 |
--- a/app-office/scribus/scribus-1.5.6.1.ebuild |
160 |
+++ /dev/null |
161 |
@@ -1,161 +0,0 @@ |
162 |
-# Copyright 1999-2021 Gentoo Authors |
163 |
-# Distributed under the terms of the GNU General Public License v2 |
164 |
- |
165 |
-EAPI=7 |
166 |
- |
167 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
168 |
-PYTHON_REQ_USE="tk?" |
169 |
-COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a |
170 |
-inherit cmake desktop flag-o-matic python-single-r1 xdg |
171 |
- |
172 |
-DESCRIPTION="Desktop publishing (DTP) and layout program" |
173 |
-HOMEPAGE="https://www.scribus.net/" |
174 |
-SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
175 |
- |
176 |
-LICENSE="GPL-2" |
177 |
-SLOT="0" |
178 |
-KEYWORDS="amd64 ppc ppc64 x86" |
179 |
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" |
180 |
- |
181 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
182 |
- tk? ( scripts )" |
183 |
- |
184 |
-# osg |
185 |
-# couple of third_party libs bundled |
186 |
-BDEPEND=" |
187 |
- dev-qt/linguist-tools:5 |
188 |
- virtual/pkgconfig |
189 |
-" |
190 |
-DEPEND="${PYTHON_DEPS} |
191 |
- app-text/libmspub |
192 |
- app-text/libqxp |
193 |
- app-text/poppler:= |
194 |
- dev-libs/hyphen |
195 |
- dev-libs/icu:0= |
196 |
- dev-libs/librevenge |
197 |
- dev-libs/libxml2 |
198 |
- dev-qt/qtcore:5 |
199 |
- dev-qt/qtgui:5[-gles2-only] |
200 |
- dev-qt/qtnetwork:5 |
201 |
- dev-qt/qtopengl:5 |
202 |
- dev-qt/qtprintsupport:5 |
203 |
- dev-qt/qtwidgets:5 |
204 |
- dev-qt/qtxml:5 |
205 |
- media-libs/fontconfig |
206 |
- media-libs/freetype:2 |
207 |
- media-libs/harfbuzz:0=[icu] |
208 |
- media-libs/lcms:2 |
209 |
- media-libs/libcdr |
210 |
- media-libs/libfreehand |
211 |
- media-libs/libpagemaker |
212 |
- media-libs/libpng:0= |
213 |
- media-libs/libvisio |
214 |
- media-libs/libzmf |
215 |
- media-libs/tiff:0 |
216 |
- net-print/cups |
217 |
- sys-libs/zlib[minizip] |
218 |
- virtual/jpeg:0= |
219 |
- x11-libs/cairo[X,svg] |
220 |
- boost? ( dev-libs/boost:= ) |
221 |
- graphicsmagick? ( media-gfx/graphicsmagick:= ) |
222 |
- hunspell? ( app-text/hunspell:= ) |
223 |
- osg? ( dev-games/openscenegraph:= ) |
224 |
- pdf? ( app-text/podofo:0= ) |
225 |
- scripts? ( |
226 |
- $(python_gen_cond_dep ' |
227 |
- dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}] |
228 |
- ') |
229 |
- ) |
230 |
-" |
231 |
-RDEPEND="${DEPEND} |
232 |
- app-text/ghostscript-gpl |
233 |
-" |
234 |
- |
235 |
-PATCHES=( |
236 |
- "${FILESDIR}"/${P}-poppler-21.03.0-{1,2}.patch |
237 |
- "${FILESDIR}"/${P}-poppler-21.04.0.patch |
238 |
- # non(?)-upstreamable |
239 |
- "${FILESDIR}"/${PN}-1.5.3-fpic.patch |
240 |
- "${FILESDIR}"/${PN}-1.5.6-docdir.patch |
241 |
- "${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch |
242 |
- "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch |
243 |
-) |
244 |
- |
245 |
-CMAKE_BUILD_TYPE="Release" |
246 |
- |
247 |
-S="${WORKDIR}"/${PN}-${COMMIT} |
248 |
- |
249 |
-src_prepare() { |
250 |
- cmake_src_prepare |
251 |
- |
252 |
- rm -r codegen/cheetah scribus/third_party/hyphen || die |
253 |
- |
254 |
- sed \ |
255 |
- -e "/^\s*unzip\.[ch]/d" \ |
256 |
- -e "/^\s*ioapi\.[ch]/d" \ |
257 |
- -i scribus/CMakeLists.txt Scribus.pro || die |
258 |
- rm scribus/ioapi.[ch] || die |
259 |
- |
260 |
- sed \ |
261 |
- -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ |
262 |
- -i resources/templates/CMakeLists.txt || die |
263 |
- |
264 |
- sed \ |
265 |
- -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ |
266 |
- -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test |
267 |
-} |
268 |
- |
269 |
-src_configure() { |
270 |
- # bug #550818 |
271 |
- append-cppflags -DHAVE_MEMRCHR |
272 |
- |
273 |
- local mycmakeargs=( |
274 |
- -DHAVE_PYTHON=ON |
275 |
- -DWANT_DISTROBUILD=ON |
276 |
- -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ |
277 |
- -DPython3_EXECUTABLE="${PYTHON}" |
278 |
- -DWITH_BOOST=$(usex boost) |
279 |
- -DWANT_DEBUG=$(usex debug) |
280 |
- -DWANT_NOEXAMPLES=$(usex !examples) |
281 |
- -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick) |
282 |
- -DWANT_HUNSPELL=$(usex hunspell) |
283 |
- -DWANT_HEADERINSTALL=$(usex !minimal) |
284 |
- -DWANT_NOOSG=$(usex !osg) |
285 |
- -DWITH_PODOFO=$(usex pdf) |
286 |
- -DWANT_NOTEMPLATES=$(usex !templates) |
287 |
- ) |
288 |
- cmake_src_configure |
289 |
-} |
290 |
- |
291 |
-src_install() { |
292 |
- cmake_src_install |
293 |
- |
294 |
- if ! use tk; then |
295 |
- rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die |
296 |
- fi |
297 |
- if use scripts; then |
298 |
- python_fix_shebang "${ED}"/usr/share/scribus/scripts |
299 |
- python_optimize "${ED}"/usr/share/scribus/scripts |
300 |
- else |
301 |
- rm "${ED}"/usr/share/scribus/scripts/*.py || die |
302 |
- fi |
303 |
- |
304 |
- mv "${ED}"/usr/share/doc/${PF}/{en,html} || die |
305 |
- ln -sf html "${ED}"/usr/share/doc/${PF}/en || die |
306 |
- |
307 |
- # These files are parsed to populate the help/about window. |
308 |
- cat >> "${T}"/COPYING <<- EOF || die |
309 |
- ${PN} is licensed under the "${LICENSE}". |
310 |
- Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. |
311 |
- EOF |
312 |
- dodoc "${T}"/COPYING |
313 |
- docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} |
314 |
- |
315 |
- local size |
316 |
- for size in 16 32 128 256 512; do |
317 |
- newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png |
318 |
- done |
319 |
- newicon -s 64 resources/iconsets/artwork/icon_32x32@××.png scribus.png |
320 |
- doicon resources/iconsets/*/scribus.png |
321 |
- domenu scribus.desktop |
322 |
-} |