[gentoo-commits] proj/kde-sunset:master commit in: kde-apps/gwenview/, kde-apps/gwenview/files/

[Andreas Sturmlechner]

commit:     629745397d5f4731ce99af3fd0f2ccfac11eb1e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 16:15:19 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 16:24:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=62974539

kde-apps/gwenview: Add support for exiv-0.27

Dropping IUSE="semantic-desktop" as well.

Thanks-to: Tommy Yu <y <AT> metatoaster.com>
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/gwenview/files/gwenview-exiv2-0.27.patch | 36 +++++++++++++++++++++++
 kde-apps/gwenview/gwenview-4.14.3.ebuild          | 21 +++++++------
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/kde-apps/gwenview/files/gwenview-exiv2-0.27.patch 
b/kde-apps/gwenview/files/gwenview-exiv2-0.27.patch
new file mode 100644
index 00000000..263c30bb
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-exiv2-0.27.patch
@@ -0,0 +1,36 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cbbb5c8..b69e3d5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,6 +66,7 @@ add_definitions(
+     ${QT_DEFINITIONS}
+     ${QT_QTDBUS_DEFINITIONS}
+     ${KDE4_DEFINITIONS}
++    ${KDE4_ENABLE_EXCEPTIONS}
+     )
+ 
+ include_directories(
+diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp
+index 37ac9fa..5f1608b 100644
+--- a/lib/exiv2imageloader.cpp
++++ b/lib/exiv2imageloader.cpp
+@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA 02110-1301, USA.
+ // Exiv2
+ #include <exiv2/error.hpp>
+ #include <exiv2/types.hpp>
++#include <exiv2/version.hpp>
+ 
+ // Local
+ 
+diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp
+index f575c2d..b8288e7 100644
+--- a/lib/jpegcontent.cpp
++++ b/lib/jpegcontent.cpp
+@@ -44,6 +44,7 @@ extern "C" {
+ // Exiv2
+ #include <exiv2/exif.hpp>
+ #include <exiv2/image.hpp>
++#include <exiv2/version.hpp>
+ 
+ // Local
+ #include "jpegerrormanager.h"

diff --git a/kde-apps/gwenview/gwenview-4.14.3.ebuild 
b/kde-apps/gwenview/gwenview-4.14.3.ebuild
index 46a519fc..9ed8738a 100644
--- a/kde-apps/gwenview/gwenview-4.14.3.ebuild
+++ b/kde-apps/gwenview/gwenview-4.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="
        https://userbase.kde.org/Gwenview
 "
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug kipi semantic-desktop"
+IUSE="debug kipi"
 
 # tests fail, last checked 4.11.0
 RESTRICT="test"
@@ -21,16 +21,17 @@ RESTRICT="test"
 DEPEND="
        $(add_kdeapps_dep libkdcraw)
        $(add_kdeapps_dep libkonq)
-       $(add_kdeframeworks_dep kactivities '' 4.13)
-       media-gfx/exiv2:=
+       >=media-gfx/exiv2-0.27
        media-libs/lcms:2
        media-libs/libpng:0=
        virtual/jpeg:0
        x11-libs/libX11
        kipi? ( $(add_kdeapps_dep libkipi) )
-       semantic-desktop? ( $(add_kdeframeworks_dep baloo) )
 "
-RDEPEND="${DEPEND}"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-exiv2-0.27.patch"
+)
 
 src_configure() {
        local mycmakeargs=(
@@ -41,11 +42,9 @@ src_configure() {
                mycmakeargs+=( 
-DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )
        fi
 
-       if use semantic-desktop; then
-               mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
-       else
-               mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
-       fi
+       mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
+
+       append-cppflags -fexceptions
 
        kde4-base_src_configure
 }