diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
| commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
| tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /media-gfx/digikam | |
| parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) | |
gentoo resync : 06.08.2019
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/Manifest | 5 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-6.0.0.ebuild | 5 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-6.2.0.ebuild | 1 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch | 14 |
4 files changed, 20 insertions, 5 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 8cd14dfa580e..9bc47295120b 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,8 +1,9 @@ AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff2381846d6262005922b97df1b54d9dd7572fb95eee01a3cf413dda9eed28e0201123bfedddc7beda6dc4ddc99e5d55 SHA512 8efe171f763692efd7c8449e1365e2d531a4d1b6da79fe1f5048dbe1b328f70b6e923298015f2a162751843eb88db2dd1af744a2b2cd3219e0f44aea4d3a569a AUX digikam-6.2.0-cmake.patch 2011 BLAKE2B da9e459cd8c7f89d986166cf19dde36d599565f573831057c0d68706c05f4b49240215e159d36e377f16b178c7de04e713bdfb3214bd83e114cbbd5b40f4f37a SHA512 44a63a08da538bee35efc965789b463455646c3ee9ed8fbe6f22591155c20b623e48838af52f8b521a35b3548fe44909516a15a4d815347e61de71d07bbfad17 AUX digikam-6.2.0-googlephoto-upload.patch 1072 BLAKE2B 5384a259b2fdd15cf195fed8f5aa1a16a0af3932af1e2226b3bfd2be95d19f6fee003fd9d3344c0921ff5655d22ea4f30f98e8ed7c1e5dee1d4b91d4d031562e SHA512 c71ab51371e45538f33ba9603eabdc8e3e518f7e38aa274407d90f216a14f6071066f388291d072fca46eb6589e3cafe0eb5b78f3bb3520ca9aa85add092d265 +AUX digikam-6.2.0-imagemagick-7.0.8.60.patch 641 BLAKE2B c2a7261a92cb757aa39f2ccb5a561b8cb34563540e1c0e84662a056dad66e17c941a77ee9d42b168e83d18f72786e9bf49e741f73bf20c714496fad80ad22987 SHA512 d1ecf5a25a3cdf542ababa6d4306bf6bce25b5f04e8f880460a8a67f4f4eac283f139b82848a085a28dc16b0a8a9310a3ed294d110105b0562239ef21ce6e442 DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56 -EBUILD digikam-6.0.0.ebuild 3951 BLAKE2B b7bcf74012b240e5864298c82e18e5f1d3a52f0df16c90896b9d2ba295e396f757f10e3c4a14dd8359086acfde797013d68bcfae57f4105de933d16790d0fd24 SHA512 50c11d1925a65f4d9c307bc1a32fb615176b7c14dd4ec3b30b4080b30f93845b732f725cae2a6fc188ea43982396a44acaf6e4fc64c1f47b95a4070f39ef8913 -EBUILD digikam-6.2.0.ebuild 4121 BLAKE2B 36f16c7a7168d1bedf989377b4886c94d7660d7f86f79287d688cb29db19c3cb8751beca6d68b4b47006c78b7aaf4623ee32d8a2e16138856de95e5fdbbc188c SHA512 f052bedfdbe74291228db64118db730314ac371dc06efe85485826638c385cf44e438aba9a91532b1f6b132957844ca707378dd4170cf83add81385ea74f8cd6 +EBUILD digikam-6.0.0.ebuild 3904 BLAKE2B d3184396f4e28bd1eb765074fcac1a5b29eac28444375502b09cbc6b74d36a24f62febe9a28e360ce25783223fe4c533d156b41f19a2a4e468cc63894be38b5d SHA512 7524e08ea4e8daa15786e3d5bf4f2fa085d88bf5687b9f1cb6809c3fb9b732f0532e1240a43d14da473d6221706fb19bc679f254b9d78b118561d3376792cf60 +EBUILD digikam-6.2.0.ebuild 4168 BLAKE2B 2dc5aca210c12e1db89de79b8acf11826b03daf345b567242a19f6168c01c9cf9583cffc2f3d58401f8b9bba44c03f91187b5ec33aa378ce9b2b8db773cfe245 SHA512 d3cc7c962538921676518de8d18e57aecf9e6d766be53b75b4d2c34bf18eb519c633e07dab7271308622a8654e2464e9d617af7a48cd1261fe762679a2c1ba61 MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild b/media-gfx/digikam/digikam-6.0.0.ebuild index f44c5dbd4ce8..2e6852810eb2 100644 --- a/media-gfx/digikam/digikam-6.0.0.ebuild +++ b/media-gfx/digikam/digikam-6.0.0.ebuild @@ -20,7 +20,7 @@ DESCRIPTION="Digital photo management application" HOMEPAGE="https://www.digikam.org/" LICENSE="GPL-2" -IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" +IUSE="addressbook calendar gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" BDEPEND=" sys-devel/gettext @@ -66,7 +66,6 @@ COMMON_DEPEND=" ) calendar? ( $(add_kdeapps_dep kcalcore) ) gphoto2? ( media-libs/libgphoto2:= ) - jpeg2k? ( media-libs/jasper:= ) lensfun? ( media-libs/lensfun ) marble? ( $(add_frameworks_dep kbookmarks) @@ -124,7 +123,7 @@ src_configure() { -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) $(cmake-utils_use_find_package calendar KF5CalendarCore) $(cmake-utils_use_find_package gphoto2 Gphoto2) - $(cmake-utils_use_find_package jpeg2k Jasper) + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON $(cmake-utils_use_find_package lensfun LensFun) $(cmake-utils_use_find_package marble Marble) -DENABLE_MEDIAPLAYER=$(usex mediaplayer) diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild index 4478b85ae239..d28773546dc8 100644 --- a/media-gfx/digikam/digikam-6.2.0.ebuild +++ b/media-gfx/digikam/digikam-6.2.0.ebuild @@ -109,6 +109,7 @@ RESTRICT+=" test" PATCHES=( "${FILESDIR}/${P}-googlephoto-upload.patch" "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-imagemagick-7.0.8.60.patch" ) pkg_pretend() { diff --git a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch new file mode 100644 index 000000000000..264da2c34f29 --- /dev/null +++ b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch @@ -0,0 +1,14 @@ +--- a/core/tests/dimg/magickloader.cpp ++++ a/core/tests/dimg/magickloader.cpp +@@ -139,7 +139,11 @@ int main(int argc, char** argv) + if (inf->encoder) mode.append(QLatin1Char('W')); + else mode.append(QLatin1Char('-')); + ++#if( (MagickLibVersion >= 0x708) && defined(magick_module) ) /* defined since 7.0.8.60 */ ++ QString module = QLatin1String(inf->magick_module); ++#else + QString module = QLatin1String(inf->module); ++#endif + QString mime = QMimeDatabase().mimeTypeForFile(QFileInfo(QString::fromLatin1("foo.%1").arg(module))).name(); + + if (module != QLatin1String("DNG") &&
\ No newline at end of file |