forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-office/calligra: Fix build with poppler-0.82.0
Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <[email protected]>
- Loading branch information
Showing
2 changed files
with
39 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
Patch stolen from Mageia Cauldron but had to be modified quite a bit. | ||
|
||
diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp | ||
index ffdbf01..70bc9f8 100644 | ||
--- a/filters/karbon/pdf/SvgOutputDev.cpp | ||
+++ b/filters/karbon/pdf/SvgOutputDev.cpp | ||
@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) | ||
const char * p = s->c_str(); | ||
int len = s->getLength(); | ||
CharCode code; | ||
- Unicode *u = nullptr; | ||
+ const Unicode *u = nullptr; | ||
int uLen; | ||
double dx, dy, originX, originY; | ||
while (len > 0) { | ||
@@ -545,7 +545,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, | ||
|
||
void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, | ||
int width, int height, GfxImageColorMap *colorMap, | ||
- bool /*interpolate*/, int *maskColors, bool inlineImg) | ||
+ bool /*interpolate*/, const int *maskColors, bool inlineImg) | ||
{ | ||
drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); | ||
} | ||
--- a/filters/karbon/pdf/SvgOutputDev.h | ||
+++ b/filters/karbon/pdf/SvgOutputDev.h | ||
@@ -63,7 +63,7 @@ public: | ||
// images | ||
void drawImage(GfxState *state, Object *ref, Stream *str, | ||
int width, int height, GfxImageColorMap *colorMap, | ||
- bool interpolate, int *maskColors, bool inlineImg) override; | ||
+ bool interpolate, const int *maskColors, bool inlineImg) override; | ||
|
||
// styles | ||
virtual void updateAll(GfxState *state); |