From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- kde-apps/kitinerary/Manifest | 5 +- .../files/kitinerary-19.08.2-poppler-0.82.patch | 127 --------------------- kde-apps/kitinerary/kitinerary-19.08.2.ebuild | 42 ------- kde-apps/kitinerary/kitinerary-19.08.3.ebuild | 44 +++++++ 4 files changed, 46 insertions(+), 172 deletions(-) delete mode 100644 kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch delete mode 100644 kde-apps/kitinerary/kitinerary-19.08.2.ebuild create mode 100644 kde-apps/kitinerary/kitinerary-19.08.3.ebuild (limited to 'kde-apps/kitinerary') diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest index 77fc8e926f08..e50c56351ef3 100644 --- a/kde-apps/kitinerary/Manifest +++ b/kde-apps/kitinerary/Manifest @@ -1,6 +1,5 @@ -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 +DIST kitinerary-19.08.3.tar.xz 955500 BLAKE2B 1f09ccb61ca37b44efad2af4b2e9adf48f3f60e7368847e8602213602f7d23f016a525fa9e7f0bcd644dbaf2c43bde53d8dfe52d8bf4941b6f2930b30022d774 SHA512 357c8e18353dea4fbf5c73d5948dc81c5ed620e3e43503b62efa6367c13d9807f9c3e6790918c02b968864eabaad12b4f1001f69d2f4cffd4845b40cbb7f2a4d EBUILD kitinerary-19.04.3.ebuild 826 BLAKE2B c521cbdc55ee9f36d851bb224973b18fcceadf9a84b07f3670813b9d36949a1d48479b642283ba6d732603626e8230d7c4732caa553eeb9be3c511b04b2af61b SHA512 d84c321683b2fd81f460ac7ac9f337c59b22efa2fd820299ec7800fcddaaeab7ebea8472e54e9f5cfe704fcafe90c177e0f4f7cd92ab28b22aa67431230a75d1 -EBUILD kitinerary-19.08.2.ebuild 983 BLAKE2B f661addecfbc054335eb8ab77549bf64ddf7b0748db002a7d75d10dc3e775dafe3bbf0c1b27dbc3e4d5ff3cd45ffc648f795421c0408b30fa19ea64251eb1280 SHA512 5a886831d3228b7a631c078df60d0d96b60fbb8ee4513354abfbe90f31c7276efb981f23c5898e29bd68725462df193db425796bba7ca7cc7137d6ba0c55b128 +EBUILD kitinerary-19.08.3.ebuild 1036 BLAKE2B 913a9d67877fbaa527c7204bec00bf6076c4ac376451187f9419f9ab53b1186a417b2ae84c7288afa4f9d3aba23289465c9912746cd28f4158222024ba3ed7b3 SHA512 6a43a3024977d635baaf5df51d931fa625e2c1d456b67563fa91ece475141b4987e368d32d11ba87934c1cebe6fa4e2adc5d6f731b13e8687e4ae71d07341f0c 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 deleted file mode 100644 index be2152dafef0..000000000000 --- a/kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 0f8b2babcc69c490ae6548bda7ceeb1ffd27a9e3 Mon Sep 17 00:00:00 2001 -From: Volker Krause -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 -- #include -- 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 - - #include "pdfvectorpicture_p.h" -+#include "popplertypes_p.h" - - #ifdef HAVE_POPPLER - #include -@@ -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 -+ -+ 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 . -+*/ -+ -+#ifndef KITINERARY_POPPLERTYPES_P_H -+#define KITINERARY_POPPLERTYPES_P_H -+ -+#include -+ -+#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 deleted file mode 100644 index 3ad5d865506e..000000000000 --- a/kde-apps/kitinerary/kitinerary-19.08.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Data Model and Extraction System for Travel Reservation information" -HOMEPAGE="https://kde.org/applications/office/kontact/" - -LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+barcode pdf" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcalendarcore) - $(add_frameworks_dep kcontacts) - $(add_frameworks_dep ki18n) - $(add_kdeapps_dep kmime) - $(add_kdeapps_dep kpkpass) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - sys-libs/zlib - barcode? ( media-libs/zxing-cpp ) - pdf? ( app-text/poppler:=[qt5] ) -" -RDEPEND="${DEPEND} - !