| 1 |
commit: 5908d48769d80baedb730c61b2605a983d97bb0f |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 04:37:21 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 04:37:27 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5908d487 |
| 7 |
|
| 8 |
app-office/scribus: fix build with Poppler 22.09.0 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/scribus-1.5.8-poppler-22.09.0.patch | 20 ++++++++++++++++++++ |
| 13 |
app-office/scribus/scribus-1.5.8-r1.ebuild | 1 + |
| 14 |
2 files changed, 21 insertions(+) |
| 15 |
|
| 16 |
diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000000..106a6f5162b6 |
| 19 |
--- /dev/null |
| 20 |
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch |
| 21 |
@@ -0,0 +1,20 @@ |
| 22 |
+--- a/scribus/plugins/import/pdf/slaoutput.cpp |
| 23 |
++++ b/scribus/plugins/import/pdf/slaoutput.cpp |
| 24 |
+@@ -3741,9 +3741,16 @@ void SlaOutputDev::getPenState(GfxState *state) |
| 25 |
+ break; |
| 26 |
+ } |
| 27 |
+ double lw = state->getLineWidth(); |
| 28 |
+- double *dashPattern; |
| 29 |
+ int dashLength; |
| 30 |
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0) |
| 31 |
++ const double *dashPattern; |
| 32 |
++ const std::vector<double> &dash = state->getLineDash(&DashOffset); |
| 33 |
++ dashPattern = dash.data(); |
| 34 |
++ dashLength = dash.size(); |
| 35 |
++#else |
| 36 |
++ double *dashPattern; |
| 37 |
+ state->getLineDash(&dashPattern, &dashLength, &DashOffset); |
| 38 |
++#endif |
| 39 |
+ QVector<double> pattern(dashLength); |
| 40 |
+ for (int i = 0; i < dashLength; ++i) |
| 41 |
+ { |
| 42 |
|
| 43 |
diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild b/app-office/scribus/scribus-1.5.8-r1.ebuild |
| 44 |
index 5457bc6ee17f..175ae6cd558b 100644 |
| 45 |
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild |
| 46 |
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild |
| 47 |
@@ -80,6 +80,7 @@ PATCHES=( |
| 48 |
"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-2.patch |
| 49 |
"${FILESDIR}"/${PN}-1.5.8-poppler-22.03.0.patch # bug 834537 |
| 50 |
"${FILESDIR}"/${PN}-1.5.8-poppler-22.04.0.patch # bug 843287 |
| 51 |
+ "${FILESDIR}"/${PN}-1.5.8-poppler-22.09.0.patch |
| 52 |
) |
| 53 |
|
| 54 |
CMAKE_BUILD_TYPE="Release" |
Archives