| 1 |
commit: 7bf7cf6f0c21532ad1a934dfdeab9b61bd5c1338 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 19 07:56:06 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 19 08:29:34 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf7cf6f |
| 7 |
|
| 8 |
media-gfx/digikam: Drop 7.3.0-r1 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
media-gfx/digikam/Manifest | 1 - |
| 14 |
media-gfx/digikam/digikam-7.3.0-r1.ebuild | 152 --------------------- |
| 15 |
.../files/digikam-7.3.0-akonadi-21.12.0.patch | 31 ----- |
| 16 |
3 files changed, 184 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest |
| 19 |
index f6db00554838..c4ae0fa1606a 100644 |
| 20 |
--- a/media-gfx/digikam/Manifest |
| 21 |
+++ b/media-gfx/digikam/Manifest |
| 22 |
@@ -1,3 +1,2 @@ |
| 23 |
DIST digiKam-7.4.0.tar.xz 339575096 BLAKE2B b7a556cd8d86bbc60530d697d8ffe42c497cd8ff5dd408f7a2afd1106c96804908e15b6faf1d8090f12aaea62e99d90751ea36c6e36a7bbec62b5f194452d0f1 SHA512 aea494c4636255e25db1cee7968cdec49530064f737897940b9e2184d214b77024f31226fa76e099362966e687e5ed05bc8486ae0645c2c18d9bbcc452dd1b6e |
| 24 |
DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B 26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6 SHA512 a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9 |
| 25 |
-DIST digikam-7.3.0.tar.xz 256985340 BLAKE2B 9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed SHA512 71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad |
| 26 |
|
| 27 |
diff --git a/media-gfx/digikam/digikam-7.3.0-r1.ebuild b/media-gfx/digikam/digikam-7.3.0-r1.ebuild |
| 28 |
deleted file mode 100644 |
| 29 |
index 46f064167d80..000000000000 |
| 30 |
--- a/media-gfx/digikam/digikam-7.3.0-r1.ebuild |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,152 +0,0 @@ |
| 33 |
-# Copyright 1999-2021 Gentoo Authors |
| 34 |
-# Distributed under the terms of the GNU General Public License v2 |
| 35 |
- |
| 36 |
-EAPI=7 |
| 37 |
- |
| 38 |
-KFMIN=5.74.0 |
| 39 |
-QTMIN=5.15.2 |
| 40 |
-inherit ecm kde.org toolchain-funcs |
| 41 |
- |
| 42 |
-if [[ ${KDE_BUILD_TYPE} != live ]]; then |
| 43 |
- MY_P=${PN}-${PV/_/-} |
| 44 |
- if [[ ${PV} =~ rc[0-9]*$ ]]; then |
| 45 |
- SRC_URI="mirror://kde/unstable/${PN}/" |
| 46 |
- else |
| 47 |
- SRC_URI="mirror://kde/stable/${PN}/${PV}/" |
| 48 |
- fi |
| 49 |
- SRC_URI+="${MY_P}.tar.xz" |
| 50 |
- KEYWORDS="amd64 x86" |
| 51 |
- S="${WORKDIR}/${MY_P}" |
| 52 |
-fi |
| 53 |
- |
| 54 |
-DESCRIPTION="Digital photo management application" |
| 55 |
-HOMEPAGE="https://www.digikam.org/" |
| 56 |
- |
| 57 |
-LICENSE="GPL-2" |
| 58 |
-SLOT="5" |
| 59 |
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" |
| 60 |
- |
| 61 |
-# bug 366505 |
| 62 |
-RESTRICT+=" test" |
| 63 |
- |
| 64 |
-BDEPEND=" |
| 65 |
- >=dev-util/cmake-3.14.3 |
| 66 |
- sys-devel/gettext |
| 67 |
- panorama? ( |
| 68 |
- sys-devel/bison |
| 69 |
- sys-devel/flex |
| 70 |
- ) |
| 71 |
-" |
| 72 |
-COMMON_DEPEND=" |
| 73 |
- dev-libs/expat |
| 74 |
- >=dev-qt/qtconcurrent-${QTMIN}:5 |
| 75 |
- >=dev-qt/qtdbus-${QTMIN}:5 |
| 76 |
- >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] |
| 77 |
- >=dev-qt/qtnetwork-${QTMIN}:5 |
| 78 |
- >=dev-qt/qtprintsupport-${QTMIN}:5 |
| 79 |
- >=dev-qt/qtsql-${QTMIN}:5[mysql?] |
| 80 |
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets] |
| 81 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
| 82 |
- >=dev-qt/qtxml-${QTMIN}:5 |
| 83 |
- >=dev-qt/qtxmlpatterns-${QTMIN}:5 |
| 84 |
- >=kde-frameworks/kconfig-${KFMIN}:5 |
| 85 |
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
| 86 |
- >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
| 87 |
- >=kde-frameworks/ki18n-${KFMIN}:5 |
| 88 |
- >=kde-frameworks/kiconthemes-${KFMIN}:5 |
| 89 |
- >=kde-frameworks/kio-${KFMIN}:5 |
| 90 |
- >=kde-frameworks/knotifications-${KFMIN}:5 |
| 91 |
- >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
| 92 |
- >=kde-frameworks/kservice-${KFMIN}:5 |
| 93 |
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 94 |
- >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
| 95 |
- >=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 96 |
- >=kde-frameworks/solid-${KFMIN}:5 |
| 97 |
- >=media-gfx/exiv2-0.27:=[xmp] |
| 98 |
- media-libs/lcms:2 |
| 99 |
- media-libs/liblqr |
| 100 |
- media-libs/libpng:0= |
| 101 |
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn] |
| 102 |
- media-libs/tiff:0 |
| 103 |
- virtual/jpeg:0 |
| 104 |
- addressbook? ( |
| 105 |
- >=kde-apps/akonadi-contacts-19.04.3:5 |
| 106 |
- >=kde-frameworks/kcontacts-${KFMIN}:5 |
| 107 |
- ) |
| 108 |
- calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) |
| 109 |
- gphoto2? ( media-libs/libgphoto2:= ) |
| 110 |
- heif? ( media-libs/x265:= ) |
| 111 |
- imagemagick? ( media-gfx/imagemagick:= ) |
| 112 |
- lensfun? ( media-libs/lensfun ) |
| 113 |
- marble? ( |
| 114 |
- >=dev-qt/qtconcurrent-${QTMIN}:5 |
| 115 |
- >=kde-apps/marble-19.04.3:5 |
| 116 |
- >=kde-frameworks/kbookmarks-${KFMIN}:5 |
| 117 |
- ) |
| 118 |
- mediaplayer? ( |
| 119 |
- media-libs/qtav[opengl(+)] |
| 120 |
- media-video/ffmpeg:= |
| 121 |
- ) |
| 122 |
- opengl? ( |
| 123 |
- >=dev-qt/qtopengl-${QTMIN}:5 |
| 124 |
- virtual/opengl |
| 125 |
- ) |
| 126 |
- panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) |
| 127 |
- scanner? ( >=kde-apps/libksane-19.04.3:5 ) |
| 128 |
- semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) |
| 129 |
- X? ( |
| 130 |
- >=dev-qt/qtx11extras-${QTMIN}:5 |
| 131 |
- x11-libs/libX11 |
| 132 |
- ) |
| 133 |
-" |
| 134 |
-DEPEND="${COMMON_DEPEND} |
| 135 |
- dev-cpp/eigen:3 |
| 136 |
- dev-libs/boost[threads(+)] |
| 137 |
-" |
| 138 |
-RDEPEND="${COMMON_DEPEND} |
| 139 |
- mysql? ( virtual/mysql[server(+)] ) |
| 140 |
- panorama? ( media-gfx/hugin ) |
| 141 |
-" |
| 142 |
- |
| 143 |
-PATCHES=( |
| 144 |
- "${FILESDIR}/${P}-cmake.patch" |
| 145 |
- "${FILESDIR}/${P}-akonadi-21.12.0.patch" |
| 146 |
-) |
| 147 |
- |
| 148 |
-pkg_pretend() { |
| 149 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 150 |
- ecm_pkg_pretend |
| 151 |
-} |
| 152 |
- |
| 153 |
-pkg_setup() { |
| 154 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 155 |
- ecm_pkg_setup |
| 156 |
-} |
| 157 |
- |
| 158 |
-# FIXME: Unbundle libraw (libs/rawengine/libraw) |
| 159 |
-src_configure() { |
| 160 |
- local mycmakeargs=( |
| 161 |
- -DBUILD_TESTING=OFF # bug 698192 |
| 162 |
- -DENABLE_APPSTYLES=ON |
| 163 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON |
| 164 |
- -DENABLE_QWEBENGINE=ON |
| 165 |
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) |
| 166 |
- -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) |
| 167 |
- $(cmake_use_find_package calendar KF5CalendarCore) |
| 168 |
- $(cmake_use_find_package gphoto2 Gphoto2) |
| 169 |
- $(cmake_use_find_package heif X265) |
| 170 |
- $(cmake_use_find_package imagemagick ImageMagick) |
| 171 |
- $(cmake_use_find_package lensfun LensFun) |
| 172 |
- $(cmake_use_find_package marble Marble) |
| 173 |
- -DENABLE_MEDIAPLAYER=$(usex mediaplayer) |
| 174 |
- $(cmake_use_find_package mediaplayer QtAV) |
| 175 |
- -DENABLE_MYSQLSUPPORT=$(usex mysql) |
| 176 |
- -DENABLE_INTERNALMYSQL=$(usex mysql) |
| 177 |
- $(cmake_use_find_package opengl OpenGL) |
| 178 |
- $(cmake_use_find_package panorama KF5ThreadWeaver) |
| 179 |
- $(cmake_use_find_package scanner KF5Sane) |
| 180 |
- $(cmake_use_find_package X X11) |
| 181 |
- ) |
| 182 |
- |
| 183 |
- ecm_src_configure |
| 184 |
-} |
| 185 |
|
| 186 |
diff --git a/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch b/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch |
| 187 |
deleted file mode 100644 |
| 188 |
index 6e4dd25a4028..000000000000 |
| 189 |
--- a/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch |
| 190 |
+++ /dev/null |
| 191 |
@@ -1,31 +0,0 @@ |
| 192 |
-From 95a8ece964681fc6823e968541da2da2da06b3dd Mon Sep 17 00:00:00 2001 |
| 193 |
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@×××××.com> |
| 194 |
-Date: Sat, 2 Oct 2021 21:50:04 +0300 |
| 195 |
-Subject: [PATCH] Fix compile for newer Akonadi Build Versions |
| 196 |
- |
| 197 |
---- |
| 198 |
- core/utilities/extrasupport/addressbook/akonadiiface.cpp | 7 +++++++ |
| 199 |
- 1 file changed, 7 insertions(+) |
| 200 |
- |
| 201 |
-diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp |
| 202 |
-index 8e43dad0da..cb38036e39 100644 |
| 203 |
---- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp |
| 204 |
-+++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp |
| 205 |
-@@ -41,7 +41,14 @@ |
| 206 |
- #endif |
| 207 |
- |
| 208 |
- #include <kjob.h> |
| 209 |
-+#include <akonadi_version.h> |
| 210 |
-+ |
| 211 |
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) |
| 212 |
-+#include <Akonadi/Item> |
| 213 |
-+#else |
| 214 |
- #include <AkonadiCore/Item> |
| 215 |
-+#endif |
| 216 |
-+ |
| 217 |
- #include <Akonadi/Contact/ContactSearchJob> |
| 218 |
- #include <KContacts/Addressee> |
| 219 |
- |
| 220 |
--- |
| 221 |
-2.34.1 |
| 222 |
- |
Archives