1 |
commit: d157b06e5dbc8542c9f59b3575beb6f1ae6268a1 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 5 20:07:16 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 5 21:08:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d157b06e |
7 |
|
8 |
media-gfx/krita: Drop 4.1.7 (r0) |
9 |
|
10 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch | 354 --------------------- |
14 |
media-gfx/krita/krita-4.1.7.ebuild | 122 ------- |
15 |
2 files changed, 476 deletions(-) |
16 |
|
17 |
diff --git a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch b/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch |
18 |
deleted file mode 100644 |
19 |
index 41b290852eb..00000000000 |
20 |
--- a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch |
21 |
+++ /dev/null |
22 |
@@ -1,354 +0,0 @@ |
23 |
-From 6b6758bb37da4997be36a7e2a839b07278160559 Mon Sep 17 00:00:00 2001 |
24 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
25 |
-Date: Thu, 27 Dec 2018 22:40:44 +0100 |
26 |
-Subject: [PATCH] Fix building against exiv2-0.27 |
27 |
- |
28 |
-Summary: |
29 |
-Copied FindLibExiv2.cmake from ECM 5.53.0 until we raise min version. |
30 |
- |
31 |
-Thanks-to: Boudewijn Rempt <boud@×××××××.org> |
32 |
-for final fix to kis_xmp_io.cpp. |
33 |
- |
34 |
-CCBUG: 402566 |
35 |
- |
36 |
-Test Plan: Built fine against exiv2-0.26 and exiv2-0.27. |
37 |
- |
38 |
-Reviewers: #krita, rempt |
39 |
- |
40 |
-Reviewed By: #krita, rempt |
41 |
- |
42 |
-Subscribers: pino |
43 |
- |
44 |
-Tags: #krita |
45 |
- |
46 |
-Differential Revision: https://phabricator.kde.org/D17810 |
47 |
---- |
48 |
- CMakeLists.txt | 6 +- |
49 |
- cmake/modules/FindLibExiv2.cmake | 115 ++++++++++++++++++++++++++++++ |
50 |
- libs/ui/CMakeLists.txt | 3 +- |
51 |
- libs/ui/kisexiv2/kis_exif_io.cpp | 14 ++-- |
52 |
- libs/ui/kisexiv2/kis_exiv2.h | 2 +- |
53 |
- libs/ui/kisexiv2/kis_iptc_io.cpp | 4 +- |
54 |
- libs/ui/kisexiv2/kis_xmp_io.cpp | 6 +- |
55 |
- plugins/impex/jpeg/CMakeLists.txt | 5 +- |
56 |
- 8 files changed, 130 insertions(+), 25 deletions(-) |
57 |
- create mode 100644 cmake/modules/FindLibExiv2.cmake |
58 |
- |
59 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
60 |
-index 5558088200..b2d2cd497e 100644 |
61 |
---- a/CMakeLists.txt |
62 |
-+++ b/CMakeLists.txt |
63 |
-@@ -607,11 +607,7 @@ set_package_properties(Eigen3 PROPERTIES |
64 |
- ## |
65 |
- ## Test for exiv2 |
66 |
- ## |
67 |
--find_package(Exiv2 0.16 REQUIRED) |
68 |
--set_package_properties(Exiv2 PROPERTIES |
69 |
-- DESCRIPTION "Image metadata library and tools" |
70 |
-- URL "http://www.exiv2.org" |
71 |
-- PURPOSE "Required by Krita") |
72 |
-+find_package(LibExiv2 0.16 REQUIRED) |
73 |
- |
74 |
- ## |
75 |
- ## Test for lcms |
76 |
-diff --git a/cmake/modules/FindLibExiv2.cmake b/cmake/modules/FindLibExiv2.cmake |
77 |
-new file mode 100644 |
78 |
-index 0000000000..935cee2c55 |
79 |
---- /dev/null |
80 |
-+++ b/cmake/modules/FindLibExiv2.cmake |
81 |
-@@ -0,0 +1,115 @@ |
82 |
-+#.rst: |
83 |
-+# FindLibExiv2 |
84 |
-+# ------------ |
85 |
-+# |
86 |
-+# Try to find the Exiv2 library. |
87 |
-+# |
88 |
-+# This will define the following variables: |
89 |
-+# |
90 |
-+# ``LibExiv2_FOUND`` |
91 |
-+# System has LibExiv2. |
92 |
-+# |
93 |
-+# ``LibExiv2_VERSION`` |
94 |
-+# The version of LibExiv2. |
95 |
-+# |
96 |
-+# ``LibExiv2_INCLUDE_DIRS`` |
97 |
-+# This should be passed to target_include_directories() if |
98 |
-+# the target is not used for linking. |
99 |
-+# |
100 |
-+# ``LibExiv2_LIBRARIES`` |
101 |
-+# The LibExiv2 library. |
102 |
-+# This can be passed to target_link_libraries() instead of |
103 |
-+# the ``LibExiv2::LibExiv2`` target |
104 |
-+# |
105 |
-+# If ``LibExiv2_FOUND`` is TRUE, the following imported target |
106 |
-+# will be available: |
107 |
-+# |
108 |
-+# ``LibExiv2::LibExiv2`` |
109 |
-+# The Exiv2 library |
110 |
-+# |
111 |
-+# Since 5.53.0. |
112 |
-+# |
113 |
-+#============================================================================= |
114 |
-+# Copyright (c) 2018, Christophe Giboudeaux, <christophe@××××.fr> |
115 |
-+# Copyright (c) 2010, Alexander Neundorf, <neundorf@×××.org> |
116 |
-+# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@×××××.com> |
117 |
-+# |
118 |
-+# |
119 |
-+# Redistribution and use in source and binary forms, with or without |
120 |
-+# modification, are permitted provided that the following conditions |
121 |
-+# are met: |
122 |
-+# |
123 |
-+# 1. Redistributions of source code must retain the copyright |
124 |
-+# notice, this list of conditions and the following disclaimer. |
125 |
-+# 2. Redistributions in binary form must reproduce the copyright |
126 |
-+# notice, this list of conditions and the following disclaimer in the |
127 |
-+# documentation and/or other materials provided with the distribution. |
128 |
-+# 3. The name of the author may not be used to endorse or promote products |
129 |
-+# derived from this software without specific prior written permission. |
130 |
-+# |
131 |
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
132 |
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
133 |
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
134 |
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
135 |
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
136 |
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
137 |
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
138 |
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
139 |
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
140 |
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
141 |
-+#============================================================================= |
142 |
-+ |
143 |
-+find_package(PkgConfig QUIET) |
144 |
-+pkg_check_modules(PC_EXIV2 QUIET exiv2) |
145 |
-+ |
146 |
-+find_path(LibExiv2_INCLUDE_DIRS NAMES exiv2/exif.hpp |
147 |
-+ HINTS ${PC_EXIV2_INCLUDEDIR} |
148 |
-+) |
149 |
-+ |
150 |
-+find_library(LibExiv2_LIBRARIES NAMES exiv2 libexiv2 |
151 |
-+ HINTS ${PC_EXIV2_LIBRARY_DIRS} |
152 |
-+) |
153 |
-+ |
154 |
-+set(LibExiv2_VERSION ${PC_EXIV2_VERSION}) |
155 |
-+ |
156 |
-+if(NOT LibExiv2_VERSION AND DEFINED LibExiv2_INCLUDE_DIRS) |
157 |
-+ # With exiv >= 0.27, the version #defines are in exv_conf.h instead of version.hpp |
158 |
-+ foreach(_exiv2_version_file "version.hpp" "exv_conf.h") |
159 |
-+ if(EXISTS "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}") |
160 |
-+ file(READ "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}" _exiv_version_file_content) |
161 |
-+ string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content}) |
162 |
-+ string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content}) |
163 |
-+ string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)" EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content}) |
164 |
-+ if(EXIV2_MAJOR_VERSION_MATCH) |
165 |
-+ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH}) |
166 |
-+ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH}) |
167 |
-+ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_PATCH_VERSION ${EXIV2_PATCH_VERSION_MATCH}) |
168 |
-+ endif() |
169 |
-+ endif() |
170 |
-+ endforeach() |
171 |
-+ |
172 |
-+ set(LibExiv2_VERSION "${EXIV2_MAJOR_VERSION}.${EXIV2_MINOR_VERSION}.${EXIV2_PATCH_VERSION}") |
173 |
-+endif() |
174 |
-+ |
175 |
-+include(FindPackageHandleStandardArgs) |
176 |
-+find_package_handle_standard_args(LibExiv2 |
177 |
-+ FOUND_VAR LibExiv2_FOUND |
178 |
-+ REQUIRED_VARS LibExiv2_LIBRARIES LibExiv2_INCLUDE_DIRS |
179 |
-+ VERSION_VAR LibExiv2_VERSION |
180 |
-+) |
181 |
-+ |
182 |
-+mark_as_advanced(LibExiv2_INCLUDE_DIRS LibExiv2_LIBRARIES) |
183 |
-+ |
184 |
-+if(LibExiv2_FOUND AND NOT TARGET LibExiv2::LibExiv2) |
185 |
-+ add_library(LibExiv2::LibExiv2 UNKNOWN IMPORTED) |
186 |
-+ set_target_properties(LibExiv2::LibExiv2 PROPERTIES |
187 |
-+ IMPORTED_LOCATION "${LibExiv2_LIBRARIES}" |
188 |
-+ INTERFACE_INCLUDE_DIRECTORIES "${LibExiv2_INCLUDE_DIRS}" |
189 |
-+ ) |
190 |
-+endif() |
191 |
-+ |
192 |
-+include(FeatureSummary) |
193 |
-+set_package_properties(LibExiv2 PROPERTIES |
194 |
-+ URL "http://www.exiv2.org" |
195 |
-+ DESCRIPTION "Image metadata support" |
196 |
-+) |
197 |
-diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt |
198 |
-index f14d3591bc..ff57f53158 100644 |
199 |
---- a/libs/ui/CMakeLists.txt |
200 |
-+++ b/libs/ui/CMakeLists.txt |
201 |
-@@ -1,6 +1,5 @@ |
202 |
- include_directories( |
203 |
- ${CMAKE_CURRENT_SOURCE_DIR}/qtlockedfile |
204 |
-- ${EXIV2_INCLUDE_DIR} |
205 |
- ) |
206 |
- |
207 |
- include_directories(SYSTEM |
208 |
-@@ -544,7 +543,7 @@ add_library(kritaui SHARED ${kritaui_HEADERS_MOC} ${kritaui_LIB_SRCS} ) |
209 |
- generate_export_header(kritaui BASE_NAME kritaui) |
210 |
- |
211 |
- target_link_libraries(kritaui KF5::CoreAddons KF5::Completion KF5::I18n KF5::ItemViews Qt5::Network |
212 |
-- kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES} |
213 |
-+ kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} LibExiv2::LibExiv2 |
214 |
- ) |
215 |
- |
216 |
- if (HAVE_QT_MULTIMEDIA) |
217 |
-diff --git a/libs/ui/kisexiv2/kis_exif_io.cpp b/libs/ui/kisexiv2/kis_exif_io.cpp |
218 |
-index 1a01fedf33..4a7857aa9c 100644 |
219 |
---- a/libs/ui/kisexiv2/kis_exif_io.cpp |
220 |
-+++ b/libs/ui/kisexiv2/kis_exif_io.cpp |
221 |
-@@ -438,11 +438,10 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp |
222 |
- if (entry.value().asArray().size() > 0) { |
223 |
- creator = entry.value().asArray()[0]; |
224 |
- } |
225 |
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20 |
226 |
-+#if !EXIV2_TEST_VERSION(0,21,0) |
227 |
- v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId())); |
228 |
- #else |
229 |
- v = kmdValueToExivValue(creator, exifKey.defaultTypeId()); |
230 |
-- |
231 |
- #endif |
232 |
- } else if (exivKey == "Exif.Photo.OECF") { |
233 |
- v = kmdOECFStructureToExifOECF(entry.value()); |
234 |
-@@ -456,13 +455,13 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp |
235 |
- Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray); |
236 |
- QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray(); |
237 |
- if (langArr.contains("x-default")) { |
238 |
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20 |
239 |
-+#if !EXIV2_TEST_VERSION(0,21,0) |
240 |
- v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId())); |
241 |
- #else |
242 |
- v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId()); |
243 |
- #endif |
244 |
- } else if (langArr.size() > 0) { |
245 |
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20 |
246 |
-+#if !EXIV2_TEST_VERSION(0,21,0) |
247 |
- v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId())); |
248 |
- #else |
249 |
- v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId()); |
250 |
-@@ -470,7 +469,7 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp |
251 |
- } |
252 |
- } else { |
253 |
- dbgMetaData << exifKey.tag(); |
254 |
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20 |
255 |
-+#if !EXIV2_TEST_VERSION(0,21,0) |
256 |
- v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId())); |
257 |
- #else |
258 |
- v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId()); |
259 |
-@@ -487,7 +486,7 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp |
260 |
- dbgMetaData << "exiv error " << e.what(); |
261 |
- } |
262 |
- } |
263 |
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17 |
264 |
-+#if !EXIV2_TEST_VERSION(0,18,0) |
265 |
- Exiv2::DataBuf rawData = exifData.copy(); |
266 |
- ioDevice->write((const char*) rawData.pData_, rawData.size_); |
267 |
- #else |
268 |
-@@ -514,7 +513,7 @@ bool KisExifIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const |
269 |
- QByteArray arr = ioDevice->readAll(); |
270 |
- Exiv2::ExifData exifData; |
271 |
- Exiv2::ByteOrder byteOrder; |
272 |
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17 |
273 |
-+#if !EXIV2_TEST_VERSION(0,18,0) |
274 |
- exifData.load((const Exiv2::byte*)arr.data(), arr.size()); |
275 |
- byteOrder = exifData.byteOrder(); |
276 |
- #else |
277 |
-@@ -529,7 +528,6 @@ bool KisExifIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const |
278 |
- dbgKrita << "Received unknown exception trying to parse exiv data"; |
279 |
- return false; |
280 |
- } |
281 |
-- |
282 |
- #endif |
283 |
- dbgMetaData << "Byte order = " << byteOrder << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian); |
284 |
- dbgMetaData << "There are" << exifData.count() << " entries in the exif section"; |
285 |
-diff --git a/libs/ui/kisexiv2/kis_exiv2.h b/libs/ui/kisexiv2/kis_exiv2.h |
286 |
-index 9343265f1e..6b66aa7852 100644 |
287 |
---- a/libs/ui/kisexiv2/kis_exiv2.h |
288 |
-+++ b/libs/ui/kisexiv2/kis_exiv2.h |
289 |
-@@ -21,7 +21,7 @@ |
290 |
- |
291 |
- |
292 |
- #include <metadata/kis_meta_data_value.h> |
293 |
--#include <exiv2/value.hpp> |
294 |
-+#include <exiv2/exiv2.hpp> |
295 |
- #include "kritaui_export.h" |
296 |
- |
297 |
- /// Convert an exiv value to a KisMetaData value |
298 |
-diff --git a/libs/ui/kisexiv2/kis_iptc_io.cpp b/libs/ui/kisexiv2/kis_iptc_io.cpp |
299 |
-index d2eb7c9b2f..0ac881f61b 100644 |
300 |
---- a/libs/ui/kisexiv2/kis_iptc_io.cpp |
301 |
-+++ b/libs/ui/kisexiv2/kis_iptc_io.cpp |
302 |
-@@ -126,7 +126,7 @@ bool KisIptcIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp |
303 |
- } |
304 |
- } |
305 |
- } |
306 |
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17 |
307 |
-+#if !EXIV2_TEST_VERSION(0,18,0) |
308 |
- Exiv2::DataBuf rawData = iptcData.copy(); |
309 |
- #else |
310 |
- Exiv2::DataBuf rawData = Exiv2::IptcParser::encode(iptcData); |
311 |
-@@ -167,7 +167,7 @@ bool KisIptcIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const |
312 |
- ioDevice->open(QIODevice::ReadOnly); |
313 |
- QByteArray arr = ioDevice->readAll(); |
314 |
- Exiv2::IptcData iptcData; |
315 |
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17 |
316 |
-+#if !EXIV2_TEST_VERSION(0,18,0) |
317 |
- iptcData.load((const Exiv2::byte*)arr.data(), arr.size()); |
318 |
- #else |
319 |
- Exiv2::IptcParser::decode(iptcData, (const Exiv2::byte*)arr.data(), arr.size()); |
320 |
-diff --git a/libs/ui/kisexiv2/kis_xmp_io.cpp b/libs/ui/kisexiv2/kis_xmp_io.cpp |
321 |
-index c4663efe7d..72fa5c5d38 100644 |
322 |
---- a/libs/ui/kisexiv2/kis_xmp_io.cpp |
323 |
-+++ b/libs/ui/kisexiv2/kis_xmp_io.cpp |
324 |
-@@ -17,7 +17,6 @@ |
325 |
- #include "kis_xmp_io.h" |
326 |
- |
327 |
- #include <string> |
328 |
--#include <exiv2/xmp.hpp> |
329 |
- |
330 |
- #include "kis_exiv2.h" |
331 |
- |
332 |
-@@ -277,9 +276,8 @@ bool KisXMPIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const |
333 |
- const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get()); |
334 |
- Q_ASSERT(xav); |
335 |
- QList<KisMetaData::Value> array; |
336 |
-- for (std::vector< std::string >::const_iterator it = xav->value_.begin(); |
337 |
-- it != xav->value_.end(); ++it) { |
338 |
-- QString value = it->c_str(); |
339 |
-+ for (int i = 0; i < xav->size(); ++i) { |
340 |
-+ QString value = QString::fromStdString(xav->toString(i)); |
341 |
- if (parser) { |
342 |
- array.push_back(parser->parse(value)); |
343 |
- } else { |
344 |
-diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt |
345 |
-index 347e46dbe3..50edb05c96 100644 |
346 |
---- a/plugins/impex/jpeg/CMakeLists.txt |
347 |
-+++ b/plugins/impex/jpeg/CMakeLists.txt |
348 |
-@@ -4,7 +4,6 @@ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms") |
349 |
- |
350 |
- include_directories( |
351 |
- ${ICCJPEG_SOURCE_DIR} |
352 |
-- ${EXIV2_INCLUDE_DIR} |
353 |
- ) |
354 |
- |
355 |
- include_directories(SYSTEM |
356 |
-@@ -25,7 +24,7 @@ set(kritajpegimport_SOURCES |
357 |
- |
358 |
- add_library(kritajpegimport MODULE ${kritajpegimport_SOURCES}) |
359 |
- |
360 |
--target_link_libraries(kritajpegimport kritaui ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} ) |
361 |
-+target_link_libraries(kritajpegimport kritaui ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 ) |
362 |
- |
363 |
- install(TARGETS kritajpegimport DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) |
364 |
- |
365 |
-@@ -38,7 +37,7 @@ ki18n_wrap_ui(kritajpegexport_SOURCES kis_wdg_options_jpeg.ui ) |
366 |
- |
367 |
- add_library(kritajpegexport MODULE ${kritajpegexport_SOURCES}) |
368 |
- |
369 |
--target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} ) |
370 |
-+target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 ) |
371 |
- |
372 |
- install(TARGETS kritajpegexport DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) |
373 |
- install( PROGRAMS krita_jpeg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) |
374 |
--- |
375 |
-2.20.1 |
376 |
- |
377 |
|
378 |
diff --git a/media-gfx/krita/krita-4.1.7.ebuild b/media-gfx/krita/krita-4.1.7.ebuild |
379 |
deleted file mode 100644 |
380 |
index efe9923bc33..00000000000 |
381 |
--- a/media-gfx/krita/krita-4.1.7.ebuild |
382 |
+++ /dev/null |
383 |
@@ -1,122 +0,0 @@ |
384 |
-# Copyright 1999-2018 Gentoo Authors |
385 |
-# Distributed under the terms of the GNU General Public License v2 |
386 |
- |
387 |
-EAPI=6 |
388 |
- |
389 |
-KDE_TEST="forceoptional" |
390 |
-QT_MINIMAL="5.11.3" |
391 |
-VIRTUALX_REQUIRED="test" |
392 |
-PYTHON_COMPAT=( python3_{4,5,6,7} ) |
393 |
-inherit kde5 python-single-r1 |
394 |
- |
395 |
-if [[ ${KDE_BUILD_TYPE} = release ]]; then |
396 |
- SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.101.tar.gz" |
397 |
- KEYWORDS="~amd64 ~x86" |
398 |
-fi |
399 |
- |
400 |
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" |
401 |
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/" |
402 |
-LICENSE="GPL-3" |
403 |
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" |
404 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
405 |
- |
406 |
-# FIXME: Drop subslot operator when QTBUG is fixed: |
407 |
-# https://bugreports.qt.io/browse/QTBUG-72488 |
408 |
-COMMON_DEPEND="${PYTHON_DEPS} |
409 |
- $(add_frameworks_dep karchive) |
410 |
- $(add_frameworks_dep kcompletion) |
411 |
- $(add_frameworks_dep kconfig) |
412 |
- $(add_frameworks_dep kcoreaddons) |
413 |
- $(add_frameworks_dep kcrash) |
414 |
- $(add_frameworks_dep kguiaddons) |
415 |
- $(add_frameworks_dep ki18n) |
416 |
- $(add_frameworks_dep kiconthemes) |
417 |
- $(add_frameworks_dep kitemmodels) |
418 |
- $(add_frameworks_dep kitemviews) |
419 |
- $(add_frameworks_dep kwidgetsaddons) |
420 |
- $(add_frameworks_dep kwindowsystem) |
421 |
- $(add_frameworks_dep kxmlgui) |
422 |
- $(add_qt_dep qtconcurrent) |
423 |
- $(add_qt_dep qtdbus) |
424 |
- $(add_qt_dep qtdeclarative) |
425 |
- $(add_qt_dep qtgui '-gles2') |
426 |
- $(add_qt_dep qtnetwork) |
427 |
- $(add_qt_dep qtprintsupport) |
428 |
- $(add_qt_dep qtsvg) |
429 |
- $(add_qt_dep qtwidgets) |
430 |
- $(add_qt_dep qtx11extras) |
431 |
- $(add_qt_dep qtxml) |
432 |
- dev-libs/boost:= |
433 |
- dev-python/PyQt5[${PYTHON_USEDEP}] |
434 |
- dev-python/sip[${PYTHON_USEDEP}] |
435 |
- media-gfx/exiv2:= |
436 |
- media-libs/lcms |
437 |
- media-libs/libpng:0= |
438 |
- sys-libs/zlib |
439 |
- virtual/opengl |
440 |
- x11-libs/libX11 |
441 |
- x11-libs/libxcb |
442 |
- x11-libs/libXi |
443 |
- color-management? ( media-libs/opencolorio ) |
444 |
- fftw? ( sci-libs/fftw:3.0= ) |
445 |
- gif? ( media-libs/giflib ) |
446 |
- gsl? ( sci-libs/gsl:= ) |
447 |
- jpeg? ( virtual/jpeg:0 ) |
448 |
- heif? ( media-libs/libheif:= ) |
449 |
- openexr? ( |
450 |
- media-libs/ilmbase:= |
451 |
- media-libs/openexr |
452 |
- ) |
453 |
- pdf? ( app-text/poppler[qt5] ) |
454 |
- qtmedia? ( $(add_qt_dep qtmultimedia) ) |
455 |
- raw? ( media-libs/libraw:= ) |
456 |
- tiff? ( media-libs/tiff:0 ) |
457 |
-" |
458 |
-DEPEND="${COMMON_DEPEND} |
459 |
- dev-cpp/eigen:3 |
460 |
- dev-lang/perl |
461 |
- sys-devel/gettext |
462 |
- vc? ( >=dev-libs/vc-1.1.0 ) |
463 |
-" |
464 |
-RDEPEND="${COMMON_DEPEND} |
465 |
- !app-office/calligra:4[calligra_features_krita] |
466 |
- !app-office/calligra-l10n:4[calligra_features_krita(+)] |
467 |
-" |
468 |
- |
469 |
-# bug 630508 |
470 |
-RESTRICT+=" test" |
471 |
- |
472 |
-PATCHES=( |
473 |
- "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" |
474 |
- "${FILESDIR}/${P}-exiv2-0.27.patch" |
475 |
-) |
476 |
- |
477 |
-S="${S}.101" |
478 |
- |
479 |
-pkg_setup() { |
480 |
- python-single-r1_pkg_setup |
481 |
- kde5_pkg_setup |
482 |
-} |
483 |
- |
484 |
-src_configure() { |
485 |
- # Prevent sandbox violation from FindPyQt5.py module |
486 |
- # See Gentoo-bug 655918 |
487 |
- addpredict /dev/dri |
488 |
- |
489 |
- local mycmakeargs=( |
490 |
- $(cmake-utils_use_find_package color-management OCIO) |
491 |
- $(cmake-utils_use_find_package fftw FFTW3) |
492 |
- $(cmake-utils_use_find_package gif GIF) |
493 |
- $(cmake-utils_use_find_package gsl GSL) |
494 |
- $(cmake-utils_use_find_package heif HEIF) |
495 |
- $(cmake-utils_use_find_package jpeg JPEG) |
496 |
- $(cmake-utils_use_find_package openexr OpenEXR) |
497 |
- $(cmake-utils_use_find_package pdf Poppler) |
498 |
- $(cmake-utils_use_find_package qtmedia Qt5Multimedia) |
499 |
- $(cmake-utils_use_find_package raw LibRaw) |
500 |
- $(cmake-utils_use_find_package tiff TIFF) |
501 |
- $(cmake-utils_use_find_package vc Vc) |
502 |
- ) |
503 |
- |
504 |
- kde5_src_configure |
505 |
-} |