diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-08 01:07:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-08 01:07:24 +0100 |
commit | e3cf2c86fca1750343c1885311f857f185ee4f2d (patch) | |
tree | d9d1fbc20509d4c90f57fb2d9e1459bc8034c831 /media-gfx/digikam | |
parent | f1af93971b7490792d8541bc790e0d8c6d787059 (diff) |
gentoo resync : 08.09.2019
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r-- | media-gfx/digikam/Manifest | 6 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-6.2.0.ebuild | 2 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-6.3.0.ebuild | 150 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-6.3.0-cmake.patch | 66 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch | 85 |
5 files changed, 307 insertions, 2 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 9bc47295120b..c5b96ee029e2 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -2,8 +2,12 @@ AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff238 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 +AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d +AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b165e0915610e54af188479af3bef140717d5d903e557bb0da49fa493e06df9a76b9695df7ebe84cbf6132674209f45476da0a1d4752ceb7 SHA512 523dc9add1ee5b9ffb675c1983e8f54624b7537dbec567a60661fdd58b045978f2a794a47093f5a3d268e4aa159a8064cd6b261798bf19cfeb5241fd5ce4cdb8 DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56 +DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce EBUILD digikam-6.0.0.ebuild 3904 BLAKE2B d3184396f4e28bd1eb765074fcac1a5b29eac28444375502b09cbc6b74d36a24f62febe9a28e360ce25783223fe4c533d156b41f19a2a4e468cc63894be38b5d SHA512 7524e08ea4e8daa15786e3d5bf4f2fa085d88bf5687b9f1cb6809c3fb9b732f0532e1240a43d14da473d6221706fb19bc679f254b9d78b118561d3376792cf60 -EBUILD digikam-6.2.0.ebuild 4168 BLAKE2B 2dc5aca210c12e1db89de79b8acf11826b03daf345b567242a19f6168c01c9cf9583cffc2f3d58401f8b9bba44c03f91187b5ec33aa378ce9b2b8db773cfe245 SHA512 d3cc7c962538921676518de8d18e57aecf9e6d766be53b75b4d2c34bf18eb519c633e07dab7271308622a8654e2464e9d617af7a48cd1261fe762679a2c1ba61 +EBUILD digikam-6.2.0.ebuild 4167 BLAKE2B 42ea9b4b5a8e407b6c6b60cb1af2e9de1a4ad7db15ec7e34df559c88734a7e70756db554250cbfcb8a6c193b5afc44b48e9b56fed2694573d61c31d6851b7f02 SHA512 8275593169c750e21d779946f7b2d11bda4c5f767d4d83a7d2b643e1df8f12a6eff971f4e6a1d719137d7d58009851121936b8d77ae913a6323084edf7e1ea79 +EBUILD digikam-6.3.0.ebuild 4127 BLAKE2B dd3aadddedca2bb93412994ff869c486b9653eedeea4faffc4dc970886b80448a0d487cc36173ea93a93e617aebfec39f012910a18885ef1f468093dfbb165e8 SHA512 58c0c44f993dd4ed6088ca6697c9f2a00ea7c33b75f6c80877308cc17d0a292305b9c423d7eae7e4896571097d3025602714c4e8379732f66949f9fb0264d2fe MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild index d28773546dc8..04257cd79584 100644 --- a/media-gfx/digikam/digikam-6.2.0.ebuild +++ b/media-gfx/digikam/digikam-6.2.0.ebuild @@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_BRANCH=stable [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 x86" S="${WORKDIR}/${MY_P}" fi diff --git a/media-gfx/digikam/digikam-6.3.0.ebuild b/media-gfx/digikam/digikam-6.3.0.ebuild new file mode 100644 index 000000000000..3324004430ee --- /dev/null +++ b/media-gfx/digikam/digikam-6.3.0.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MIN_VERSION=3.14.3 +inherit kde5 toolchain-funcs + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + MY_PV=${PV/_/-} + MY_P=${PN}-${MY_PV} + SRC_BRANCH=stable + [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable + SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Digital photo management application" +HOMEPAGE="https://www.digikam.org/" + +LICENSE="GPL-2" +IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" + +BDEPEND=" + sys-devel/gettext + panorama? ( + sys-devel/bison + sys-devel/flex + ) +" +COMMON_DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui '-gles2') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsql 'mysql?') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + $(add_qt_dep qtxmlpatterns) + dev-libs/expat + >=media-gfx/exiv2-0.26:= + media-libs/lcms:2 + media-libs/liblqr + media-libs/libpng:0= + >=media-libs/opencv-3.1.0:= + media-libs/tiff:0 + virtual/jpeg:0 + addressbook? ( + $(add_kdeapps_dep akonadi-contacts) + $(add_kdeapps_dep kcontacts) + ) + calendar? ( $(add_kdeapps_dep kcalcore) ) + dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] ) + gphoto2? ( media-libs/libgphoto2:= ) + imagemagick? ( media-gfx/imagemagick:= ) + lensfun? ( media-libs/lensfun ) + marble? ( + $(add_frameworks_dep kbookmarks) + $(add_kdeapps_dep marble) + $(add_qt_dep qtconcurrent) + ) + mediaplayer? ( + media-libs/qtav[opengl] + !libav? ( media-video/ffmpeg:= ) + libav? ( media-video/libav:= ) + ) + opengl? ( + $(add_qt_dep qtopengl) + virtual/opengl + ) + panorama? ( $(add_frameworks_dep threadweaver) ) + scanner? ( $(add_kdeapps_dep libksane) ) + semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) + vkontakte? ( net-libs/libkvkontakte:5 ) + !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) + webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + dev-libs/boost[threads] +" +RDEPEND="${COMMON_DEPEND} + mysql? ( virtual/mysql[server] ) + panorama? ( media-gfx/hugin ) +" + +RESTRICT+=" test" +# bug 366505 + +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-googlephoto-import-crash.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + kde5_pkg_pretend +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + kde5_pkg_setup +} + +# FIXME: Unbundle libraw (libs/rawengine/libraw) +src_configure() { + local mycmakeargs=( + -DENABLE_APPSTYLES=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) + $(cmake-utils_use_find_package calendar KF5CalendarCore) + -DENABLE_FACESENGINE_DNN=$(usex dnn) + $(cmake-utils_use_find_package gphoto2 Gphoto2) + $(cmake-utils_use_find_package imagemagick ImageMagick) + $(cmake-utils_use_find_package lensfun LensFun) + $(cmake-utils_use_find_package marble Marble) + -DENABLE_MEDIAPLAYER=$(usex mediaplayer) + $(cmake-utils_use_find_package mediaplayer QtAV) + -DENABLE_MYSQLSUPPORT=$(usex mysql) + -DENABLE_INTERNALMYSQL=$(usex mysql) + $(cmake-utils_use_find_package opengl OpenGL) + $(cmake-utils_use_find_package panorama KF5ThreadWeaver) + $(cmake-utils_use_find_package scanner KF5Sane) + $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) + $(cmake-utils_use_find_package vkontakte KF5Vkontakte) + -DENABLE_QWEBENGINE=$(usex !webkit) + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} diff --git a/media-gfx/digikam/files/digikam-6.3.0-cmake.patch b/media-gfx/digikam/files/digikam-6.3.0-cmake.patch new file mode 100644 index 000000000000..f14f406d88d5 --- /dev/null +++ b/media-gfx/digikam/files/digikam-6.3.0-cmake.patch @@ -0,0 +1,66 @@ +From beb8eb984aac519ed5dfd13615f430ec14e73f16 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 17 Feb 2019 23:51:03 +0100 +Subject: [PATCH] Un-break optional Qt5 detection + +--- + core/CMakeLists.txt | 26 ++++++++++---------------- + 1 file changed, 10 insertions(+), 16 deletions(-) + +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 633760d194..736826d234 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED + ) + + if(ENABLE_QWEBENGINE) +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets) ++ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE) + else() +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets) ++ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE) + endif() + +-find_package(Qt5 ${QT_MIN_VERSION} +- OPTIONAL_COMPONENTS +- DBus +- OpenGL +-) ++find_package(Qt5DBus ${QT_MIN_VERSION}) ++ ++find_package(Qt5OpenGL ${QT_MIN_VERSION}) + + if(ENABLE_DBUS) + if(NOT Qt5DBus_FOUND) +@@ -156,14 +154,10 @@ endif() + # Dependencies For unit tests and CLI test tools + + if(BUILD_TESTING) +- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED +- NO_MODULE COMPONENTS +- Test +- ) +- find_package(Qt5 ${QT_MIN_VERSION} +- OPTIONAL_COMPONENTS +- Qml WebView # Optional, for 'sialis' O2 library test tool. +- ) ++ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE) ++ # Optional, for 'sialis' O2 library test tool. ++ find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE) ++ find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE) + endif() + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED +@@ -335,7 +329,7 @@ endif() + find_package(X11) + + if(X11_FOUND) +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras) ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE) + set(HAVE_X11 TRUE) + else() + set(HAVE_X11 FALSE) +-- +2.23.0 + diff --git a/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch b/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch new file mode 100644 index 000000000000..7a8a7e533a13 --- /dev/null +++ b/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch @@ -0,0 +1,85 @@ +From ea22af510d62c85224ed430611db8818f97ecc69 Mon Sep 17 00:00:00 2001 +From: Maik Qualmann <metzpinguin@gmail.com> +Date: Wed, 4 Sep 2019 20:59:20 +0200 +Subject: fix crash when close/reopen Google import window BUGS: 411587 + FIXED-IN: 6.3.0 + +--- + .../generic/webservices/google/gphoto/gptalker.cpp | 3 ++- + core/dplugins/generic/webservices/google/gswindow.cpp | 18 ++++++++++++++---- + 3 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp b/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp +index 1cddfbd..b5e68ef 100644 +--- a/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp ++++ b/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp +@@ -160,6 +160,7 @@ GPTalker::~GPTalker() + if (m_reply) + { + m_reply->abort(); ++ m_reply = nullptr; + } + + WSToolUtils::removeTemporaryDir("google"); +@@ -637,7 +638,7 @@ void GPTalker::slotFinished(QNetworkReply* reply) + { + emit signalAddPhotoDone(reply->error(), reply->errorString()); + } +- else ++ else if (reply->error() != QNetworkReply::OperationCanceledError) + { + QMessageBox::critical(QApplication::activeWindow(), + i18n("Error"), reply->errorString()); +diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp +index 424aee2..d5af448 100644 +--- a/core/dplugins/generic/webservices/google/gswindow.cpp ++++ b/core/dplugins/generic/webservices/google/gswindow.cpp +@@ -266,11 +266,10 @@ GSWindow::GSWindow(DInfoInterface* const iface, + + GSWindow::~GSWindow() + { +- delete d->widget; +- delete d->albumDlg; +- delete d->gphotoAlbumDlg; +- delete d->talker; ++ d->transferQueue.clear(); ++ + delete d->gphotoTalker; ++ delete d->talker; + delete d; + } + +@@ -851,6 +850,11 @@ void GSWindow::downloadNextPhoto() + void GSWindow::slotGetPhotoDone(int errCode, const QString& errMsg, + const QByteArray& photoData, const QString& fileName) + { ++ if (d->transferQueue.isEmpty()) ++ { ++ return; ++ } ++ + GSPhoto item = d->transferQueue.first().second; + + /** +@@ -982,6 +986,11 @@ void GSWindow::slotGetPhotoDone(int errCode, const QString& errMsg, + + void GSWindow::slotAddPhotoDone(int err, const QString& msg) + { ++ if (d->transferQueue.isEmpty()) ++ { ++ return; ++ } ++ + if (err == 0) + { + d->widget->imagesList()->processed(d->transferQueue.first().first,false); +@@ -1245,6 +1254,7 @@ void GSWindow::buttonStateChange(bool state) + void GSWindow::slotFinished() + { + writeSettings(); ++ d->transferQueue.clear(); + d->widget->imagesList()->listView()->clear(); + } + +-- +cgit v1.1 |