| 1 |
commit: 9699b1c310d94b9a4c76336a5f0a4aebe2589e91 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 16 16:20:59 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 16 16:20:59 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9699b1c3 |
| 7 |
|
| 8 |
app-office/calligra: Fix build with poppler-0.73 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/675454 |
| 11 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-office/calligra/calligra-3.1.0-r3.ebuild | 1 + |
| 15 |
.../files/calligra-3.1.0-poppler-0.73.patch | 35 ++++++++++++++++++++++ |
| 16 |
2 files changed, 36 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild |
| 19 |
index 329a851fea6..24ca06bcb3a 100644 |
| 20 |
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild |
| 21 |
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild |
| 22 |
@@ -121,6 +121,7 @@ PATCHES=( |
| 23 |
"${FILESDIR}"/${P}-poppler-0.69.patch |
| 24 |
"${FILESDIR}"/${P}-poppler-0.71.patch |
| 25 |
"${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable |
| 26 |
+ "${FILESDIR}"/${P}-poppler-0.73.patch |
| 27 |
"${FILESDIR}"/${P}-no-webkit.patch |
| 28 |
) |
| 29 |
|
| 30 |
|
| 31 |
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..727f6edf3f1 |
| 34 |
--- /dev/null |
| 35 |
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch |
| 36 |
@@ -0,0 +1,35 @@ |
| 37 |
+From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001 |
| 38 |
+From: Albert Astals Cid <aacid@×××.org> |
| 39 |
+Date: Tue, 15 Jan 2019 22:24:08 +0100 |
| 40 |
+Subject: Guchar -> unsigned char |
| 41 |
+ |
| 42 |
+It was just a typdef and it's now gone |
| 43 |
+--- |
| 44 |
+ filters/karbon/pdf/SvgOutputDev.cpp | 4 ++-- |
| 45 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 46 |
+ |
| 47 |
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp |
| 48 |
+index 80f01a5..1a5aa30b 100644 |
| 49 |
+--- a/filters/karbon/pdf/SvgOutputDev.cpp |
| 50 |
++++ b/filters/karbon/pdf/SvgOutputDev.cpp |
| 51 |
+@@ -496,7 +496,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, |
| 52 |
+ if (maskColors) { |
| 53 |
+ for (int y = 0; y < height; y++) { |
| 54 |
+ dest = (unsigned int *)(buffer + y * 4 * width); |
| 55 |
+- Guchar * pix = imgStr->getLine(); |
| 56 |
++ unsigned char * pix = imgStr->getLine(); |
| 57 |
+ colorMap->getRGBLine(pix, dest, width); |
| 58 |
+ |
| 59 |
+ for (int x = 0; x < width; x++) { |
| 60 |
+@@ -515,7 +515,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, |
| 61 |
+ } else { |
| 62 |
+ for (int y = 0; y < height; y++) { |
| 63 |
+ dest = (unsigned int *)(buffer + y * 4 * width); |
| 64 |
+- Guchar * pix = imgStr->getLine(); |
| 65 |
++ unsigned char * pix = imgStr->getLine(); |
| 66 |
+ colorMap->getRGBLine(pix, dest, width); |
| 67 |
+ } |
| 68 |
+ |
| 69 |
+-- |
| 70 |
+cgit v1.1 |
| 71 |
+ |
Archives