diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-30 17:36:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-30 17:36:28 +0100 |
| commit | 7014a5a3ea0feffab9701fdd6b64cc7667a985af (patch) | |
| tree | f2cbbaa8bb9209cd15208721103228336149b799 /media-gfx | |
| parent | 7a86906b67693cc65671d3e1476835d3a7e13092 (diff) | |
gentoo resync : 30.06.2019
Diffstat (limited to 'media-gfx')
30 files changed, 839 insertions, 592 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 5d29c62ce302..f6791380f583 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 50996d572a13..23b7ffc9f0bf 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,8 +1,13 @@ AUX exiv2-0.27.0-doc.patch 1024 BLAKE2B 102557142367e36a3632c8c742e35aa820bed92b2688e7b2fc575e6bc2cc18f79c23f5492f3486146cab639c90afd0ebedd53f9807d6db0ebfc77330df28425b SHA512 4e0ad52ecfc7c23ff59b97f165ec35d721a4395357983eaa7e7913387594cf6bae354e48e9b95652fb192b2d6044ecc931228cb2e6d225605adce5165fd81687 AUX exiv2-0.27.0-fix-pkgconfig.patch 710 BLAKE2B eb4952dc49f3a464ee2041c19de9dee404197814086bef869d99d30acb3a0eb13faa716472926c69dc0b44bdcd8d60494aa06855d9eec183fe4920e728f33cfe SHA512 2eb56a1641efbdb5abb6ed62259850f4cc9630d60c213782fc1cf44a705ca9d0fbde22eb6503c9a06dafcaf4eced4d21704442626b6e8b082457de31ae49fcf8 AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a387325435618f200dcac5a70cc96a6151f9ba8036609162fd93a7857cb8677bb7c1d3fe250f9750b8d7e660f34e31e50e3bc15e71a1 SHA512 8cb9b1f4129161861aee384e634433e3fa82aa933804d5f63de95475f6f6658f7b2f63fca1da624ea7b634f71cde5ee0de7e0466247d687494383d001df92ace +AUX exiv2-0.27.1-private-libs.patch 2588 BLAKE2B 1e1ea40271eb79a21d385172783ee8261e46c514884afc38ec3554ae1df35ab5eb29a171fe5cc80a83a2452ed8297cc99e26b99a57959ed9efe8b6e3857a1844 SHA512 ad09ad26dc28c12e711226dee774105ab72e23d4a27e6437e96b1da89e7741ea4ab89a48f75421587b329ce04ab0cc7d7d9d87304a1e46f40b886bc046778460 +AUX exiv2-0.27.1-restore-0.25-behaviour.patch 5405 BLAKE2B 00f857ec133a9a1276a98912c2ed10b651ba124666bf775192e4cde2fcc956261c4c8472f9d90baf6559716b18213207dc3e4e782cce3498b95abc5c74db20e8 SHA512 6351198645a5d6e3abe31bc8da85609cec16549d125e6b649c36b2632c4321bc6236f694158e5bdb85c08681a54f5d99eb86a51182cf4da7c83583e3b0ba434e +AUX exiv2-0.27.1-system-cmakemoduledir1.patch 1649 BLAKE2B 1700401c777ce591329a26b410228373638cc76221eb965123a502862cdf8161973692c0d35365e341dd8f7b6cafc710f6c0cc37996e65f64fd06f9a0d2e4e4e SHA512 8361c1f9ac569b7fdceaa292c6fc218169a70c92878afcde60a78a71864e663f7041b5658243d6b2c724ed07e42dd40741537244b20f4f79a0868aae1781dd9b +AUX exiv2-0.27.1-system-cmakemoduledir2.patch 1084 BLAKE2B 94cda846a2bb13d185e8b8357727030d4bee694d4d0662b08569dee6e9544fafdcedd7ba1c4dea0d46684e7188ac1d95770a22def1a9439663024884ae6c034c SHA512 033b72113ddefcadd86412367c61244406e32a38d8aa93f98cdac6b10e7bfb05a551d5360a76ebcec310ff0e09a342c86d705f2310ebd008949dacf9fa4f9f3e +AUX exiv2-0.27.1-system-libssh-config.patch 2923 BLAKE2B c4a57cb7c22cc477c7919606380743b19521161db8c85d046c68f8f4f8f62f79b4a6b253fe524f5bec09bfd53994efe5c7984d88ab8d750ba017209fad72fed9 SHA512 7b79f69d198017201a3034c5c1729dc61a3a8f569904576fd3b3d8527abf4147985c33b14b8cf4ae7a34c5a3513cf5165cf7d21b628084554bef9039d8e0edb1 DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c DIST exiv2-0.27.1-Source.tar.gz 27210365 BLAKE2B 1ce9a0b26c0908b876e35b5488fc5680789eb864376b379d9bd57977d456a5c6dc5983c4a8ef3e3558ffc061c0b7cda1d1f89a1629af920de1747fd4afbdbb39 SHA512 038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529 EBUILD exiv2-0.27.0-r2.ebuild 2540 BLAKE2B e7ff66cc180f3193b3544a80d22d3777f52c85c85d806a11aedbcedc91e9f9aa9bedada3b29da9a144fe82d48b5299c7c3c9e05af73b8b79cb648e2c19a58b9c SHA512 8446f72fe52c578742200d1ec9487b6d9981f32dce5f96ff17c0ca37b517e8f6d856b23c98d8c7f79816c697d57c5ee67d4a4f3ea087198573840f2d3a55fbc9 -EBUILD exiv2-0.27.1.ebuild 2377 BLAKE2B 12e939213b09d4ce072f9dbc299c00d8e1123c0ef1042d66804bf288f60f0bca0ef789a7e6383ad187ab180fd217f034d49fdbcd79133cd12afd7fa1de8b773c SHA512 f0c9b3f4858de436900db4850f71eaf1bdee5d121bc54db5211b48cdb0786b218d0665bb08d2d4d0250e5c2b663b2f837848d63179ac474adc493933be13d644 +EBUILD exiv2-0.27.1-r1.ebuild 2651 BLAKE2B 4160e44705636e43a586f4c21c9903086078f8177485c37fd9701ed021c5cbacf6401f1b31ea59b9b0b810eac5a242ab0976427e28c2a025f3cbdef2b0247695 SHA512 fb6b22d9e6df2d759bb3da65e1dc9c0b7dea33a14a74608f033071cbb5a01639643f4437c4c312a974093a62df119622cdf53b3f6a225d46f2b464e1e28c40b1 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 diff --git a/media-gfx/exiv2/exiv2-0.27.1.ebuild b/media-gfx/exiv2/exiv2-0.27.1-r1.ebuild index cec021ce43bc..8ffcb2c29e98 100644 --- a/media-gfx/exiv2/exiv2-0.27.1.ebuild +++ b/media-gfx/exiv2/exiv2-0.27.1-r1.ebuild @@ -47,6 +47,13 @@ DOCS=( README.md doc/ChangeLog doc/cmd.txt ) S="${S}-Source" +PATCHES=( + "${FILESDIR}"/${P}-system-cmakemoduledir{1,2}.patch + "${FILESDIR}"/${P}-private-libs.patch + "${FILESDIR}"/${P}-restore-0.25-behaviour.patch + "${FILESDIR}"/${P}-system-libssh-config.patch +) + pkg_setup() { use doc && python-any-r1_pkg_setup } @@ -58,6 +65,8 @@ src_prepare() { mv -f doc/cmd.txt.tmp doc/cmd.txt || die cmake-utils_src_prepare + + sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die } multilib_src_configure() { diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch b/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch new file mode 100644 index 000000000000..c99a19098ae5 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch @@ -0,0 +1,59 @@ +From f05d100579effd7459fd0715b26239d4cd2c9bcc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com> +Date: Sat, 4 May 2019 16:14:15 +0200 +Subject: [PATCH] CURL lib and include directories private for exiv2lib + +(cherry picked from commit 5d64a0b11c5a45dd9d58c56e946301f3f98942a7) +--- + samples/CMakeLists.txt | 14 ++++++++++++++ + src/CMakeLists.txt | 10 +++++----- + 2 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt +index a82403e3b..c3f4722df 100644 +--- a/samples/CMakeLists.txt ++++ b/samples/CMakeLists.txt +@@ -96,6 +96,20 @@ endif() + add_executable(conntest conntest.cpp) + list(APPEND APPLICATIONS conntest) + ++if (EXIV2_ENABLE_WEBREADY) ++ if( EXIV2_ENABLE_CURL ) ++ target_include_directories(conntest SYSTEM PRIVATE ${CURL_INCLUDE_DIR} ) ++ target_link_libraries(conntest PRIVATE ${CURL_LIBRARIES}) ++ if (USING_CONAN) ++ target_compile_definitions(conntest PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL}) ++ target_link_libraries(conntest PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) ++ if (NOT APPLE) ++ target_link_libraries(conntest PRIVATE CONAN_PKG::OpenSSL) ++ endif() ++ endif() ++ endif() ++endif() ++ + # ****************************************************************************** + # remotetest application + add_executable(remotetest remotetest.cpp) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 976327775..d0e989d26 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -179,13 +179,13 @@ if (EXIV2_ENABLE_WEBREADY) + endif() + + if( EXIV2_ENABLE_CURL ) +- target_include_directories(exiv2lib SYSTEM PUBLIC ${CURL_INCLUDE_DIR} ) +- target_link_libraries(exiv2lib PUBLIC ${CURL_LIBRARIES}) ++ target_include_directories(exiv2lib SYSTEM PRIVATE ${CURL_INCLUDE_DIR} ) ++ target_link_libraries(exiv2lib PRIVATE ${CURL_LIBRARIES}) + if (USING_CONAN) +- target_compile_definitions(exiv2lib PUBLIC ${CONAN_COMPILE_DEFINITIONS_LIBCURL}) +- target_link_libraries(exiv2lib PUBLIC ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) ++ target_compile_definitions(exiv2lib PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL}) ++ target_link_libraries(exiv2lib PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) + if (NOT APPLE) +- target_link_libraries(exiv2lib PUBLIC CONAN_PKG::OpenSSL) ++ target_link_libraries(exiv2lib PRIVATE CONAN_PKG::OpenSSL) + endif() + endif() + endif() diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch b/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch new file mode 100644 index 000000000000..2aa4d3a826f3 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch @@ -0,0 +1,119 @@ +From db870755b928cca7411a092ce12292afe9c4fa36 Mon Sep 17 00:00:00 2001 +From: clanmills <robin@clanmills.com> +Date: Thu, 9 May 2019 11:26:29 +0100 +Subject: [PATCH] fix #818. Restore 0.25 behaviour of `$ exiv2 -g image ...` + to apply grep to keys. + +--- + src/actions.cpp | 2 +- + src/exiv2.1 | 50 +++++++++++++++++-------- + tests/bugfixes/github/test_issue_818.py | 32 ++++++++++++++++ + 3 files changed, 67 insertions(+), 17 deletions(-) + create mode 100644 tests/bugfixes/github/test_issue_818.py + +diff --git a/src/actions.cpp b/src/actions.cpp +index 34a7a80d5..68260186d 100644 +--- a/src/actions.cpp ++++ b/src/actions.cpp +@@ -243,7 +243,7 @@ namespace Action { + int rc = 0; + Exiv2::PrintStructureOption option = Exiv2::kpsNone ; + switch (Params::instance().printMode_) { +- case Params::pmSummary: rc = printSummary(); break; ++ case Params::pmSummary: rc = Params::instance().greps_.empty() ? printSummary() : printList(); break; + case Params::pmList: rc = printList(); break; + case Params::pmComment: rc = printComment(); break; + case Params::pmPreview: rc = printPreviewList(); break; +diff --git a/src/exiv2.1 b/src/exiv2.1 +index 4f6f3b51b..048f09af7 100644 +--- a/src/exiv2.1 ++++ b/src/exiv2.1 +@@ -2,7 +2,7 @@ + .\" First parameter, NAME, should be all caps + .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection + .\" other parameters are allowed: see man(7), man(1) +-.TH EXIV2 1 "Apr 25, 2019" ++.TH EXIV2 1 "May 8, 2019" + .\" Please adjust this date whenever revising the manpage. + .\" + .\" Some roff macros, for reference: +@@ -222,19 +222,30 @@ Show unknown tags (default is to suppress tags which don't have a name). + Only keys which match the given key (grep). + .br + Multiple \fB\-g\fP options +-can be used to grep info for several keys. Example: ++can be used to filter info to less keys. Example: + exiv2 -v -V -g webready -g time. ++The default exiv2 command prints a "summary report" which is quite short. When you use -g without a -pmod option, you do not get a summary report and in effect you get -g pattern -pa image ... + + .nf +-exiv2 \-g Date \-pt R.jpg +-Exif.Image.DateTime Ascii 20 2012:08:07 16:01:05 +-Exif.Photo.DateTimeOriginal Ascii 20 2011:09:18 16:25:48 +-Exif.Photo.DateTimeDigitized Ascii 20 2011:09:18 16:25:48 ++$ bin/exiv2 -g Date http://clanmills.com/Stonehenge.jpg ++Exif.Image.DateTime Ascii 20 2015:07:16 20:25:28 ++Exif.Photo.DateTimeOriginal Ascii 20 2015:07:16 15:38:54 ++Exif.Photo.DateTimeDigitized Ascii 20 2015:07:16 15:38:54 ++Exif.NikonWt.DateDisplayFormat Byte 1 Y/M/D ++Exif.GPSInfo.GPSDateStamp Ascii 11 2015:07:16 ++Xmp.xmp.ModifyDate XmpText 25 2015-07-16T20:25:28+01:00 + + .fi +--g (--grep) is only applied to keys. It is not generally applied to all output such as the default -ps report. ++You may use -pmod filters to further filter output. For example: ++.nf ++ ++$ bin/exiv2 -px -g Date http://clanmills.com/Stonehenge.jpg ++Xmp.xmp.ModifyDate XmpText 25 2015-07-16T20:25:28+01:00 + +-The key may finish with the optional modifier /i to indicated case insensitive. ++.fi ++The option -g (--grep) applies to keys and not values. ++ ++The key may finish with the optional modifier /i to indicate case insensitive. + .TP + .B \-K \fIkey\fP + Only report data for given key. +@@ -243,8 +254,8 @@ Multiple \fB\-K\fP options can be used to report more than a single key. + + .nf + exiv2 \-K Exif.Photo.DateTimeDigitized -K Exif.Photo.DateTimeOriginal \-pt R.jpg +-Exif.Photo.DateTimeOriginal Ascii 20 2011:09:18 16:25:48 +-Exif.Photo.DateTimeDigitized Ascii 20 2011:09:18 16:25:48 ++Exif.Photo.DateTimeOriginal Ascii 20 2011:09:18 16:25:48 ++Exif.Photo.DateTimeDigitized Ascii 20 2011:09:18 16:25:48 + .fi + .TP + .B \-n \fIenc\fP +@@ -594,17 +605,24 @@ You obtain the lensID for your camera with the command: + .nf + .sp 1 + $ exiv2 -pv --grep lens/i http://clanmills.com/Stonehenge.jpg +-0x0083 Nikon3 LensType Byte 1 14 +-0x0084 Nikon3 Lens Rational 4 180/10 2500/10 35/10 63/10 +-0x008b Nikon3 LensFStops Undefined 4 55 1 12 0 +-0x000c NikonLd3 LensIDNumber Byte 1 146 <--- This number +-0x000d NikonLd3 LensFStops Byte 1 55 ++0x0083 Nikon3 LensType Byte 1 14 ++0x0084 Nikon3 Lens Rational 4 180/10 2500/10 35/10 63/10 ++0x008b Nikon3 LensFStops Undefined 4 55 1 12 0 ++0x000c NikonLd3 LensIDNumber Byte 1 146 <--- This number ++0x000d NikonLd3 LensFStops Byte 1 55 + .br + .ne 40 + .SH EXAMPLES + .TP + exiv2 *.jpg +-Prints a summary of the Exif information for all JPEG files in the directory. ++Prints a summary of the Exif information for all JPEG files in the directory. The summary report is rather brief and presentation does not use the Family.Group.Tag convention. ++ ++If you use --grep pattern, the default becomes -pa. See -g/grep above. ++ ++.nf ++$ exiv2 -g Date http://clanmills.com/Stonehenge.jpg ++ ++.fi + .TP + exiv2 \-pi image.jpg + Prints the IPTC metadata of the image. diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch new file mode 100644 index 000000000000..77a68437502e --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch @@ -0,0 +1,41 @@ +From 78676b2a025023ab3de2d094e0798ed64ef7df97 Mon Sep 17 00:00:00 2001 +From: Robin Mills <robin@clanmills.com> +Date: Sat, 27 Apr 2019 11:18:22 +0100 +Subject: [PATCH] Fix #798 + +--- + README.md | 2 +- + releasenotes/CYGWIN/ReadMe.txt | 17 +---------------- + releasenotes/Darwin/ReadMe.txt | 6 ++---- + releasenotes/Linux/ReadMe.txt | 2 +- + releasenotes/MinGW/ReadMe.txt | 2 +- + releasenotes/msvc/ReadMe.txt | 2 +- + src/CMakeLists.txt | 2 +- + 7 files changed, 8 insertions(+), 25 deletions(-) + +diff --git a/README.md b/README.md +index 6e9f50a94..92cca39e6 100644 +--- a/README.md ++++ b/README.md +@@ -189,7 +189,7 @@ project(exifprint VERSION 0.0.1 LANGUAGES CXX) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_EXTENSIONS OFF) + +-find_package(exiv2 REQUIRED CONFIG NAMES exiv2) # search ${CMAKE_INSTALL_PREFIX}/lib/exiv2/cmake/ ++find_package(exiv2 REQUIRED CONFIG NAMES exiv2) # search ${CMAKE_INSTALL_PREFIX}/lib/cmake/exiv2 + add_executable(exifprint ../samples/exifprint.cpp) # compile this + target_link_libraries(exifprint exiv2lib) # link exiv2lib + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 340870048..976327775 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -239,7 +239,7 @@ install(FILES + ${CMAKE_BINARY_DIR}/exiv2lib_export.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2) + +-install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") ++install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") + diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch new file mode 100644 index 000000000000..1770449564a2 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch @@ -0,0 +1,28 @@ +From 6819f2ac456c57291f94cc1f4db13ce134eed468 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 23 Jun 2019 19:32:29 +0200 +Subject: [PATCH] Fix install path of exiv2ConfigVersion.cmake + +This seems to have been caused by duplicate work between master branch +and 0.27-maintenance branch, as commit 3b48249eeb350301dfb3efa3ba6f7d7b162455be +had already got that right. +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1d0ccee4..05ce4e14 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -245,7 +245,7 @@ install(FILES + + install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") + +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") + + # ****************************************************************************** + # exiv2 application +-- +2.22.0 + diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch new file mode 100644 index 000000000000..555314ae9329 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch @@ -0,0 +1,93 @@ +From e85ce17fc91e11eff26c6f5a89125505b7db5fd3 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 23 Jun 2019 19:50:01 +0200 +Subject: [PATCH 1/2] Switch to libssh's own libssh-config.cmake + +This is provided by libssh since 2013. +--- + cmake/findDependencies.cmake | 2 +- + src/CMakeLists.txt | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake +index 12d47525..52760185 100644 +--- a/cmake/findDependencies.cmake ++++ b/cmake/findDependencies.cmake +@@ -20,7 +20,7 @@ if( EXIV2_ENABLE_WEBREADY ) + endif() + + if( EXIV2_ENABLE_SSH ) +- find_package( SSH REQUIRED) ++ find_package(libssh CONFIG REQUIRED) + endif( ) + endif( ) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1d0ccee4..b532fc7b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -174,8 +174,8 @@ target_include_directories(exiv2lib_int PUBLIC + if (EXIV2_ENABLE_WEBREADY) + + if( EXIV2_ENABLE_SSH ) +- target_include_directories(exiv2lib SYSTEM PUBLIC ${SSH_INCLUDE_DIR} ) +- target_link_libraries( exiv2lib PUBLIC ${SSH_LIBRARIES}) ++ target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR}) ++ target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES}) + endif() + + if( EXIV2_ENABLE_CURL ) +-- +2.22.0 + + +From 89d8160a410c2c526ad021fd456accc709cae520 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 23 Jun 2019 19:50:44 +0200 +Subject: [PATCH 2/2] Drop now obsolete FindSSH.cmake + +--- + cmake/FindSSH.cmake | 31 ------------------------------- + 1 file changed, 31 deletions(-) + delete mode 100644 cmake/FindSSH.cmake + +diff --git a/cmake/FindSSH.cmake b/cmake/FindSSH.cmake +deleted file mode 100644 +index 2a6fa378..00000000 +--- a/cmake/FindSSH.cmake ++++ /dev/null +@@ -1,31 +0,0 @@ +-# - Find libssh +-# Find the native SSH headers and libraries. +-# +-# SSH_INCLUDE_DIRS - where to find libssh.h, etc. +-# SSH_LIBRARIES - List of libraries when using libssh. +-# SSH_FOUND - True if libssh found. +-# +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +- +-# Look for the header file. +-FIND_PATH(SSH_INCLUDE_DIR NAMES libssh/libssh.h) +- +-# Look for the library. +-FIND_LIBRARY(SSH_LIBRARY NAMES ssh libssh) +- +-# handle the QUIETLY and REQUIRED arguments and set SSH_FOUND to TRUE if +-# all listed variables are TRUE +-INCLUDE(FindPackageHandleStandardArgs) +-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SSH DEFAULT_MSG SSH_LIBRARY SSH_INCLUDE_DIR) +- +-# Copy the results to the output variables. +-IF(SSH_FOUND) +- SET(SSH_LIBRARIES ${SSH_LIBRARY}) +- SET(SSH_INCLUDE_DIRS ${SSH_INCLUDE_DIR}) +-ELSE(SSH_FOUND) +- SET(SSH_LIBRARIES) +- SET(SSH_INCLUDE_DIRS) +-ENDIF(SSH_FOUND) +- +-MARK_AS_ADVANCED(SSH_INCLUDE_DIR SSH_LIBRARY) +-- +2.22.0 + diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index d26f22f83b7f..6091f68e084c 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -3,6 +3,6 @@ AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc711 DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c DIST GraphicsMagick-1.3.32.tar.xz 5535224 BLAKE2B 96fd7bfe62b4b1b25f9ffc0ff8e2ac023f0528b9af857fc27a5a9cd1123eeb6533b868c7bad8dca5b58e114a674dda009a62904df64622d7b5f3c0d72156283d SHA512 f84cdb9318962aed1dc25d70db4d0ca102e4f88748f468f8a56b77d228fd315b772afa48e90a396d32e8226eba9105717bcb94166bbe43723afeec58ead53e09 EBUILD graphicsmagick-1.3.30.ebuild 3251 BLAKE2B 78eecba484d87f81e0ee12d119a84fabc3c052ab7b63b92acff37c0b9b751a4e99fde3c1bd14c6e8dc20a97ecbd94c0f0c558d28a13e4b1523b29c75d61899cd SHA512 165fc7bad883df3be55c9b5714d6a284d9c97e5c06f0e13a08ac783fd946e39b6b929bd9ea17b4284c312830f46edfb536131bf730eec52bd2249c5420569519 -EBUILD graphicsmagick-1.3.32.ebuild 3233 BLAKE2B 38022ff4067c1a94e255d3ad64f8dfd62a493c2a76a011f55cd905787023e43167532bd5e1897f6033401182ca5e7c741187780297665677b1c507faa4538f8a SHA512 21ca7a9d48197bd07d359073a432f59d5bff74d09b5aaf3837023e28d48efa8c1930f27f8e9ff2fa3e3fec46637ea52bae44a180f5a43166ac45973bf7e0dc4f -EBUILD graphicsmagick-9999.ebuild 3239 BLAKE2B 780718832c5346092937f621cf2af769326960597028a293a1f2155a2556dac9aac0b5ac5407b7429622a58d453b525206c5475da576f2891c66f48dffa3bbc2 SHA512 b70e76f40d146a9f750ce6944928252fc8ac67c22d8ad5326fdb091fb2c75d048178e842c619e487ca89bdc557524e52765285cc8a53cf3e276be82405c3badd +EBUILD graphicsmagick-1.3.32.ebuild 3128 BLAKE2B 0974fc58a35cc03c3cbc78f8db86f2a132915f80e76450997cb267f40d982fc76bc95a3648e50c807df2cb89434447bac157795fdb0c392861b89be7e439ea45 SHA512 5d44fa2b56b68cf083d6968ed0d982547c7ead76b11db79fda40f8dcfc0b9f1a24a61a0d5915858f29cbbd47022755eb6c0c8558934b83bf8b8bede2f0052445 +EBUILD graphicsmagick-9999.ebuild 3135 BLAKE2B fdfe63bdefa557c18eb456ca5df0e962f35cb581b6b598bdd607e5fc2b96157b7a004d052286a843541fe68437990cd6116688b5311ee6bab3a4b980a8a6030d SHA512 4212db1adb020fcbf49780bcc446379d4463a446b74e98e0c1105ff08864526a931de33f3b869145c7af2bc093c281329349b6617a762d29a915a4efbad7ebe6 MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild index cca5396cb7f0..1fa5c4b22cc0 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild @@ -16,11 +16,11 @@ if [[ ${PV} == "9999" ]] ; then EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" else SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" fi IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp - perl png postscript q16 q32 static-libs svg test threads tiff truetype + perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib" RDEPEND="dev-libs/libltdl:0 @@ -48,9 +48,7 @@ RDEPEND="dev-libs/libltdl:0 x11-libs/libXext ) zlib? ( sys-libs/zlib )" -# corefonts are required because needed arial font (bug #588398). -DEPEND="${RDEPEND} - test? ( media-fonts/corefonts )" +DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index 8b6bccaf93cd..996bba55fa4f 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -20,7 +20,7 @@ else fi IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp - perl png postscript q16 q32 static-libs svg test threads tiff truetype + perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib" RDEPEND="dev-libs/libltdl:0 @@ -48,9 +48,7 @@ RDEPEND="dev-libs/libltdl:0 x11-libs/libXext ) zlib? ( sys-libs/zlib )" -# corefonts are required because needed arial font (bug #588398). -DEPEND="${RDEPEND} - test? ( media-fonts/corefonts )" +DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index e20b9feeac3f..4a818f0519c9 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,8 +1,8 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 -DIST ImageMagick-6.9.10-49.tar.xz 8940128 BLAKE2B e8653b10e251354b8a48f1e1b613d6dba8d077e38f71ac04b68062ce86da3e078a6dbcfd47fbda9a90301d3d231606f75eb1f714516788c65055304aaf90d1e9 SHA512 c25f4814e02d9d11fae863683a676b995f59967ed556bca766ec107dfee3ee573999acd291fbac13d5cc828f782a223e7389939d786678b23859f39db2eaba9a -DIST ImageMagick-7.0.8-49.tar.xz 9452340 BLAKE2B 1e1b662e16287cc505ce40b1031836406159e9574efaaead3e8789300798469075d35bff01fb6a994efc42764ef3e509a9c0fec0c5cd7e3abeb09a201f689ca8 SHA512 8dd4a45f4d95d949bcd797f44d1602a3767386ee7d73888fb8a1ee6d4d8be7c4881a88262e7261a253da6f4b3c8ac9442d5eacb44e267e2d25e11bda10b12526 -EBUILD imagemagick-6.9.10.49.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8 -EBUILD imagemagick-7.0.8.49.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f +DIST ImageMagick-6.9.10-50.tar.xz 8941584 BLAKE2B dcbbe4b0c25c281168088dd5b62a9d882088b9b57fc4127c6d233b049011ae3ede43e2629734fbd1ae2b21cd13f64690e6f6a3ea81a1e08736fbc1a29a5bccf9 SHA512 f288eb8ce40aafb3d099ae5ec10403902934d02440256ed2012f0b13456b237c3a903f92764b02378c27005fd65ad1251ff1663fce825890721fa93b18ad515d +DIST ImageMagick-7.0.8-50.tar.xz 9453076 BLAKE2B a137fb353d32ce6914b5033ea4c02bc81cb1eb82c1dbb6d449f20e19b23ec1eeef628e27c497cb9eb5e7a23f9d4f9f2152e3c6e64dfb5c6f793358c174286e27 SHA512 78cee7463610b256b899cc9474924cefe2dc36ab238025c54688563c3e1aa4b86ebc739f22fb349ab8914b7ac0dc6c5073cca168b9cfc371fb4bbd7e3f51cfbc +EBUILD imagemagick-6.9.10.50.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8 +EBUILD imagemagick-7.0.8.50.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.49.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.50.ebuild index b6bca9ea8b20..b6bca9ea8b20 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.49.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.50.ebuild diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.49.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.50.ebuild index 59c2b130c53d..59c2b130c53d 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.8.49.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.8.50.ebuild diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 114a3faa7fdf..df0016abfe11 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,9 +1,10 @@ AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416abf1150a4b25f81b5befb8ffb254daf0c25b4b189ba0aefe9a3256eb83013d80919e21f77f7880fa7856a05ef5c995dfc73d079753e2c38 SHA512 c4048d8fe560508f04df785a012db99a5e6a2d4ca5b1d8e774a307cdb99f62de4969b04a58586c771a174dadf6dedafaa70568e8b6342612fbe52be32db257cb AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a -AUX krita-4.2.0-tests-optional.patch 9915 BLAKE2B 3f63d2b30630e42413e58d23429c3df917c926d793c570be87bf59b83af9ec5740b220bbac433c928748dededf6714936c041433bc723c9612a45372311e6dc5 SHA512 72c62152ef767daedee84da58f179b34b0dc38adb03e63433c2870e0de93d30d2e929e65d7a8c8cd968b200ca0d87e570ab3c13f5be8b78b1c328dc3489ccb3b +AUX krita-4.2.2-fixuifiles.patch 759 BLAKE2B 0d99b4948e0dc9c507232736d8c56dd3595b5d985fc58cfe09b057cdfdf91d2e2df066d0538733c8b79429eecef7f53e5f69192b9813445ddfd22e9177e75ef3 SHA512 f77b22771e5bea7804868d19456e89dbab8079096e9776a788ac100eb8fd278c144efb8279753bc7ce6b2845c9d4505fd6733e33251298bfd0069a7deb337bee +AUX krita-4.2.2-tests-optional.patch 12503 BLAKE2B 31b96b377e217dd9e7f8dd25e45487fc7bf0bf4883ffb15d965c0fbdf0a660baf0229024e236cd50ec8533ab85b89cb0c78c4a78f210801be87a43c0ecee4701 SHA512 a4f64e008e07974dbc343a90e8ec181121b14b7d000dfb5bb167b49871b2c31e1d74786409240d2bfbbdeebb89f8b29d2e8cd61df0761a523e61e8a6115ea9fe DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9 -DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390 SHA512 879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1 +DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e SHA512 7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096 EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a -EBUILD krita-4.2.1.ebuild 3154 BLAKE2B 671e4a47b6485efff0ee69b74ef05030be2d93ce282a9b554ddbcb6d7abcd46c198710d007f38a132fada4719611f3f72726d598e09bd9fc6fad1d6a909f4968 SHA512 667a9f2b187e98fdb2e3aeadd52e6f5e1c321cca003969294147566008c02361f2ddd1f618fdfb6c5453de729141218d1a94762260e17b27ef5b49ac87f7e7c9 +EBUILD krita-4.2.2.ebuild 3185 BLAKE2B 7fb9adb95e8a0965b983f2c7fa63ba90c2df688e99f81bb6d19f27693c0350aecb48d811a0c61fa72da7004e0d9bac971b9299a13cad939223d292f61e566c46 SHA512 0b25893e4a8dda09c493c563118cd5fac0649e7f4f76689b0b776d1de4cb461d6cf8f57b391150e9216c2fd618250bcbf2d52ed4b90bfe33d1f421f6cc8bb5b4 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch deleted file mode 100644 index b605e922aba1..000000000000 --- a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch +++ /dev/null @@ -1,324 +0,0 @@ ---- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.442258240 +0200 -+++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.452257980 +0200 -@@ -1,6 +1,8 @@ - project( lcmsengine ) - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - include_directories(SYSTEM - ${LCMS2_INCLUDE_DIR} ---- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.469257540 +0200 -+++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.477257332 +0200 -@@ -20,4 +20,6 @@ - target_link_libraries(kritaqmic kritaui) - install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() ---- a/plugins/filters/CMakeLists.txt 2019-06-01 15:10:43.488257047 +0200 -+++ b/plugins/filters/CMakeLists.txt 2019-06-01 15:10:43.497256813 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - add_subdirectory( blur ) - add_subdirectory( colors ) - add_subdirectory( colorsfilters ) ---- a/plugins/filters/unsharp/CMakeLists.txt 2019-06-01 15:10:43.508256528 +0200 -+++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-01 15:10:43.516256320 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - set(kritaunsharpfilter_SOURCES - unsharp.cpp ---- a/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.527256035 +0200 -+++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.535255828 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - include_directories(SYSTEM - ${OCIO_INCLUDE_DIR} ---- a/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.546255542 +0200 -+++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.555255309 +0200 -@@ -1,5 +1,7 @@ - if (NOT WIN32 AND NOT APPLE) -- add_subdirectory(tests) -+ if(BUILD_TESTING) -+add_subdirectory(tests) -+endif() - endif() - - set(KRITA_ANIMATIONDOCKER_SOURCES ---- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01 15:10:43.566255024 +0200 -+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01 15:10:43.574254816 +0200 -@@ -1,5 +1,7 @@ - if (NOT WIN32 AND NOT APPLE) -- add_subdirectory(tests) -+ if(BUILD_TESTING) -+add_subdirectory(tests) -+endif() - endif() - - set(kritatooltransform_SOURCES ---- a/plugins/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.584254557 +0200 -+++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.592254349 +0200 -@@ -1,5 +1,7 @@ - if (NOT APPLE) -- add_subdirectory(tests) -+ if(BUILD_TESTING) -+add_subdirectory(tests) -+endif() - endif () - - set(kritadefaulttools_SOURCES ---- a/plugins/impex/tiff/CMakeLists.txt 2019-06-01 15:10:43.602254090 +0200 -+++ b/plugins/impex/tiff/CMakeLists.txt 2019-06-01 15:10:43.609253908 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(libkritatiffconverter_LIB_SRCS - kis_tiff_converter.cc ---- a/plugins/impex/libkra/CMakeLists.txt 2019-06-01 15:10:43.620253623 +0200 -+++ b/plugins/impex/libkra/CMakeLists.txt 2019-06-01 15:10:43.627253441 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(kritalibkra_LIB_SRCS - kis_colorize_dom_utils.cpp ---- a/plugins/impex/jpeg/CMakeLists.txt 2019-06-01 15:10:43.638253156 +0200 -+++ b/plugins/impex/jpeg/CMakeLists.txt 2019-06-01 15:10:43.646252949 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms") - ---- a/plugins/impex/psd/CMakeLists.txt 2019-06-01 15:10:43.662252534 +0200 -+++ b/plugins/impex/psd/CMakeLists.txt 2019-06-01 15:10:43.671252300 +0200 -@@ -1,5 +1,7 @@ - if (NOT MSVC AND NOT APPLE) -- add_subdirectory(tests) -+ if(BUILD_TESTING) -+add_subdirectory(tests) -+endif() - endif() - - configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h) ---- a/plugins/impex/xcf/CMakeLists.txt 2019-06-01 15:10:43.685251937 +0200 -+++ b/plugins/impex/xcf/CMakeLists.txt 2019-06-01 15:10:43.694251704 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools") - ---- a/plugins/impex/heightmap/CMakeLists.txt 2019-06-01 15:10:43.705251418 +0200 -+++ b/plugins/impex/heightmap/CMakeLists.txt 2019-06-01 15:10:43.714251185 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) - ---- a/plugins/impex/csv/CMakeLists.txt 2019-06-01 15:10:43.725250900 +0200 -+++ b/plugins/impex/csv/CMakeLists.txt 2019-06-01 15:10:43.734250666 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - # import - ---- a/plugins/impex/exr/CMakeLists.txt 2019-06-01 15:10:43.745250381 +0200 -+++ b/plugins/impex/exr/CMakeLists.txt 2019-06-01 15:10:43.754250148 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} ) - ---- a/plugins/impex/ppm/CMakeLists.txt 2019-06-01 15:10:43.765249862 +0200 -+++ b/plugins/impex/ppm/CMakeLists.txt 2019-06-01 15:10:43.773249655 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) - ---- a/plugins/impex/svg/CMakeLists.txt 2019-06-01 15:10:43.784249370 +0200 -+++ b/plugins/impex/svg/CMakeLists.txt 2019-06-01 15:10:43.792249162 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(kritasvgimport_SOURCES - kis_svg_import.cc ---- a/plugins/impex/png/CMakeLists.txt 2019-06-01 15:10:43.803248877 +0200 -+++ b/plugins/impex/png/CMakeLists.txt 2019-06-01 15:10:43.811248669 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(kritapngimport_SOURCES - kis_png_import.cc ---- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-01 15:10:43.823248358 +0200 -+++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-01 15:10:43.831248150 +0200 -@@ -104,4 +104,6 @@ - install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS}) - - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() ---- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-01 15:10:43.842247865 +0200 -+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-01 15:10:43.850247658 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(brush/tests) -+endif() - - include_directories(brush - duplicate ---- a/libs/metadata/CMakeLists.txt 2019-06-01 15:10:43.862247346 +0200 -+++ b/libs/metadata/CMakeLists.txt 2019-06-01 15:10:43.870247139 +0200 -@@ -29,4 +29,6 @@ - - install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS}) - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() ---- a/libs/global/CMakeLists.txt 2019-06-01 15:10:43.881246854 +0200 -+++ b/libs/global/CMakeLists.txt 2019-06-01 15:10:43.890246620 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - include(CheckFunctionExists) - check_function_exists(backtrace HAVE_BACKTRACE) ---- a/libs/ui/CMakeLists.txt 2019-06-01 15:10:43.901246335 +0200 -+++ b/libs/ui/CMakeLists.txt 2019-06-01 15:10:43.911246076 +0200 -@@ -7,7 +7,9 @@ - ${OCIO_INCLUDE_DIR} - ) - -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - if (APPLE) - find_library(FOUNDATION_LIBRARY Foundation) ---- a/libs/flake/CMakeLists.txt 2019-06-01 15:10:43.922245790 +0200 -+++ b/libs/flake/CMakeLists.txt 2019-06-01 15:10:43.931245557 +0200 -@@ -9,7 +9,9 @@ - ) - - add_subdirectory(styles) -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(kritaflake_SRCS - KoGradientHelper.cpp ---- a/libs/brush/CMakeLists.txt 2019-06-01 15:10:43.943245246 +0200 -+++ b/libs/brush/CMakeLists.txt 2019-06-01 15:10:43.952245012 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - include_directories(SYSTEM - ${EIGEN3_INCLUDE_DIR} ---- a/libs/widgetutils/CMakeLists.txt 2019-06-01 15:10:43.963244727 +0200 -+++ b/libs/widgetutils/CMakeLists.txt 2019-06-01 15:10:43.972244494 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h ) - ---- a/libs/store/CMakeLists.txt 2019-06-01 15:10:43.984244182 +0200 -+++ b/libs/store/CMakeLists.txt 2019-06-01 15:10:43.992243975 +0200 -@@ -1,6 +1,8 @@ - include_directories(${QUAZIP_INCLUDE_DIRS}) - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - - set(kritastore_LIB_SRCS - KoDirectoryStore.cpp ---- a/libs/pigment/CMakeLists.txt 2019-06-01 15:10:44.002243716 +0200 -+++ b/libs/pigment/CMakeLists.txt 2019-06-01 15:10:44.010243508 +0200 -@@ -31,7 +31,9 @@ - message("${__per_arch_factory_objs}") - endif() - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() - add_subdirectory(benchmarks) - - set(kritapigment_SRCS ---- a/libs/libkis/CMakeLists.txt 2019-06-01 15:10:44.021243223 +0200 -+++ b/libs/libkis/CMakeLists.txt 2019-06-01 15:10:44.028243041 +0200 -@@ -47,4 +47,6 @@ - install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS}) - - -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() ---- a/libs/image/CMakeLists.txt 2019-06-01 15:10:44.039242756 +0200 -+++ b/libs/image/CMakeLists.txt 2019-06-01 15:10:44.047242548 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - add_subdirectory( tiles3 ) - ---- a/libs/image/tiles3/CMakeLists.txt 2019-06-01 15:10:44.057242289 +0200 -+++ b/libs/image/tiles3/CMakeLists.txt 2019-06-01 15:10:44.065242082 +0200 -@@ -1 +1,3 @@ -+if(BUILD_TESTING) - add_subdirectory(tests) -+endif() ---- a/libs/odf/CMakeLists.txt 2019-06-01 15:10:44.076241796 +0200 -+++ b/libs/odf/CMakeLists.txt 2019-06-01 15:10:44.084241589 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - set(kritaodf_LIB_SRCS - KoOdf.cpp ---- a/libs/widgets/CMakeLists.txt 2019-06-01 15:10:44.094241329 +0200 -+++ b/libs/widgets/CMakeLists.txt 2019-06-01 15:10:44.102241122 +0200 -@@ -1,4 +1,6 @@ -+if(BUILD_TESTING) - add_subdirectory( tests ) -+endif() - - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch new file mode 100644 index 000000000000..1703386a3c72 --- /dev/null +++ b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch @@ -0,0 +1,25 @@ +From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001 +From: Pino Toscano <pino@kde.org> +Date: Tue, 25 Jun 2019 06:57:40 +0200 +Subject: fixuifiles + +--- + libs/widgetutils/tests/dialogsavertestwidget.ui | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui b/libs/widgetutils/tests/dialogsavertestwidget.ui +index 66e70b3..ba0f54f 100644 +--- a/libs/widgetutils/tests/dialogsavertestwidget.ui ++++ b/libs/widgetutils/tests/dialogsavertestwidget.ui +@@ -10,9 +10,6 @@ + <height>300</height> + </rect> + </property> +- <property name="windowTitle"> +- <string>Form</string> +- </property> + <widget class="QPushButton" name="pushButton"> + <property name="geometry"> + <rect> +-- +cgit v1.1 diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch new file mode 100644 index 000000000000..2df715be04f6 --- /dev/null +++ b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch @@ -0,0 +1,405 @@ +--- a/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.049823682 +0200 ++++ b/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.056823729 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + add_subdirectory( blur ) + add_subdirectory( colors ) + add_subdirectory( colorsfilters ) +--- a/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.063823776 +0200 ++++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.069823817 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + set(kritaunsharpfilter_SOURCES + unsharp.cpp +--- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.077823871 +0200 ++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.084823918 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(brush/tests) ++endif() + + include_directories(brush + duplicate +--- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.092823972 +0200 ++++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.098824013 +0200 +@@ -104,4 +104,6 @@ + install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.105824060 +0200 ++++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.112824107 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories(SYSTEM + ${OCIO_INCLUDE_DIR} +--- a/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.120824161 +0200 ++++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.124824188 +0200 +@@ -1,5 +1,7 @@ + if (NOT WIN32 AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif() + + set(KRITA_ANIMATIONDOCKER_SOURCES +--- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.132824242 +0200 ++++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.136824270 +0200 +@@ -20,4 +20,6 @@ + target_link_libraries(kritaqmic kritaui) + install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.141824303 +0200 ++++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.146824337 +0200 +@@ -1,5 +1,7 @@ + if (NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif () + + set(kritadefaulttools_SOURCES +--- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.151824371 +0200 ++++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.155824398 +0200 +@@ -1,5 +1,7 @@ + if (NOT WIN32 AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif() + + set(kritatooltransform_SOURCES +--- a/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.163824452 +0200 ++++ b/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.169824492 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) + +--- a/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.175824533 +0200 ++++ b/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.180824567 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritasvgimport_SOURCES + kis_svg_import.cc +--- a/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.186824607 +0200 ++++ b/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.190824634 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritabrushexport_PART_SRCS + kis_brush_export.cpp +--- a/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.195824668 +0200 ++++ b/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.199824695 +0200 +@@ -1,5 +1,7 @@ + if (NOT MSVC AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++add_subdirectory(tests) ++endif() + endif() + + configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h) +--- a/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.206824742 +0200 ++++ b/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.210824769 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritatgaexport_SOURCES + kis_tga_export.cpp +--- a/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.216824810 +0200 ++++ b/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.221824844 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritalibkra_LIB_SRCS + kis_colorize_dom_utils.cpp +--- a/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.228824891 +0200 ++++ b/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.233824924 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms") + +--- a/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.239824965 +0200 ++++ b/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.243824992 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritagifexport_SOURCES + kis_gif_export.cpp +--- a/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.248825026 +0200 ++++ b/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.253825060 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} ) + +--- a/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.260825107 +0200 ++++ b/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.268825160 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools") + +--- a/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.277825221 +0200 ++++ b/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.283825262 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(libkritatiffconverter_LIB_SRCS + kis_tiff_converter.cc +--- a/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.290825310 +0200 ++++ b/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.295825343 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(libkritaconverter_LIB_SRCS + ora_converter.cpp +--- a/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.302825391 +0200 ++++ b/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.309825438 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}") +--- a/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.317825492 +0200 ++++ b/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.322825526 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp ) + +--- a/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.332825593 +0200 ++++ b/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.339825640 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + # import + +--- a/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.347825694 +0200 ++++ b/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.352825728 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) + +--- a/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.359825775 +0200 ++++ b/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.365825816 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + if(OPENEXR_FOUND) + include_directories(${OPENEXR_INCLUDE_DIR}) +--- a/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.371825857 +0200 ++++ b/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.376825890 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritaqimageioexport_SOURCES + kis_qimageio_export.cpp +--- a/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.383825938 +0200 ++++ b/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.389825978 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritaqmlexport_SOURCES + qml_converter.cc +--- a/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.396826025 +0200 ++++ b/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.401826059 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritapngimport_SOURCES + kis_png_import.cc +--- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.408826106 +0200 ++++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.412826133 +0200 +@@ -1,6 +1,8 @@ + project( lcmsengine ) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories(SYSTEM + ${LCMS2_INCLUDE_DIR} +--- a/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.417826167 +0200 ++++ b/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.421826194 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include_directories(SYSTEM + ${EIGEN3_INCLUDE_DIR} +--- a/libs/global/CMakeLists.txt 2019-06-27 18:48:55.426826228 +0200 ++++ b/libs/global/CMakeLists.txt 2019-06-27 18:48:55.430826255 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include(CheckFunctionExists) + check_function_exists(backtrace HAVE_BACKTRACE) +--- a/libs/image/CMakeLists.txt 2019-06-27 18:48:55.435826289 +0200 ++++ b/libs/image/CMakeLists.txt 2019-06-27 18:48:55.438826309 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + add_subdirectory( tiles3 ) + +--- a/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.444826350 +0200 ++++ b/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.447826370 +0200 +@@ -1 +1,3 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.452826404 +0200 ++++ b/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.456826430 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + set(kritaodf_LIB_SRCS + KoOdf.cpp +--- a/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.461826464 +0200 ++++ b/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.465826491 +0200 +@@ -29,4 +29,6 @@ + + install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS}) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/libs/store/CMakeLists.txt 2019-06-27 18:48:55.470826525 +0200 ++++ b/libs/store/CMakeLists.txt 2019-06-27 18:48:55.473826545 +0200 +@@ -1,6 +1,8 @@ + include_directories(${QUAZIP_INCLUDE_DIRS}) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritastore_LIB_SRCS + KoDirectoryStore.cpp +--- a/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.478826579 +0200 ++++ b/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.482826605 +0200 +@@ -47,4 +47,6 @@ + install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.487826640 +0200 ++++ b/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.491826667 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h ) + +--- a/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.496826701 +0200 ++++ b/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.500826727 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +--- a/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.505826761 +0200 ++++ b/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.510826795 +0200 +@@ -9,7 +9,9 @@ + ) + + add_subdirectory(styles) ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritaflake_SRCS + KoGradientHelper.cpp +--- a/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.516826836 +0200 ++++ b/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.520826863 +0200 +@@ -7,7 +7,9 @@ + ${OCIO_INCLUDE_DIR} + ) + ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + if (APPLE) + find_library(FOUNDATION_LIBRARY Foundation) +--- a/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.526826903 +0200 ++++ b/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.530826930 +0200 +@@ -31,7 +31,9 @@ + message("${__per_arch_factory_objs}") + endif() + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + add_subdirectory(benchmarks) + + set(kritapigment_SRCS diff --git a/media-gfx/krita/krita-4.2.1.ebuild b/media-gfx/krita/krita-4.2.2.ebuild index f9b39e3a7afa..5a7e08cbf683 100644 --- a/media-gfx/krita/krita-4.2.1.ebuild +++ b/media-gfx/krita/krita-4.2.2.ebuild @@ -87,7 +87,10 @@ RDEPEND="${COMMON_DEPEND} # bug 630508 RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-4.2.0-tests-optional.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-tests-optional.patch + "${FILESDIR}"/${P}-fixuifiles.patch +) pkg_setup() { python-single-r1_pkg_setup diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest index 717e3c426fcf..d8b1292a420f 100644 --- a/media-gfx/kxstitch/Manifest +++ b/media-gfx/kxstitch/Manifest @@ -1,7 +1,3 @@ -AUX kxstitch-2.1.1-imagemagick-fix.patch 4051 BLAKE2B f7f19ec8e5168fd421e08b4b19a3ab51964d5747d129b65f4e6eb1436dbc5638c4d7077f7fcf044e5e2ae89a09324b82be89de26e864f34c605d7382ebe64cbd SHA512 f13c4bacde6973aafc186d9576bd04e49574ffe8d42bc475017c1f2f353d39debebd8a81671e86ef67863306269339ae1542289f222874bd03a06a22c785090b -AUX kxstitch-2.1.1-qt-5.11.patch 992 BLAKE2B f0be157270ddd27e1f997f57afbb8e3d80c31816334664a7a2804c4c9971a81c11ecd775820b7fe0db36dff7ea00d046c7f005a0bf715e9336f4f238a36c2b18 SHA512 93d6a5ddc2fa928369b09637ee6b856ba60d35d02e5e93f16fc08c4fdbc2ebead44224d2ad98fa2ffe6efcea8b93a0211eb00ad83c9cd91b8ddc30edff17602e -DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36 SHA512 d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3 DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150 SHA512 bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d -EBUILD kxstitch-2.1.1-r2.ebuild 1007 BLAKE2B 1a4af1f260e79a82893e1d3b34feed8c6f1e603d52ac9de54492792f07d1b330504db0f0742bc653545a3e73cd48c44da5d6a57da453526af28ede84d898949e SHA512 9250c6dec14536960ed0b365dfae6d857353901a6ad48ad6e173af3c23e6f80f6be7129e94385f26d335f927c14f2e0bcf44decd1e9e2bd89c9e8fcdad0ab42c EBUILD kxstitch-2.2.0.ebuild 918 BLAKE2B d994c10f0ff306f9dd5f49a6c569923641244d37412825f7ffffef4f227aaf0625152d0f3b0bb7ae7894c99ae0af5876598e6db843ac706eb14943ad1dcdca96 SHA512 0139f2eeeaec41152ee24df14692f9605fa37b53012c72167b103d0ed3dce86a454214d92a8c92cb5b03ef2677dc01f1237bacd6a547454c11d9ac947a65ba96 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch b/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch deleted file mode 100644 index bf8c5e14096b..000000000000 --- a/media-gfx/kxstitch/files/kxstitch-2.1.1-imagemagick-fix.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 75a129d3c2f21914a47b970df822e485aca625ac Mon Sep 17 00:00:00 2001 -From: Steve Allewell <steve.allewell@gmail.com> -Date: Sun, 11 Nov 2018 15:48:50 +0000 -Subject: Fix for importing images for V6 of ImageMagick - -The getPixelColor in V6 of ImageMagick does not appear to return the -same information as in V7, consequently importing images has resulted in -a black image when using V6 of ImageMagick. This fix reverts the change -made in commit 295773f44bfda1227d85edf065a8de14dc889159 when using V6. - -Big thanks to Sean Enck for reporting and helping diagnose the problem. ---- - src/ImportImageDlg.cpp | 16 ++++++++++++++++ - src/MainWindow.cpp | 17 +++++++++++++++++ - 2 files changed, 33 insertions(+) - -diff --git a/src/ImportImageDlg.cpp b/src/ImportImageDlg.cpp -index e6396c6..340ff1d 100644 ---- a/src/ImportImageDlg.cpp -+++ b/src/ImportImageDlg.cpp -@@ -391,9 +391,21 @@ void ImportImageDlg::renderPixmap() - QProgressDialog progress(i18n("Rendering preview"), i18n("Cancel"), 0, pixelCount, this); - progress.setWindowModality(Qt::WindowModal); - -+/* -+ * ImageMagick prior to V7 used matte (opacity) to determine if an image has transparency. -+ * 0.0 for transparent to 1.0 for opaque -+ * -+ * ImageMagick V7 now uses alpha (transparency). -+ * 1.0 for transparent to 0.0 for opaque -+ * -+ * Access to pixels has changed too, V7 can use pixelColor to access the color of a particular -+ * pixel, but although this was available in V6, it doesn't appear to produce the same result -+ * and has resulted in black images when importing. -+ */ - #if MagickLibVersion < 0x700 - bool hasTransparency = m_convertedImage.matte(); - double transparent = 1.0; -+ const Magick::PixelPacket *pixels = m_convertedImage.getConstPixels(0, 0, width, height); - #else - bool hasTransparency = m_convertedImage.alpha(); - double transparent = 0.0; -@@ -408,7 +420,11 @@ void ImportImageDlg::renderPixmap() - } - - for (int dx = 0 ; dx < width ; dx++) { -+#if MagickLibVersion < 0x700 -+ Magick::ColorRGB rgb = Magick::Color(*pixels++); -+#else - Magick::ColorRGB rgb = m_convertedImage.pixelColor(dx, dy); -+#endif - - if (hasTransparency && (rgb.alpha() == transparent)) { - //ignore this pixel as it is transparent -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index 1f12f5b..ecf552a 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -541,13 +541,26 @@ void MainWindow::convertImage(const QString &source) - - bool useFractionals = importImageDlg->useFractionals(); - -+/* -+ * ImageMagick prior to V7 used matte (opacity) to determine if an image has transparency. -+ * 0.0 for transparent to 1.0 for opaque -+ * -+ * ImageMagick V7 now uses alpha (transparency). -+ * 1.0 for transparent to 0.0 for opaque -+ * -+ * Access to pixels has changed too, V7 can use pixelColor to access the color of a particular -+ * pixel, but although this was available in V6, it doesn't appear to produce the same result -+ * and has resulted in black images when importing. -+ */ - #if MagickLibVersion < 0x700 - bool hasTransparency = convertedImage.matte(); - double transparent = 1.0; -+ const Magick::PixelPacket *pixels = convertedImage.getConstPixels(0, 0, imageWidth, imageHeight); - #else - bool hasTransparency = convertedImage.alpha(); - double transparent = 0.0; - #endif -+ - bool ignoreColor = importImageDlg->ignoreColor(); - Magick::Color ignoreColorValue = importImageDlg->ignoreColorValue(); - -@@ -579,7 +592,11 @@ void MainWindow::convertImage(const QString &source) - } - - for (int dx = 0 ; dx < imageWidth ; dx++) { -+#if MagickLibVersion < 0x700 -+ Magick::ColorRGB rgb = Magick::Color(*pixels++); // is this a memory leak -+#else - Magick::ColorRGB rgb = convertedImage.pixelColor(dx, dy); -+#endif - - if (hasTransparency && (rgb.alpha() == transparent)) { - // ignore this pixel as it is transparent --- -cgit v1.1 diff --git a/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch b/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch deleted file mode 100644 index 70022fe9c8fa..000000000000 --- a/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9db3fcf9cd367681c0864238dc5009a604f3896c Mon Sep 17 00:00:00 2001 -From: Jonathan Riddell <jr@jriddell.org> -Date: Wed, 27 Jun 2018 16:45:16 +0100 -Subject: fix build with Qt 5.11 - ---- - src/LibraryPatternPropertiesDlg.cpp | 2 ++ - src/TextElementDlg.cpp | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/src/LibraryPatternPropertiesDlg.cpp b/src/LibraryPatternPropertiesDlg.cpp -index 8d2e24c..c10da3f 100644 ---- a/src/LibraryPatternPropertiesDlg.cpp -+++ b/src/LibraryPatternPropertiesDlg.cpp -@@ -11,6 +11,8 @@ - - #include "LibraryPatternPropertiesDlg.h" - -+#include <QIcon> -+ - #include <KConfigGroup> - #include <KHelpClient> - #include <KLocalizedString> -diff --git a/src/TextElementDlg.cpp b/src/TextElementDlg.cpp -index 4d88b1e..fb545d1 100644 ---- a/src/TextElementDlg.cpp -+++ b/src/TextElementDlg.cpp -@@ -16,6 +16,7 @@ - #include "TextElementDlg.h" - - #include <QColorDialog> -+#include <QButtonGroup> - - #include <KHelpClient> - #include <KLocalizedString> --- -cgit v0.11.2 diff --git a/media-gfx/kxstitch/kxstitch-2.1.1-r2.ebuild b/media-gfx/kxstitch/kxstitch-2.1.1-r2.ebuild deleted file mode 100644 index 232c67d1a141..000000000000 --- a/media-gfx/kxstitch/kxstitch-2.1.1-r2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="Program to create cross stitch patterns" -HOMEPAGE="https://userbase.kde.org/KXStitch" -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64" -IUSE="" - -BDEPEND=" - sys-devel/gettext -" -DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - media-gfx/imagemagick[cxx] - x11-libs/libX11 -" -RDEPEND="${DEPEND} - !media-gfx/kxstitch:4 -" - -PATCHES=( - "${FILESDIR}/${P}-qt-5.11.patch" - "${FILESDIR}/${P}-imagemagick-fix.patch" -) diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest index 64126270952b..a1ef1658aba0 100644 --- a/media-gfx/luminance-hdr/Manifest +++ b/media-gfx/luminance-hdr/Manifest @@ -1,8 +1,9 @@ AUX luminance-hdr-2.5.1-docs.patch 908 BLAKE2B de7c675599a74ef7622c037eeec85546d99f2b3341c6df09f7f8880c7515468295b84962163f147bcf093adbce8425de8f8d86517c81b5c57a3b2dd3afe15ef0 SHA512 d675e6ec2b47c604002a1fa54578fd6d363c0f55079f519e0da3e3b06993b4a77024bd0e35101d22b06c2e7d5fa87bde52b1cbe6c9726ad6e6c02ebe1753bee2 +AUX luminance-hdr-2.5.1-exiv2-0.27.1.patch 670 BLAKE2B a836d2d9f408660e1b6b1f7de144e9ea176bc519f331463ded4210ce59b710dcef47a87915053fd9997ac70c907058ff233da8d20e6526a944614300fee7feb3 SHA512 a3fe2d9ce85286c093fe3d9d3cec7744f4884703e3b9da27620ff3099a5f4811b0bd48c405ec7223d06931d320355604a33746b4fbe48630f51784594a35b73d AUX luminance-hdr-2.5.1-exiv2-0.27.patch 878 BLAKE2B f8c1cfc71deabab465f0f427413dbf5dc47aa69833445e564a7e95ec8cc95a137af122f762d8a7af0a8db5ec0e954034a54336a773f9aaf3b0341ac36a10288d SHA512 60fcc806963ce4ffc8b7ebef8ddfc1bfef08a4a45b311ab7b5080327f058c5f0ebc4e680fdd4b7d114b4ee4e31643166bbc2bb0de70bfbd2330e6c04a2e8b2e1 AUX luminance-hdr-2.5.1-fits-automagic.patch 518 BLAKE2B 47af51ffa1b521d8dd949e2b89c6990896e1b82e64c3cb9f93342bd4343b12ed2824d1b05fe378bb52cd9027fd86848d5a558a787545e86423ebf6da2d402e18 SHA512 49b127165c22864b0910a2cf0ebf694e74b0a8343577f06b752f3d4cdf50ae5990f1fa88b83d78565f16ddcddd0f7f87664a34602ebb1d11efafd0ab979e53ce AUX luminance-hdr-2.5.1-no-git.patch 513 BLAKE2B b9a2a460538b709cf76fa3713b26709455bc604e1d30ef355db254b3b6dab7420d81d83e77f6aba7f0f62a8c1b4dfcb3c503004e0235b65ef15d81e461f8a14a SHA512 96e5096a5b1a482f4604e6a6067836268e4988f32907f67ceeee25978d4dd1c1b1e394102145e5241e663595156dddc9c69ab9b22e0e1710e1a0507016b10108 AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea99baa54bdf76e6345b652071a8e37b2a8ab35d98dd006973f266c8d008ccc70330fa8e9f9082261eee9d08756b1d59a4575714c5d6a8 SHA512 6ccfbf8d75bdc27beb10b3632bd07d8679f9ae8bdd78588ff0bbad59b75c43a4ad3b443a42183541cbf5b53d426b4ac19f43f54e296542d3a1b4235ba302acaa DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c -EBUILD luminance-hdr-2.5.1-r1.ebuild 2158 BLAKE2B 4116afcf7417657970b688af6d5443fb47d1aff67fc69147381530afc7391470a5c5e4c742896b315f3810658d9ccb5b9122c8193fcdb9e78bbf09d94e08bfc1 SHA512 93b05a5ae0bc7ce5053a67c4c4a6742b8b7432614a108718ae3914e5339414440a318d5519aaec51230b87b11f53547aa1b1c14905f4912f63feb684356c3105 +EBUILD luminance-hdr-2.5.1-r1.ebuild 2163 BLAKE2B ca1aea6abad91acadef5b7d729ef87d750dd81c48db728bb31a4c62b3daa051b2d745ad0bf019c7096fcc757c43c7801816d1f23b39403c0858e3f23924ce80b SHA512 814852444ee4f41218a20e4b7eb9e29bd61ec9bac8f0cd5cc6ccb4183ad0d265ea8cce05baa649e1fdc3efceb1ce8e9440e641d2e97aaa650f89e9f10944883b MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597 diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch new file mode 100644 index 000000000000..16b5256e935d --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch @@ -0,0 +1,22 @@ +From 8c3f1571bfa7bb702228bb283e37e58c8b322d5b Mon Sep 17 00:00:00 2001 +From: Benitoite <kd6kxr@gmail.com> +Date: Fri, 26 Apr 2019 18:07:52 -0700 +Subject: [PATCH] ExifOperations: include exiv2/exiv2.hpp + +Because type `AnyError` requires definition in the exiv2 namespace. +--- + src/Exif/ExifOperations.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Exif/ExifOperations.cpp b/src/Exif/ExifOperations.cpp +index 07ca742c..dd3d22a6 100644 +--- a/src/Exif/ExifOperations.cpp ++++ b/src/Exif/ExifOperations.cpp +@@ -35,6 +35,7 @@ + #include <boost/assign/list_of.hpp> + + #include <exif.hpp> ++#include <exiv2/exiv2.hpp> + #include <image.hpp> + + #include "Common/config.h"
\ No newline at end of file diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild index e8bae1039b5b..33c04975b7fb 100644 --- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild +++ b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -50,7 +50,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.5.1-docs.patch "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch "${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch - "${FILESDIR}"/${PN}-2.5.1-exiv2-0.27.patch + "${FILESDIR}"/${PN}-2.5.1-exiv2-0.27{,.1}.patch ) pkg_pretend() { diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest index 9b7775fbad2b..14d503b085a4 100644 --- a/media-gfx/lximage-qt/Manifest +++ b/media-gfx/lximage-qt/Manifest @@ -1,5 +1,3 @@ DIST lximage-qt-0.14.1.tar.xz 78960 BLAKE2B c58e5c553e2803cd8d40d807cd1650b72e4de6297f29cdffce19cf3eb402d01735d869ed4e31e9c28ce03e09038628331cc547aebcb636c34dc936b349e33c9a SHA512 61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd -DIST lximage-qt-0.7.0.tar.xz 41560 BLAKE2B 32ca95556a696059254a686727f72e1d57d245134b507dc90f83920e9a4a71b9b41aca459db96cd2adceffb6dd6592399c27279d3c3ca9ded6fd61480525dbd1 SHA512 a31185562dec1aa720287ab3f9fb79b9bccfcf0f2069aa404bd469852edbe2507f8c24cf8af0cbe2ef7013e4dab8ca51c00ac7a348254f1bf20458decd3c82b4 EBUILD lximage-qt-0.14.1-r1.ebuild 873 BLAKE2B 9c51a5bf90065b0b13b2f506f538244e0af20b0c1704daa7a56b395dcc0fe84220a9b646d016941822bbb72ec634f96b6d6a248a990ade99b33ffe4c2e75fbf2 SHA512 bbd759e21943a7ead75e3f7d7a2808140da1de1f7106bb68e757c6b62524e8334708ed0c75061612fe48660590bb4611c0ddd501a943979ced535a15857d0874 -EBUILD lximage-qt-0.7.0.ebuild 962 BLAKE2B ccfd2b0b440910ec1354e14e001823c61ef482d9ce7949cc710a31b0249c34f75678159e566bb6c71695f56af0c37ea638d5597363cb0acb4901670ef2ce9c6c SHA512 6507d2f818a4f6932ef76a380b841e5754137d8e7f65036f9f4ad9742d797276125c8027913ac9a2a41aa5682b9660828dc67e831b221998ff1196d405c6d1c2 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53 diff --git a/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild deleted file mode 100644 index 5f75efa92135..000000000000 --- a/media-gfx/lximage-qt/lximage-qt-0.7.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="LXImage Image Viewer - GPicView replacement" -HOMEPAGE="https://lxqt.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" - -RDEPEND=" - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - media-libs/libexif - >=x11-libs/libfm-1.2:= - >=x11-libs/libfm-qt-0.12.0:= - x11-libs/libX11 - x11-libs/libXfixes -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.5.0 - virtual/pkgconfig -" - -src_configure() { - local mycmakeargs=( - -DPULL_TRANSLATIONS=OFF - ) - cmake-utils_src_configure -} diff --git a/media-gfx/phototonic/Manifest b/media-gfx/phototonic/Manifest index cc963ef9763e..9a56bd6c50c7 100644 --- a/media-gfx/phototonic/Manifest +++ b/media-gfx/phototonic/Manifest @@ -1,3 +1,3 @@ DIST phototonic-2.1.tar.gz 488640 BLAKE2B bfbc14d06760c6f9d9244d5ed38d033a769f1eaf8116f55ea6aa5373578aa105fd28ef8e352d394939306af2ab3b617314aebc443a13f7abe9bb8be2fd0cb0cd SHA512 4789311cefa2d5a07ca5e2fd3c0530267f9ea2ffcbf6295c687db3d2aa55e0b7d91228047b2ca24590868b22ce93d0228785fcf49a105ee65c9826b0d9a8fa42 -EBUILD phototonic-2.1.ebuild 905 BLAKE2B c373ed731c845695e8ba0908509889f916bbeb4940c99080b02fa7854376638979d05035be04ad706559862ee1b82d0245c8470a4ad180de7f58bf7fc2ba563b SHA512 d4a6b425dbd83f89cec6b18da3376f8c56a5888a5e7b936e14bf13fc06a30b5f43890d9a357c02f16609e297ec3758a272ac33e1783f2cc7ba13dd5c3e855bff +EBUILD phototonic-2.1.ebuild 884 BLAKE2B f2513f250c0cced0d7e7204a642b735e1297bbbc4d17ad23e49f633a130ba0a355d4f269f75dac1c2770f4b609c6a8e3c6f5e9ad2e1ac0bfb7dde155b3acd33d SHA512 868766a331083427768894806cf0c9348709f5be0aa08aa479babe67a8c622e46613e2adbf3352f7dfecbb113247574f69cee650b955950aaa2b1ad54f9a6a04 MISC metadata.xml 339 BLAKE2B 047cc0980ff832366db731e064eb31e5569fdc799057841b91bcea87139a4f9cd471055843b38b4994e3850caf8cb2adc59f620f75d1c5b427861d63c3339fec SHA512 7793436a2c6de004c369473dada585f2ade8105984db831f889da06ec98d6e20213e6256fc0b0817531dc5f7729f4737e08e2d5f4dad5b8922f7ef99b46f16f9 diff --git a/media-gfx/phototonic/phototonic-2.1.ebuild b/media-gfx/phototonic/phototonic-2.1.ebuild index 46087619b847..bb861a81715c 100644 --- a/media-gfx/phototonic/phototonic-2.1.ebuild +++ b/media-gfx/phototonic/phototonic-2.1.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit gnome2-utils qmake-utils xdg-utils +inherit qmake-utils xdg-utils DESCRIPTION="Image viewer and organizer" HOMEPAGE="https://github.com/oferkv/phototonic" + if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/oferkv/phototonic.git" @@ -20,9 +21,9 @@ SLOT="0" IUSE="svg tiff" RDEPEND=" - dev-qt/qtwidgets:5 - dev-qt/qtgui:5 dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 media-gfx/exiv2:= svg? ( dev-qt/qtsvg:5 ) tiff? ( dev-qt/qtimageformats:5 ) @@ -38,11 +39,11 @@ src_install() { } pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update xdg_desktop_database_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update xdg_desktop_database_update } |