gentoo resync : 25.01.2019

4 files changed, 26 insertions, 36 deletions

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index f0e7ba263025..a4d99c52a6f2 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -4,10 +4,10 @@ AUX calligra-3.1.0-no-webkit.patch 2587 BLAKE2B 9c5de12f3fe100060ec89eec8190ac2d
 AUX calligra-3.1.0-plan-qt-5.11.patch 3818 BLAKE2B 1a1f619a491cbc3440ec8db091a1a0775c56f37ebb0be1a4ea0815ced8b6d22598b985e1a419bb572edb430c253d3fd5d0194d6f264ed4ac59c10d8d811cbc72 SHA512 fc375a35f5e29efc404f3546b995568f3c0a9cd3fb94e3c98085a897f9e9d08a1ea41ad1359665392b2f7449e552dead236c3617a4462d94ad4fa2689538150d
 AUX calligra-3.1.0-poppler-0.69.patch 2963 BLAKE2B 8fac1f298d414ac52073dfdb645d00eab1f2c71f876eea08feb8d9057f33b3ff5dbf69abe10984aa15717ef505522b07153341e846ace24a5f80f175dfed4600 SHA512 b408f1333af40c7270a2f14fa5f9069ec16baeceac7e2b91be2e9759d095d6df92a16b33e0b7c6897dbb15f01ae789436f8864cd1dd38ff009c1a77501e32083
 AUX calligra-3.1.0-poppler-0.71.patch 6868 BLAKE2B 3787bcc3564598450ec14b9bd4e63559af6ebd3a92f9c80560812f7b9a8f94681987ca6dfa49faee7ed3985d09a7f49d2a2499f9c6acfb5a96a0f8c86d7b8484 SHA512 1376ac7940e6ca0e9615445dc9c16f5ff75db547944dc8a5006520ff30b9d34eced1e5fa679a82535ceb581ae96352d1b6c039b54038290973f456de4d792917
-AUX calligra-3.1.0-poppler-0.72.patch 2053 BLAKE2B 1a69315b986aeb2464a57c5fdb63e2d0c33cb256be64c868af666169ab693109c45ad0ed15f35639020e2e1eb707592694b07896dced4f364e0cff817ce3190a SHA512 216eb134eb24f10492581a30dacd7e7b8259cdac3d6f21423cc773b1752a8464eabb15c6263c5bbe4e8e741cf1e02db07e854b4f2113399773ad6c56025fe1b9
+AUX calligra-3.1.0-poppler-0.72.patch 1777 BLAKE2B 28db9f2f6a69c4460fe5be2907f3ff38b7e1b1ff8e6b5480c1ac532f7884706f47da45709f0791a43146dc58e99e3a789700ac53afba9e99a28e8c0c96913a46 SHA512 4e50c321875a0a685d5401c0b8f8f85a76f873cbc0cd6faeb6798d5a3119e4a8123742d58348752ec7d87c1a3055161aaabbda15759cf8e22f2752ef25375376
 AUX calligra-3.1.0-poppler-0.73.patch 1342 BLAKE2B e36495c1f1f6c546666f30473fea46dfbdf47906ee61c2fed325a27117c14d3899703c6ca4667b3185ab9cacf3a5aa79a0c829777100d3088711f8fa359f5752 SHA512 ef5710d4f7fcc8015ce725b6f2f26ae1a8cd9bfe2e857633662696453104661f154309f0d0cc5e30b15b868bb43549d5ab8f81ee4cde31f0465cf795d453d233
 AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e
 AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
-EBUILD calligra-3.1.0-r3.ebuild 5775 BLAKE2B 50f09e292397a68ccea880521cff3c8521e5da05617b6b465b23289cc7c10c5dfb756dc3cc1c881e24cfbf99885e893c8cdc3760c138539ebaa54fe469b69083 SHA512 73e72d5e9cfadd295113cb3c79bc9f29b8c33a5bc565528f8d3c21384b1ae5b93637a5c6e6dafcb57545660e2a93f218099533da2f8644ab6d11f639541f89d0
-MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893
+EBUILD calligra-3.1.0-r3.ebuild 5903 BLAKE2B 6e8185c7fe26dfab200fd34be8fe59b1a443c485ab4275739d601463c5a7b492c5c6b8ae7c70c5c1c4d4b17a8debe9a8aa0ea0285ac4c4559a810bb4f514f8c1 SHA512 ef19a01ec7be39e7254ba3e117c5c8724aa6e2570ab9a1a64f02c5b0965fc2c9c5fa436d3ccdd9196fca6a25fa5467ae7cd28a52511ce9884b7f27d13f445062
+MISC metadata.xml 1223 BLAKE2B a488977274cd14e919409e0443ebadeefaabdc33a514e806fa2fb1bb3cd0b26fef95c705fcba1bbf7f9d259a7e50f2769a89cf42863c53996fda5cc60712487f SHA512 c965d2effceb77a5cc8696010f538046a703576671368def2c2990b70c00f43105d5a3bf9f438dab1220b2e20003d49596e4adc4b1c90146a13549daacc8bf89
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 24ca06bcb3ab..81597b0d7d19 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 
 CAL_FTS=( karbon sheets stage words )
 
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
 	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
 
 # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
@@ -65,6 +65,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/libiconv
 	activities? ( $(add_frameworks_dep kactivities) )
+	charts? ( dev-libs/kreport )
 	crypt? ( app-crypt/qca:2[qt5(+)] )
 	fontconfig? ( media-libs/fontconfig )
 	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
@@ -103,7 +104,6 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	sys-devel/gettext
-	x11-misc/shared-mime-info
 	test? ( $(add_frameworks_dep threadweaver) )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -120,8 +120,6 @@ 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}-poppler-0.73.patch
 	"${FILESDIR}"/${P}-no-webkit.patch
 )
 
@@ -137,6 +135,11 @@ pkg_setup() {
 src_prepare() {
 	kde5_src_prepare
 
+	if has_version ">=app-text/poppler-0.72"; then
+		eapply "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
+		eapply "${FILESDIR}"/${P}-poppler-0.73.patch
+	fi
+
 	if ! use test; then
 		sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
 			-i libs/pigment/CMakeLists.txt || die
@@ -175,6 +178,7 @@ src_configure() {
 		-DWITH_Iconv=ON
 		-DPRODUCTSET="${myproducts[*]}"
 		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package charts KChart)
 		-DWITH_Qca-qt5=$(usex crypt)
 		-DWITH_Fontconfig=$(usex fontconfig)
 		$(cmake-utils_use_find_package gemini Libgit2)
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
index 3b2e690257be..817a8ddcd679 100644
--- 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
@@ -1,54 +1,39 @@
-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
+From 3784fdf0259a14f1f7b20c156dcfe42b45d76896 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 24 Jan 2019 23:55:02 +0100
+Subject: [PATCH] Fix build with poppler-0.72
 
+This is a downstream fix without backwards compat, not upstreamable.
 ---
- filters/karbon/pdf/SvgOutputDev.cpp | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
+ filters/karbon/pdf/SvgOutputDev.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 4a1fad6bbcf..b1d4ea2d427 100644
+index 391e86cc117..bc72a003efb 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)
+@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
  
      QString str;
  
-+#if POPPLER_CHECK_VERSION(0,72,0)
+-    const char * p = s->getCString();
 +    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)
+@@ -451,10 +451,10 @@ 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()->getCString()) << "\"";
 +        *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()->getCString()) << "\"";
 +        *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
+
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 575f0b0a9176..d5fb30da6eb0 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
+		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kreport</pkg></flag>
 		<flag name="gemini">Enable tablet and 2:1 devices support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>