1 |
commit: f297810232781332e35065bb11c68a12364cc671 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 14 13:05:09 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 14 13:06:02 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f2978102 |
7 |
|
8 |
media-gfx/digikam: Respin cmake.patch, update IUSE heif |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
media-gfx/digikam/digikam-9999.ebuild | 9 ++- |
13 |
...7.3.0-cmake.patch => digikam-7.8.0-cmake.patch} | 73 +++++++++++----------- |
14 |
2 files changed, 43 insertions(+), 39 deletions(-) |
15 |
|
16 |
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild |
17 |
index ec2fee905d..5919dbb0d5 100644 |
18 |
--- a/media-gfx/digikam/digikam-9999.ebuild |
19 |
+++ b/media-gfx/digikam/digikam-9999.ebuild |
20 |
@@ -66,7 +66,10 @@ COMMON_DEPEND=" |
21 |
) |
22 |
calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) |
23 |
gphoto2? ( media-libs/libgphoto2:= ) |
24 |
- heif? ( media-libs/x265:= ) |
25 |
+ heif? ( |
26 |
+ media-libs/libheif:= |
27 |
+ media-libs/x265:= |
28 |
+ ) |
29 |
imagemagick? ( media-gfx/imagemagick:= ) |
30 |
lensfun? ( media-libs/lensfun ) |
31 |
marble? ( |
32 |
@@ -106,7 +109,7 @@ BDEPEND=" |
33 |
) |
34 |
" |
35 |
|
36 |
-PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" ) |
37 |
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) |
38 |
|
39 |
pkg_pretend() { |
40 |
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
41 |
@@ -128,7 +131,7 @@ src_configure() { |
42 |
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) |
43 |
$(cmake_use_find_package calendar KF5CalendarCore) |
44 |
$(cmake_use_find_package gphoto2 Gphoto2) |
45 |
- $(cmake_use_find_package heif X265) |
46 |
+ $(cmake_use_find_package heif Libheif) |
47 |
$(cmake_use_find_package imagemagick ImageMagick) |
48 |
$(cmake_use_find_package lensfun LensFun) |
49 |
$(cmake_use_find_package marble Marble) |
50 |
|
51 |
diff --git a/media-gfx/digikam/files/digikam-7.3.0-cmake.patch b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch |
52 |
similarity index 68% |
53 |
rename from media-gfx/digikam/files/digikam-7.3.0-cmake.patch |
54 |
rename to media-gfx/digikam/files/digikam-7.8.0-cmake.patch |
55 |
index 2b580f92a1..d698626e8c 100644 |
56 |
--- a/media-gfx/digikam/files/digikam-7.3.0-cmake.patch |
57 |
+++ b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch |
58 |
@@ -1,14 +1,15 @@ |
59 |
-From 370308fb8381b55e7ebfcdd77f1361b49a288f88 Mon Sep 17 00:00:00 2001 |
60 |
+From 618e3f3ba195a3b50812d1184ebf90555d659055 Mon Sep 17 00:00:00 2001 |
61 |
From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
62 |
Date: Sun, 17 Feb 2019 23:51:03 +0100 |
63 |
Subject: [PATCH] Un-break optional Qt5/KF5 detection |
64 |
|
65 |
+And if we enable an option, make the necessary libraries REQUIRED. |
66 |
--- |
67 |
- core/CMakeLists.txt | 58 ++++++++++++++++----------------------------- |
68 |
- 1 file changed, 20 insertions(+), 38 deletions(-) |
69 |
+ core/CMakeLists.txt | 50 +++++++++++++-------------------------------- |
70 |
+ 1 file changed, 14 insertions(+), 36 deletions(-) |
71 |
|
72 |
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt |
73 |
-index 16bba83335..b8cdc59baa 100644 |
74 |
+index de599ee881..8aef35e062 100644 |
75 |
--- a/core/CMakeLists.txt |
76 |
+++ b/core/CMakeLists.txt |
77 |
@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED |
78 |
@@ -42,42 +43,47 @@ index 16bba83335..b8cdc59baa 100644 |
79 |
- NO_MODULE COMPONENTS |
80 |
- Test |
81 |
- ) |
82 |
-- |
83 |
++ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE) |
84 |
+ |
85 |
- find_package(Qt5 ${QT_MIN_VERSION} |
86 |
- QUIET |
87 |
- OPTIONAL_COMPONENTS |
88 |
- Qml WebView # Optional, for 'sialis' O2 library test tool. |
89 |
- ) |
90 |
-+ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE) |
91 |
-+ |
92 |
+ # Optional, for 'sialis' O2 library test tool. |
93 |
+ find_package(Qt5Qml ${QT_MIN_VERSION} QUIET NO_MODULE) |
94 |
+ find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE) |
95 |
endif() |
96 |
|
97 |
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED |
98 |
-@@ -113,38 +105,28 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET |
99 |
- OPTIONAL_COMPONENTS |
100 |
- KIO # For Desktop integration (Widgets only). |
101 |
- IconThemes # For Desktop integration. |
102 |
-- FileMetaData # For KDE file indexer support. |
103 |
- ThreadWeaver # For Panorama tool. |
104 |
- NotifyConfig # KDE desktop application notify configuration. |
105 |
- Notifications # KDE desktop notifications integration. |
106 |
- ) |
107 |
+@@ -121,7 +113,7 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET |
108 |
+ if(ENABLE_KFILEMETADATASUPPORT) |
109 |
|
110 |
--find_package(KF5 ${AKONADI_MIN_VERSION} QUIET |
111 |
-- OPTIONAL_COMPONENTS |
112 |
-- AkonadiContact # For KDE Mail Contacts support. |
113 |
-- Contacts # API for contacts/address book data. |
114 |
--) |
115 |
-+find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support. |
116 |
+ find_package(KF5 ${KF5_MIN_VERSION} |
117 |
+- QUIET |
118 |
++ REQUIRED |
119 |
+ OPTIONAL_COMPONENTS |
120 |
+ FileMetaData # For Plasma destop file indexer support. |
121 |
+ ) |
122 |
+@@ -130,7 +122,7 @@ endif() |
123 |
+ |
124 |
+ if(ENABLE_AKONADICONTACTSUPPORT) |
125 |
+ |
126 |
+- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET |
127 |
++ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED |
128 |
+ OPTIONAL_COMPONENTS |
129 |
+ AkonadiContact # For KDE Mail Contacts support. |
130 |
+ Contacts # API for contacts/address book data. |
131 |
+@@ -138,28 +130,14 @@ if(ENABLE_AKONADICONTACTSUPPORT) |
132 |
+ |
133 |
+ endif() |
134 |
|
135 |
-find_package(KF5 ${KSANE_MIN_VERSION} QUIET |
136 |
- OPTIONAL_COMPONENTS |
137 |
- Sane # For digital scanner support. |
138 |
-) |
139 |
-- |
140 |
++find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support. |
141 |
+ |
142 |
-find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET |
143 |
- OPTIONAL_COMPONENTS |
144 |
- CalendarCore # For Calendar tool. |
145 |
@@ -90,21 +96,16 @@ index 16bba83335..b8cdc59baa 100644 |
146 |
|
147 |
-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND)) |
148 |
- set(ENABLE_AKONADICONTACTSUPPORT OFF) |
149 |
-+if(ENABLE_AKONADICONTACTSUPPORT) |
150 |
-+ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED |
151 |
-+ AkonadiContact # For KDE Mail Contacts support. |
152 |
-+ Contacts # API for contacts/address book data. |
153 |
-+ ) |
154 |
- endif() |
155 |
- |
156 |
+-endif() |
157 |
+- |
158 |
-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND) |
159 |
- set(ENABLE_KFILEMETADATASUPPORT OFF) |
160 |
-+if(ENABLE_KFILEMETADATASUPPORT) |
161 |
-+ find_package(KF5FileMetaData ${KF5_MIN_VERSION} REQUIRED) # For KDE file indexer support. |
162 |
- endif() |
163 |
- |
164 |
+-endif() |
165 |
+- |
166 |
# Check if KIO have been compiled with KIOWidgets. digiKam only needs this one. |
167 |
-@@ -275,7 +257,7 @@ endif() |
168 |
+ if(KF5KIO_FOUND) |
169 |
+ get_target_property(KIOWidgets_INCLUDE_DIRS KF5::KIOWidgets |
170 |
+@@ -296,7 +274,7 @@ endif() |
171 |
find_package(X11) |
172 |
|
173 |
if(X11_FOUND) |
174 |
@@ -114,5 +115,5 @@ index 16bba83335..b8cdc59baa 100644 |
175 |
else() |
176 |
set(HAVE_X11 FALSE) |
177 |
-- |
178 |
-2.34.1 |
179 |
+2.37.3 |