gentoo resync : 03.11.2019

4 files changed, 131 insertions, 1 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 5e1d9471075b..15267a81fde3 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 857b858aa55f..77fc8e926f08 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,6 @@
+AUX kitinerary-19.08.2-poppler-0.82.patch 4565 BLAKE2B 4fc0e4e52cede5bdb353c6f57a3f4d9d84a36e528ac9e4365039a08d6e1edd36ed0eef176d2ebe2a607b8b4e395e23ff6fa84132083814939a83f2b7d299e8a1 SHA512 6162e412f6e13c7d6c98b56ccd4fe1eff357fdb8baa93974c9134d64cd5ae69bfbcd9c6ab7beb70c40aa222994e6b2af2c00b2fa69f347bf18fd40eb5d476d12
 DIST kitinerary-19.04.3.tar.xz 689352 BLAKE2B 68f08908e4c8b18791988412ec0bee1fbf16cbe6047bcb6f9fffa469dcf9ecdbf0429b56622afb107cf83b645053c15e798ee27d2fd49807c78be42ee73344e4 SHA512 8edb33f42d10c62006b1676866707a45276259b4e2e3a53e318436a316a2a9da6d0fc8db8c104ee3d5b9a4fd383377fdd100f7d4e3e131c432e8acc5af04e731
 DIST kitinerary-19.08.2.tar.xz 954636 BLAKE2B 16a7379f5fa36bf35aec60a2999623e5358a3bcc3795560f6273046d0e4709c9b4c2d7ff71a84dfdaf89d6e427a3399d48d8f3ea7ba721a0962c1a35566ce59e SHA512 a9278d0b35ecc30e357ccd5d6b1d2aca4237c7a831919478c3628d83bff0583a9ed3e5155cc9df7d42636e2a16fc608c56297755cfddab11d0ae51cf3639ef73
 EBUILD kitinerary-19.04.3.ebuild 826 BLAKE2B c521cbdc55ee9f36d851bb224973b18fcceadf9a84b07f3670813b9d36949a1d48479b642283ba6d732603626e8230d7c4732caa553eeb9be3c511b04b2af61b SHA512 d84c321683b2fd81f460ac7ac9f337c59b22efa2fd820299ec7800fcddaaeab7ebea8472e54e9f5cfe704fcafe90c177e0f4f7cd92ab28b22aa67431230a75d1
-EBUILD kitinerary-19.08.2.ebuild 932 BLAKE2B dbbc5add4c29faf56f12781926a639ca98792c3a7310b9ac4a27a24ab6f0c00fe951a1c98c3dbc926bd65edbd95749f229962bd3c5b1730b91bba65f70f36243 SHA512 e893d8530447c567facd28bc51230d238b70a447642a89c63c71ac5d74104f2bf1e5b058ac7f27c568cad721fb185e75cc3b12a993efcfe8321e448132603d38
+EBUILD kitinerary-19.08.2.ebuild 983 BLAKE2B f661addecfbc054335eb8ab77549bf64ddf7b0748db002a7d75d10dc3e775dafe3bbf0c1b27dbc3e4d5ff3cd45ffc648f795421c0408b30fa19ea64251eb1280 SHA512 5a886831d3228b7a631c078df60d0d96b60fbb8ee4513354abfbe90f31c7276efb981f23c5898e29bd68725462df193db425796bba7ca7cc7137d6ba0c55b128
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch b/kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch
new file mode 100644
index 000000000000..be2152dafef0
--- /dev/null
+++ b/kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch
@@ -0,0 +1,127 @@
+From 0f8b2babcc69c490ae6548bda7ceeb1ffd27a9e3 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Sun, 29 Sep 2019 12:51:57 +0200
+Subject: Fix compatibility with Poppler 0.82
+
+---
+ CMakeLists.txt                       | 17 ++++++-----------
+ src/config-kitinerary.h.cmake        |  1 +
+ src/pdf/pdfextractoroutputdevice.cpp |  2 +-
+ src/pdf/pdfextractoroutputdevice_p.h |  3 ++-
+ src/pdf/popplertypes_p.h             | 30 ++++++++++++++++++++++++++++++
+ 5 files changed, 40 insertions(+), 13 deletions(-)
+ create mode 100644 src/pdf/popplertypes_p.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cb222d9..1d66d3b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,17 +62,12 @@ if(TARGET Poppler::Core)
+     if (${Poppler_VERSION} VERSION_GREATER 0.68)
+         set(HAVE_POPPLER_0_69 ON)
+     endif()
+-    set(CMAKE_REQUIRED_LIBRARIES Poppler::Core Qt5::Core)
+-    check_cxx_source_compiles("
+-    #include <goo/GooString.h>
+-    #include <QString>
+-    int main()
+-    {
+-        GooString s;
+-        QString val = QString::fromUtf8(s.c_str());
+-        return 0;
+-    }
+-    " HAVE_POPPLER_0_72)
++    if (${Poppler_VERSION} VERSION_GREATER 0.71)
++        set(HAVE_POPPLER_0_72 ON)
++    endif()
++    if (${Poppler_VERSION} VERSION_GREATER 0.81)
++        set(HAVE_POPPLER_0_82 ON)
++    endif()
+ endif()
+ 
+ if (TARGET ZXing::Core)
+diff --git a/src/config-kitinerary.h.cmake b/src/config-kitinerary.h.cmake
+index b0bda20..6d3b156 100644
+--- a/src/config-kitinerary.h.cmake
++++ b/src/config-kitinerary.h.cmake
+@@ -24,6 +24,7 @@
+ #cmakedefine HAVE_POPPLER_0_58
+ #cmakedefine HAVE_POPPLER_0_69
+ #cmakedefine HAVE_POPPLER_0_72
++#cmakedefine HAVE_POPPLER_0_82
+ 
+ #cmakedefine HAVE_ZXING
+ 
+diff --git a/src/pdf/pdfextractoroutputdevice.cpp b/src/pdf/pdfextractoroutputdevice.cpp
+index 2a06c82..0027cad 100644
+--- a/src/pdf/pdfextractoroutputdevice.cpp
++++ b/src/pdf/pdfextractoroutputdevice.cpp
+@@ -30,7 +30,7 @@ PdfExtractorOutputDevice::PdfExtractorOutputDevice()
+ {
+ }
+ 
+-void PdfExtractorOutputDevice::drawImage(GfxState* state, Object* ref, Stream* str, int width, int height, GfxImageColorMap* colorMap, bool interpolate, int* maskColors, bool inlineImg)
++void PdfExtractorOutputDevice::drawImage(GfxState* state, Object* ref, Stream* str, int width, int height, GfxImageColorMap* colorMap, bool interpolate, PopplerMaskColors* maskColors, bool inlineImg)
+ {
+     Q_UNUSED(str);
+     Q_UNUSED(interpolate);
+diff --git a/src/pdf/pdfextractoroutputdevice_p.h b/src/pdf/pdfextractoroutputdevice_p.h
+index 9241f9f..5d448d3 100644
+--- a/src/pdf/pdfextractoroutputdevice_p.h
++++ b/src/pdf/pdfextractoroutputdevice_p.h
+@@ -21,6 +21,7 @@
+ #include <config-kitinerary.h>
+ 
+ #include "pdfvectorpicture_p.h"
++#include "popplertypes_p.h"
+ 
+ #ifdef HAVE_POPPLER
+ #include <TextOutputDev.h>
+@@ -43,7 +44,7 @@ public:
+     void finalize();
+ 
+     bool needNonText() override { return true; }
+-    void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg) override;
++    void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, PopplerMaskColors *maskColors, bool inlineImg) override;
+ 
+     // operations used to detect vector barcodes
+     void saveState(GfxState *state) override;
+diff --git a/src/pdf/popplertypes_p.h b/src/pdf/popplertypes_p.h
+new file mode 100644
+index 0000000..f9d844a
+--- /dev/null
++++ b/src/pdf/popplertypes_p.h
+@@ -0,0 +1,30 @@
++/*
++    Copyright (C) 2019 Volker Krause <vkrause@kde.org>
++
++    This program is free software; you can redistribute it and/or modify it
++    under the terms of the GNU Library General Public License as published by
++    the Free Software Foundation; either version 2 of the License, or (at your
++    option) any later version.
++
++    This program is distributed in the hope that it will be useful, but WITHOUT
++    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
++    License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program.  If not, see <https://www.gnu.org/licenses/>.
++*/
++
++#ifndef KITINERARY_POPPLERTYPES_P_H
++#define KITINERARY_POPPLERTYPES_P_H
++
++#include <config-kitinerary.h>
++
++#ifdef HAVE_POPPLER_0_82
++using PopplerMaskColors = const int;
++#else
++using PopplerMaskColors = int;
++#endif
++
++#endif // KITINERARY_POPPLERTYPES_P_H
++
+-- 
+cgit v1.1
+
diff --git a/kde-apps/kitinerary/kitinerary-19.08.2.ebuild b/kde-apps/kitinerary/kitinerary-19.08.2.ebuild
index c813a4246b4e..3ad5d865506e 100644
--- a/kde-apps/kitinerary/kitinerary-19.08.2.ebuild
+++ b/kde-apps/kitinerary/kitinerary-19.08.2.ebuild
@@ -31,6 +31,8 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-addons-18.07.80
 "
 
+PATCHES=( "${FILESDIR}"/${P}-poppler-0.82.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package barcode ZXing)