1 |
commit: 629745397d5f4731ce99af3fd0f2ccfac11eb1e8 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 16 16:15:19 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 16 16:24:10 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=62974539 |
7 |
|
8 |
kde-apps/gwenview: Add support for exiv-0.27 |
9 |
|
10 |
Dropping IUSE="semantic-desktop" as well. |
11 |
|
12 |
Thanks-to: Tommy Yu <y <AT> metatoaster.com> |
13 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
kde-apps/gwenview/files/gwenview-exiv2-0.27.patch | 36 +++++++++++++++++++++++ |
17 |
kde-apps/gwenview/gwenview-4.14.3.ebuild | 21 +++++++------ |
18 |
2 files changed, 46 insertions(+), 11 deletions(-) |
19 |
|
20 |
diff --git a/kde-apps/gwenview/files/gwenview-exiv2-0.27.patch b/kde-apps/gwenview/files/gwenview-exiv2-0.27.patch |
21 |
new file mode 100644 |
22 |
index 00000000..263c30bb |
23 |
--- /dev/null |
24 |
+++ b/kde-apps/gwenview/files/gwenview-exiv2-0.27.patch |
25 |
@@ -0,0 +1,36 @@ |
26 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
27 |
+index cbbb5c8..b69e3d5 100644 |
28 |
+--- a/CMakeLists.txt |
29 |
++++ b/CMakeLists.txt |
30 |
+@@ -66,6 +66,7 @@ add_definitions( |
31 |
+ ${QT_DEFINITIONS} |
32 |
+ ${QT_QTDBUS_DEFINITIONS} |
33 |
+ ${KDE4_DEFINITIONS} |
34 |
++ ${KDE4_ENABLE_EXCEPTIONS} |
35 |
+ ) |
36 |
+ |
37 |
+ include_directories( |
38 |
+diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp |
39 |
+index 37ac9fa..5f1608b 100644 |
40 |
+--- a/lib/exiv2imageloader.cpp |
41 |
++++ b/lib/exiv2imageloader.cpp |
42 |
+@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
43 |
+ // Exiv2 |
44 |
+ #include <exiv2/error.hpp> |
45 |
+ #include <exiv2/types.hpp> |
46 |
++#include <exiv2/version.hpp> |
47 |
+ |
48 |
+ // Local |
49 |
+ |
50 |
+diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp |
51 |
+index f575c2d..b8288e7 100644 |
52 |
+--- a/lib/jpegcontent.cpp |
53 |
++++ b/lib/jpegcontent.cpp |
54 |
+@@ -44,6 +44,7 @@ extern "C" { |
55 |
+ // Exiv2 |
56 |
+ #include <exiv2/exif.hpp> |
57 |
+ #include <exiv2/image.hpp> |
58 |
++#include <exiv2/version.hpp> |
59 |
+ |
60 |
+ // Local |
61 |
+ #include "jpegerrormanager.h" |
62 |
|
63 |
diff --git a/kde-apps/gwenview/gwenview-4.14.3.ebuild b/kde-apps/gwenview/gwenview-4.14.3.ebuild |
64 |
index 46a519fc..9ed8738a 100644 |
65 |
--- a/kde-apps/gwenview/gwenview-4.14.3.ebuild |
66 |
+++ b/kde-apps/gwenview/gwenview-4.14.3.ebuild |
67 |
@@ -1,4 +1,4 @@ |
68 |
-# Copyright 1999-2015 Gentoo Foundation |
69 |
+# Copyright 1999-2020 Gentoo Authors |
70 |
# Distributed under the terms of the GNU General Public License v2 |
71 |
|
72 |
EAPI=5 |
73 |
@@ -13,7 +13,7 @@ HOMEPAGE=" |
74 |
https://userbase.kde.org/Gwenview |
75 |
" |
76 |
KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" |
77 |
-IUSE="debug kipi semantic-desktop" |
78 |
+IUSE="debug kipi" |
79 |
|
80 |
# tests fail, last checked 4.11.0 |
81 |
RESTRICT="test" |
82 |
@@ -21,16 +21,17 @@ RESTRICT="test" |
83 |
DEPEND=" |
84 |
$(add_kdeapps_dep libkdcraw) |
85 |
$(add_kdeapps_dep libkonq) |
86 |
- $(add_kdeframeworks_dep kactivities '' 4.13) |
87 |
- media-gfx/exiv2:= |
88 |
+ >=media-gfx/exiv2-0.27 |
89 |
media-libs/lcms:2 |
90 |
media-libs/libpng:0= |
91 |
virtual/jpeg:0 |
92 |
x11-libs/libX11 |
93 |
kipi? ( $(add_kdeapps_dep libkipi) ) |
94 |
- semantic-desktop? ( $(add_kdeframeworks_dep baloo) ) |
95 |
" |
96 |
-RDEPEND="${DEPEND}" |
97 |
+ |
98 |
+PATCHES=( |
99 |
+ "${FILESDIR}/${PN}-exiv2-0.27.patch" |
100 |
+) |
101 |
|
102 |
src_configure() { |
103 |
local mycmakeargs=( |
104 |
@@ -41,11 +42,9 @@ src_configure() { |
105 |
mycmakeargs+=( -DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" ) |
106 |
fi |
107 |
|
108 |
- if use semantic-desktop; then |
109 |
- mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo) |
110 |
- else |
111 |
- mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None) |
112 |
- fi |
113 |
+ mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None) |
114 |
+ |
115 |
+ append-cppflags -fexceptions |
116 |
|
117 |
kde4-base_src_configure |
118 |
} |