summaryrefslogtreecommitdiff
path: root/user/calligra/poppler-73.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-01-14 18:54:59 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-01-14 18:54:59 +0000
commit24d6d9273c29fc00b392ac2fa74ff51b8d06f073 (patch)
tree66aedd88134a478c2ac81c3145f34e98a55e03e8 /user/calligra/poppler-73.patch
parentce4b7b54ce42b8eec74967d260086dd5542a22fa (diff)
downloadpackages-24d6d9273c29fc00b392ac2fa74ff51b8d06f073.tar.gz
packages-24d6d9273c29fc00b392ac2fa74ff51b8d06f073.tar.bz2
packages-24d6d9273c29fc00b392ac2fa74ff51b8d06f073.tar.xz
packages-24d6d9273c29fc00b392ac2fa74ff51b8d06f073.zip
user/calligra: Fix build with Poppler 0.72 and 0.73+
Diffstat (limited to 'user/calligra/poppler-73.patch')
-rw-r--r--user/calligra/poppler-73.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/user/calligra/poppler-73.patch b/user/calligra/poppler-73.patch
new file mode 100644
index 000000000..aa71e20b4
--- /dev/null
+++ b/user/calligra/poppler-73.patch
@@ -0,0 +1,45 @@
+--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2019-01-14 18:40:55.580000000 +0000
++++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-01-14 18:53:05.000000000 +0000
+@@ -402,7 +402,7 @@
+
+ QString str;
+
+- const char * p = s->getCString();
++ const char * p = s->c_str();
+ int len = s->getLength();
+ CharCode code;
+ Unicode *u = nullptr;
+@@ -451,11 +451,11 @@
+ *d->body << " y=\"" << y << "px\"";
+
+ if (font && font->getFamily()) {
+- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
+- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
++ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
++ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() );
+ } else if (font && font->getName()) {
+- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
+- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
++ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
++ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() );
+ }
+ *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
+
+@@ -488,7 +488,7 @@
+ if (maskColors) {
+ for (int y = 0; y < height; y++) {
+ dest = (unsigned int *)(buffer + y * 4 * width);
+- Guchar * pix = imgStr->getLine();
++ unsigned char * pix = imgStr->getLine();
+ colorMap->getRGBLine(pix, dest, width);
+
+ for (int x = 0; x < width; x++) {
+@@ -507,7 +507,7 @@
+ } else {
+ for (int y = 0; y < height; y++) {
+ dest = (unsigned int *)(buffer + y * 4 * width);
+- Guchar * pix = imgStr->getLine();
++ unsigned char * pix = imgStr->getLine();
+ colorMap->getRGBLine(pix, dest, width);
+ }
+