| 1 |
commit: 635e0dd7cf4a58a29f6fb44b1e0e39371e3e60bb |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 14 22:26:53 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 14 23:34:25 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635e0dd7 |
| 7 |
|
| 8 |
app-office/scribus: 1.5.5_pre20190113 snapshot, build w/ poppler-0.73 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/674804 |
| 11 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-office/scribus/Manifest | 2 +- |
| 15 |
.../scribus-1.5.5_pre20190113-poppler-0.73.patch | 24 ++++++++++++++++++++++ |
| 16 |
...227.ebuild => scribus-1.5.5_pre20190113.ebuild} | 3 ++- |
| 17 |
3 files changed, 27 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest |
| 20 |
index ee5658be540..4e57dbe3b39 100644 |
| 21 |
--- a/app-office/scribus/Manifest |
| 22 |
+++ b/app-office/scribus/Manifest |
| 23 |
@@ -1,3 +1,3 @@ |
| 24 |
DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568 |
| 25 |
DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403 |
| 26 |
-DIST scribus-1.5.5_pre20181227.tar.gz 84926534 BLAKE2B 1fa392a8a196aac028ad4f1b913f31c5655a191d5ff3db26f16b4b181885bb1035ca95d11b100ad1b6cc7aea0ea21677a211c83dbd94bfe730a94ed4feaaf6bc SHA512 53a9494dca4520ec89b4b4487c09683da00876088ed2750fd80bca6cbc96536c0bcfb8c96d671d9ca0ed0b74cbd8f75382298e3d20285d52cec52951807f4797 |
| 27 |
+DIST scribus-1.5.5_pre20190113.tar.gz 84927002 BLAKE2B ff515bbd66267493e4558fa2cbdca57fb3e9514940c3c7cc48e435e5d78349674f57bdbeeeb0574c7e7e2d1a2d2482a5b16ccc48c62281f2d11c28a5cc38f915 SHA512 1ed9bd3add1a62234b8e26f10a31a015f3a224da588b7b72c854209a45faae61ee949d2986980700132f9d573a426c1283f4e375c25d7ea63ce6b04260a863bb |
| 28 |
|
| 29 |
diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000000..af98da7050c |
| 32 |
--- /dev/null |
| 33 |
+++ b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch |
| 34 |
@@ -0,0 +1,24 @@ |
| 35 |
+From 5a3255ac6dd1f19fb5fb5ab17452083bfe573f42 Mon Sep 17 00:00:00 2001 |
| 36 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 37 |
+Date: Mon, 14 Jan 2019 23:58:59 +0100 |
| 38 |
+Subject: [PATCH] Drop obsolete header, does not exist in poppler-0.73 |
| 39 |
+ |
| 40 |
+--- |
| 41 |
+ scribus/plugins/import/pdf/slaoutput.h | 1 - |
| 42 |
+ 1 file changed, 1 deletion(-) |
| 43 |
+ |
| 44 |
+diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h |
| 45 |
+index c46448b..83e010c 100644 |
| 46 |
+--- a/scribus/plugins/import/pdf/slaoutput.h |
| 47 |
++++ b/scribus/plugins/import/pdf/slaoutput.h |
| 48 |
+@@ -28,7 +28,6 @@ for which a new license (GPL+exception) is in place. |
| 49 |
+ #include "selection.h" |
| 50 |
+ #include "vgradient.h" |
| 51 |
+ |
| 52 |
+-#include <poppler/goo/gtypes.h> |
| 53 |
+ #include <poppler/Object.h> |
| 54 |
+ #include <poppler/OutputDev.h> |
| 55 |
+ #include <poppler/Gfx.h> |
| 56 |
+-- |
| 57 |
+2.20.1 |
| 58 |
+ |
| 59 |
|
| 60 |
diff --git a/app-office/scribus/scribus-1.5.5_pre20181227.ebuild b/app-office/scribus/scribus-1.5.5_pre20190113.ebuild |
| 61 |
similarity index 98% |
| 62 |
rename from app-office/scribus/scribus-1.5.5_pre20181227.ebuild |
| 63 |
rename to app-office/scribus/scribus-1.5.5_pre20190113.ebuild |
| 64 |
index b92edd436ae..77540ffb19b 100644 |
| 65 |
--- a/app-office/scribus/scribus-1.5.5_pre20181227.ebuild |
| 66 |
+++ b/app-office/scribus/scribus-1.5.5_pre20190113.ebuild |
| 67 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 68 |
PYTHON_COMPAT=( python2_7 ) |
| 69 |
PYTHON_REQ_USE="tk?" |
| 70 |
CMAKE_MAKEFILE_GENERATOR=ninja |
| 71 |
-COMMIT=d857c1a3430acf207cdde2512db6822c45e98732 |
| 72 |
+COMMIT=6326f2af85935842fa7a93eb8f86bd2ae698245e |
| 73 |
inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 xdg-utils |
| 74 |
|
| 75 |
DESCRIPTION="Desktop publishing (DTP) and layout program" |
| 76 |
@@ -94,6 +94,7 @@ DEPEND="${COMMON_DEPEND} |
| 77 |
PATCHES=( |
| 78 |
"${FILESDIR}"/${PN}-1.5.3-docdir.patch |
| 79 |
"${FILESDIR}"/${PN}-1.5.3-fpic.patch |
| 80 |
+ "${FILESDIR}"/${P}-poppler-0.73.patch |
| 81 |
) |
| 82 |
|
| 83 |
S="${WORKDIR}"/${PN}-${COMMIT} |
Archives