From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/
Date: Tue, 8 Jan 2019 01:47:58 +0000 (UTC) [thread overview]
Message-ID: <1546912063.e785021cfd5f1dba3d3ab7a11416960b322479f6.asturm@gentoo> (raw)
commit: e785021cfd5f1dba3d3ab7a11416960b322479f6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 01:12:51 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 8 01:47:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e785021c
app-office/calligra: Fix build with poppler-0.72
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligra/calligra-3.1.0-r3.ebuild | 1 +
.../files/calligra-3.1.0-poppler-0.72.patch | 54 ++++++++++++++++++++++
2 files changed, 55 insertions(+)
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild
index f126c2aad96..766e2b2b60a 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -120,6 +120,7 @@ PATCHES=(
"${FILESDIR}"/${P}-stage-qt-5.11.patch
"${FILESDIR}"/${P}-poppler-0.69.patch
"${FILESDIR}"/${P}-poppler-0.71.patch
+ "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
"${FILESDIR}"/${P}-no-webkit.patch
)
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
new file mode 100644
index 00000000000..3b2e690257b
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
@@ -0,0 +1,54 @@
+From 8f20ea906235cbee1d4aac4706e4eb03366875bf Mon Sep 17 00:00:00 2001
+From: "Tobias C. Berner" <tcberner@FreeBSD.org>
+Date: Mon, 7 Jan 2019 19:50:48 +0100
+Subject: [PATCH] Make compatible with poppler 0.72
+
+---
+ filters/karbon/pdf/SvgOutputDev.cpp | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 4a1fad6bbcf..b1d4ea2d427 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -25,6 +25,7 @@
+ #include <poppler/GfxState.h>
+ #include <poppler/Stream.h>
+ #include <poppler/GfxFont.h>
++#include <poppler/glib/poppler-features.h>
+
+ #include <QFile>
+ #include <QTextStream>
+@@ -409,7 +410,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+
+ QString str;
+
++#if POPPLER_CHECK_VERSION(0,72,0)
++ const char * p = s->c_str();
++#else
+ const char * p = s->getCString();
++#endif
+ int len = s->getLength();
+ CharCode code;
+ Unicode *u = nullptr;
+@@ -459,10 +464,18 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ *d->body << " y=\"" << y << "px\"";
+
+ if (font && font->getFamily()) {
++#if POPPLER_CHECK_VERSION(0,72,0)
++ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
++#else
+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
++#endif
+ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
+ } else if (font && font->getName()) {
++#if POPPLER_CHECK_VERSION(0,72,0)
++ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
++#else
+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
++#endif
+ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
+ }
+ *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
+--
+2.20.1
next reply other threads:[~2019-01-08 1:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-08 1:47 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-09 18:32 [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/ Andreas Sturmlechner
2024-06-06 18:09 Andreas Sturmlechner
2024-03-15 12:19 Andreas Sturmlechner
2023-04-22 16:48 Sam James
2023-03-29 12:46 Andreas Sturmlechner
2023-02-16 3:29 Sam James
2022-05-16 18:46 Andreas Sturmlechner
2021-06-17 12:19 Andreas Sturmlechner
2020-07-18 8:41 Andreas Sturmlechner
2019-12-25 21:20 Andreas Sturmlechner
2019-01-16 16:30 Andreas Sturmlechner
2019-01-01 19:40 Andreas Sturmlechner
2019-01-01 19:40 Andreas Sturmlechner
2018-04-05 23:38 Andreas Sturmlechner
2018-03-24 6:42 Andreas Sturmlechner
2018-01-28 1:19 Andreas Sturmlechner
2017-03-21 20:52 Andreas Sturmlechner
2017-01-06 22:35 Andreas Sturmlechner
2016-12-08 14:10 Johannes Huber
2016-03-22 19:11 Johannes Huber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1546912063.e785021cfd5f1dba3d3ab7a11416960b322479f6.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox