diff options
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/Manifest | 5 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-7.0.0_rc.ebuild (renamed from media-gfx/digikam/digikam-7.0.0_beta3.ebuild) | 13 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch | 51 |
3 files changed, 6 insertions, 63 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 650ea0f6934e..bdc918a075af 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,7 +1,6 @@ AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d -AUX digikam-7.0.0_beta3-qt-5.15.patch 1796 BLAKE2B 14ae2f4b83063ec5be0a14ea7969266d36c8229a7ad5e6070976d34557165c4b3672cbcf340c256b8025ea57de91540835413736f233aab76a022fad8a8198a1 SHA512 eed37b8596b23cb22ca4d994f30258b2056ef074db38e1b740c01c726faee5021367b56bf50c768b727c56be8b4a23b7731d20a807b437d1d6e6dae8eafb75c2 DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 -DIST digikam-7.0.0-beta3.tar.xz 571307796 BLAKE2B fb0d82557c3a747f8a4b0a188f9ae7a0f06590ed59eed1418647b73a21c59334473dc0c33018db7f27572e574ac56a202a36a47a26c4b5b589a7f54c1987d2a5 SHA512 da25e1a2ab7c426f9f437c4ed81c334f435fcabf6d388f083bc5192cca9df8114961451adbe8d4e86df319a0a7ae125fb527ce406fce349632b59912777a1f69 +DIST digikam-7.0.0-rc.tar.xz 566061948 BLAKE2B 0f167387c7110223764f203c829079eb677de0251f440b65d7dbc9c6b6e49a77d7e7bdd44d3f578338b7a06a3a7f694402b7a406537075c4cc32a3abb59cf159 SHA512 fbfb3b91038fa76b3f699304318f91e429f6ac51424f9895d48cf30b5319029a8e2b3791adba56b444329916d51fae5a8adc8f6aedbeae36fd165e781742119e EBUILD digikam-6.4.0-r1.ebuild 4310 BLAKE2B 9c69ad526cedaac830105b620f2ee096504ca4e78c4ee4a6db60ac1398602be51bf1fe38a5b5dc338af2ae87ea041c93f3d1861352303c709121673034962133 SHA512 02d6beb8875c218acfe8f42d7c08715b53282b6d9a57949c8eb70176be6680a5b752719087f26b4cfa6bcae47e055c37db62d55cbec80ee6ddb4539ef2423b98 -EBUILD digikam-7.0.0_beta3.ebuild 4251 BLAKE2B 35af6caa153eef7396deb5124b98501c9aaeb0bab75b78471aeb84e55dd28420aa75ae87d0889b3939d5d5d251c50d3be624d462cf02cf24208a65f02ad70919 SHA512 6cf34189e4fa90ed110fd7e13739c2febccf222e59a5574b679d05705cd11794f14f63d23314bc0904d5bc1ed0266dc9701150f0a24301b7863ad3c1b0acc9ff +EBUILD digikam-7.0.0_rc.ebuild 4084 BLAKE2B fab6cca649fa9ff160e754ec45a5c70a45139c92fc79d8b740c2e24250931a43d6a304c506445db8c4ae1cac3958dce5634ba2cca43719373a0f62617b6b5523 SHA512 3bb5113b79604ae17fdfeee9fffa730dbbb06e884033c9ecb7ab9d23bcc1e30f70d5cabf9d8535503170d953be6abefe21c59f9409aa33dd3946eccd656ba600 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8 diff --git a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild b/media-gfx/digikam/digikam-7.0.0_rc.ebuild index 3659f26f6ff2..742181ff7bbb 100644 --- a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild +++ b/media-gfx/digikam/digikam-7.0.0_rc.ebuild @@ -8,12 +8,11 @@ QTMIN=5.12.3 inherit ecm kde.org toolchain-funcs if [[ ${KDE_BUILD_TYPE} != live ]]; then - MY_PV=${PV/_/-} - MY_P=${PN}-${MY_PV} - if [[ ${PV} =~ beta[0-9]$ ]]; then + MY_P=${PN}-${PV/_/-} + if [[ ${PV} =~ rc[0-9]*$ ]]; then SRC_URI="mirror://kde/unstable/${PN}/" else - SRC_URI="mirror://kde/unstable/${PN}/${PV}/" + SRC_URI="mirror://kde/stable/${PN}/${PV}/" fi SRC_URI+="${MY_P}.tar.xz" KEYWORDS="~amd64 ~x86" @@ -25,7 +24,7 @@ HOMEPAGE="https://www.digikam.org/" LICENSE="GPL-2" SLOT="5" -IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" +IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop webkit X" BDEPEND=" >=dev-util/cmake-3.14.3 @@ -91,7 +90,6 @@ COMMON_DEPEND=" panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) - vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( @@ -108,8 +106,6 @@ RDEPEND="${COMMON_DEPEND} panorama? ( media-gfx/hugin ) " -PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch ) - RESTRICT+=" test" # bug 366505 @@ -144,7 +140,6 @@ src_configure() { $(cmake_use_find_package panorama KF5ThreadWeaver) $(cmake_use_find_package scanner KF5Sane) $(cmake_use_find_package semantic-desktop KF5FileMetaData) - $(cmake_use_find_package vkontakte KF5Vkontakte) -DENABLE_QWEBENGINE=$(usex !webkit) $(cmake_use_find_package X X11) ) diff --git a/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch b/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch deleted file mode 100644 index fe865eb73af3..000000000000 --- a/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 10fd663f43148fc96ed3afeecf70de15cadd0f8a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 19 Apr 2020 09:55:03 +0200 -Subject: [PATCH] Fix build with Qt 5.15.0 - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - .../dplugins/generic/view/presentation/opengl/presentationgl.cpp | 1 + - core/libs/dimg/filters/curves/curveswidget.cpp | 1 + - core/libs/dimg/filters/levels/histogrampainter.cpp | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp -index b37699436e..6a4f173ab0 100644 ---- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp -+++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp -@@ -44,6 +44,7 @@ - #include <QMatrix> - #include <QMouseEvent> - #include <QPainter> -+#include <QPainterPath> - #include <QPixmap> - #include <QTimer> - #include <QWheelEvent> -diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp -index cccccbd156..d0beef9bf2 100644 ---- a/core/libs/dimg/filters/curves/curveswidget.cpp -+++ b/core/libs/dimg/filters/curves/curveswidget.cpp -@@ -40,6 +40,7 @@ - #include <QColor> - #include <QFont> - #include <QFontMetrics> -+#include <QPainterPath> - #include <QPaintEvent> - #include <QMouseEvent> - -diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp -index 241d5fc4c8..f11ad4b560 100644 ---- a/core/libs/dimg/filters/levels/histogrampainter.cpp -+++ b/core/libs/dimg/filters/levels/histogrampainter.cpp -@@ -30,6 +30,7 @@ - // Qt includes - - #include <QPainter> -+#include <QPainterPath> - - // KDE includes - --- -2.26.1 - |