1 |
commit: 53a5ff6f18fe4a274b218b319d0f71bab34707bf |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 26 09:25:37 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 26 10:27:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a5ff6f |
7 |
|
8 |
media-gfx/digikam: Drop 7.2.0-r1 |
9 |
|
10 |
Package-Manager: Portage-3.0.28, 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.2.0-r1.ebuild | 149 --------------------- |
15 |
.../digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch | 29 ---- |
16 |
3 files changed, 179 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest |
19 |
index f97122d080d8..92a7c106b246 100644 |
20 |
--- a/media-gfx/digikam/Manifest |
21 |
+++ b/media-gfx/digikam/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B 5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90 SHA512 2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7 |
24 |
DIST digikam-7.3.0.tar.xz 256985340 BLAKE2B 9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed SHA512 71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad |
25 |
|
26 |
diff --git a/media-gfx/digikam/digikam-7.2.0-r1.ebuild b/media-gfx/digikam/digikam-7.2.0-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 93f92877fffe..000000000000 |
29 |
--- a/media-gfx/digikam/digikam-7.2.0-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,149 +0,0 @@ |
32 |
-# Copyright 1999-2021 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-KFMIN=5.74.0 |
38 |
-QTMIN=5.15.2 |
39 |
-inherit ecm kde.org toolchain-funcs |
40 |
- |
41 |
-if [[ ${KDE_BUILD_TYPE} != live ]]; then |
42 |
- MY_P=${PN}-${PV/_/-} |
43 |
- if [[ ${PV} =~ rc[0-9]*$ ]]; then |
44 |
- SRC_URI="mirror://kde/unstable/${PN}/" |
45 |
- else |
46 |
- SRC_URI="mirror://kde/stable/${PN}/${PV}/" |
47 |
- fi |
48 |
- SRC_URI+="${MY_P}.tar.xz" |
49 |
- KEYWORDS="amd64 x86" |
50 |
- S="${WORKDIR}/${MY_P}" |
51 |
-fi |
52 |
- |
53 |
-DESCRIPTION="Digital photo management application" |
54 |
-HOMEPAGE="https://www.digikam.org/" |
55 |
- |
56 |
-LICENSE="GPL-2" |
57 |
-SLOT="5" |
58 |
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" |
59 |
- |
60 |
-# bug 366505 |
61 |
-RESTRICT+=" test" |
62 |
- |
63 |
-BDEPEND=" |
64 |
- >=dev-util/cmake-3.14.3 |
65 |
- sys-devel/gettext |
66 |
- panorama? ( |
67 |
- sys-devel/bison |
68 |
- sys-devel/flex |
69 |
- ) |
70 |
-" |
71 |
-COMMON_DEPEND=" |
72 |
- dev-libs/expat |
73 |
- >=dev-qt/qtconcurrent-${QTMIN}:5 |
74 |
- >=dev-qt/qtdbus-${QTMIN}:5 |
75 |
- >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] |
76 |
- >=dev-qt/qtnetwork-${QTMIN}:5 |
77 |
- >=dev-qt/qtprintsupport-${QTMIN}:5 |
78 |
- >=dev-qt/qtsql-${QTMIN}:5[mysql?] |
79 |
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets] |
80 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
81 |
- >=dev-qt/qtxml-${QTMIN}:5 |
82 |
- >=dev-qt/qtxmlpatterns-${QTMIN}:5 |
83 |
- >=kde-frameworks/kconfig-${KFMIN}:5 |
84 |
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
85 |
- >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
86 |
- >=kde-frameworks/ki18n-${KFMIN}:5 |
87 |
- >=kde-frameworks/kiconthemes-${KFMIN}:5 |
88 |
- >=kde-frameworks/kio-${KFMIN}:5 |
89 |
- >=kde-frameworks/knotifications-${KFMIN}:5 |
90 |
- >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
91 |
- >=kde-frameworks/kservice-${KFMIN}:5 |
92 |
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
93 |
- >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
94 |
- >=kde-frameworks/kxmlgui-${KFMIN}:5 |
95 |
- >=kde-frameworks/solid-${KFMIN}:5 |
96 |
- >=media-gfx/exiv2-0.27:= |
97 |
- media-libs/lcms:2 |
98 |
- media-libs/liblqr |
99 |
- media-libs/libpng:0= |
100 |
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn] |
101 |
- media-libs/tiff:0 |
102 |
- virtual/jpeg:0 |
103 |
- addressbook? ( |
104 |
- >=kde-apps/akonadi-contacts-19.04.3:5 |
105 |
- >=kde-frameworks/kcontacts-${KFMIN}:5 |
106 |
- ) |
107 |
- calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) |
108 |
- gphoto2? ( media-libs/libgphoto2:= ) |
109 |
- heif? ( media-libs/x265:= ) |
110 |
- imagemagick? ( media-gfx/imagemagick:= ) |
111 |
- lensfun? ( media-libs/lensfun ) |
112 |
- marble? ( |
113 |
- >=dev-qt/qtconcurrent-${QTMIN}:5 |
114 |
- >=kde-apps/marble-19.04.3:5 |
115 |
- >=kde-frameworks/kbookmarks-${KFMIN}:5 |
116 |
- ) |
117 |
- mediaplayer? ( |
118 |
- media-libs/qtav[opengl(+)] |
119 |
- media-video/ffmpeg:= |
120 |
- ) |
121 |
- opengl? ( |
122 |
- >=dev-qt/qtopengl-${QTMIN}:5 |
123 |
- virtual/opengl |
124 |
- ) |
125 |
- panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) |
126 |
- scanner? ( >=kde-apps/libksane-19.04.3:5 ) |
127 |
- semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) |
128 |
- X? ( |
129 |
- >=dev-qt/qtx11extras-${QTMIN}:5 |
130 |
- x11-libs/libX11 |
131 |
- ) |
132 |
-" |
133 |
-DEPEND="${COMMON_DEPEND} |
134 |
- dev-cpp/eigen:3 |
135 |
- dev-libs/boost[threads(+)] |
136 |
-" |
137 |
-RDEPEND="${COMMON_DEPEND} |
138 |
- mysql? ( virtual/mysql[server(+)] ) |
139 |
- panorama? ( media-gfx/hugin ) |
140 |
-" |
141 |
- |
142 |
-PATCHES=( "${FILESDIR}"/${P}-qt-5.15.2-after-f8ad329f.patch ) |
143 |
- |
144 |
-pkg_pretend() { |
145 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
146 |
- ecm_pkg_pretend |
147 |
-} |
148 |
- |
149 |
-pkg_setup() { |
150 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
151 |
- ecm_pkg_setup |
152 |
-} |
153 |
- |
154 |
-# FIXME: Unbundle libraw (libs/rawengine/libraw) |
155 |
-src_configure() { |
156 |
- local mycmakeargs=( |
157 |
- -DBUILD_TESTING=OFF # bug 698192 |
158 |
- -DENABLE_APPSTYLES=ON |
159 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON |
160 |
- -DENABLE_QWEBENGINE=ON |
161 |
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) |
162 |
- $(cmake_use_find_package calendar KF5CalendarCore) |
163 |
- $(cmake_use_find_package gphoto2 Gphoto2) |
164 |
- $(cmake_use_find_package heif X265) |
165 |
- $(cmake_use_find_package imagemagick ImageMagick) |
166 |
- $(cmake_use_find_package lensfun LensFun) |
167 |
- $(cmake_use_find_package marble Marble) |
168 |
- -DENABLE_MEDIAPLAYER=$(usex mediaplayer) |
169 |
- $(cmake_use_find_package mediaplayer QtAV) |
170 |
- -DENABLE_MYSQLSUPPORT=$(usex mysql) |
171 |
- -DENABLE_INTERNALMYSQL=$(usex mysql) |
172 |
- $(cmake_use_find_package opengl OpenGL) |
173 |
- $(cmake_use_find_package panorama KF5ThreadWeaver) |
174 |
- $(cmake_use_find_package scanner KF5Sane) |
175 |
- $(cmake_use_find_package semantic-desktop KF5FileMetaData) |
176 |
- $(cmake_use_find_package X X11) |
177 |
- ) |
178 |
- |
179 |
- ecm_src_configure |
180 |
-} |
181 |
|
182 |
diff --git a/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch b/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch |
183 |
deleted file mode 100644 |
184 |
index 938cd8a990cd..000000000000 |
185 |
--- a/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch |
186 |
+++ /dev/null |
187 |
@@ -1,29 +0,0 @@ |
188 |
-From 7078ffb91c05e6cd436eaf222541044b98265113 Mon Sep 17 00:00:00 2001 |
189 |
-From: Antonio Rojas <arojas@×××××××××.org> |
190 |
-Date: Fri, 16 Apr 2021 19:45:05 +0200 |
191 |
-Subject: [PATCH] Fix build after Qt commit |
192 |
- f8ad329f7ee01993c388f78851fc4ac88f5093b4 |
193 |
- |
194 |
-Build fails after this commit when using QT_NO_CAST_FROM_ASCII |
195 |
---- |
196 |
- .../webservices/mediawiki/backend/mediawiki_queryrevision.cpp | 4 ++-- |
197 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
198 |
- |
199 |
-diff --git a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp |
200 |
-index dce0fc9eb5..625d170d5e 100644 |
201 |
---- a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp |
202 |
-+++ b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp |
203 |
-@@ -299,8 +299,8 @@ void QueryRevision::doWorkProcessReply() |
204 |
- while (count < 2) |
205 |
- { |
206 |
- if (replytmp[i] == QLatin1Char('"') && replytmp[i-1] != QLatin1Char('\\')) count++; |
207 |
-- if (replytmp[i] == QLatin1Char('<')) replytmp[i] = char(255); |
208 |
-- if (replytmp[i] == QLatin1Char('>')) replytmp[i] = char(254); |
209 |
-+ if (replytmp[i] == QLatin1Char('<')) replytmp[i] = QLatin1Char(char(255)); |
210 |
-+ if (replytmp[i] == QLatin1Char('>')) replytmp[i] = QLatin1Char(char(254)); |
211 |
- ++i; |
212 |
- } |
213 |
- } |
214 |
--- |
215 |
-GitLab |
216 |
- |