* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2016-08-17 20:47 Michael Palimaka
0 siblings, 0 replies; 23+ messages in thread
From: Michael Palimaka @ 2016-08-17 20:47 UTC (permalink / raw
To: gentoo-commits
commit: aa844686c8792e80a1b1be97571da30626a1f803
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 15:01:32 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 20:47:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa844686
media-gfx/digikam: Add USE=jpeg2k,opengl,openmp,panorama; fix configure
Choose some default USE flags
Patches to fix runtime crashes
Sort dependencies
Package-Manager: portage-2.2.28
media-gfx/digikam/digikam-5.1.0-r1.ebuild | 172 +++++++++++++++++++++
.../files/digikam-5.1.0-albums-crashfix.patch | 35 +++++
.../digikam/files/digikam-5.1.0-i386-gcc61.patch | 41 +++++
.../files/digikam-5.1.0-memalloc-crash.patch | 95 ++++++++++++
media-gfx/digikam/metadata.xml | 1 +
5 files changed, 344 insertions(+)
diff --git a/media-gfx/digikam/digikam-5.1.0-r1.ebuild b/media-gfx/digikam/digikam-5.1.0-r1.ebuild
new file mode 100644
index 0000000..5527034
--- /dev/null
+++ b/media-gfx/digikam/digikam-5.1.0-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KDE_HANDBOOK="true"
+ KDE_TEST="true"
+fi
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_MIN_VERSION="3.0"
+inherit kde5 toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="addressbook gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner video X"
+
+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/${MY_P}.tar.xz"
+
+ S="${WORKDIR}/${MY_P}/core"
+
+fi
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_kdeapps_dep libkexiv2)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql 'mysql?')
+ $(add_qt_dep qtwebkit)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/boost[threads]
+ dev-libs/expat
+ media-gfx/exiv2:=
+ media-libs/lcms:2
+ media-libs/liblqr
+ >=media-libs/libpgf-6.12.27
+ media-libs/libpng:0=
+ media-libs/opencv:=[-qt4]
+ || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 )
+ media-libs/tiff:0
+ virtual/jpeg:0
+ addressbook? (
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep kcontacts)
+ )
+ gphoto2? ( media-libs/libgphoto2:= )
+ jpeg2k? ( media-libs/jasper )
+ kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kitemmodels)
+ $(add_kdeapps_dep marble)
+ )
+ mysql? ( virtual/mysql )
+ opengl? (
+ $(add_qt_dep qtopengl)
+ virtual/opengl
+ )
+ panorama? ( $(add_frameworks_dep threadweaver) )
+ scanner? ( $(add_kdeapps_dep libksane) )
+ semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+ video? ( $(add_qt_dep qtmultimedia 'widgets') )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/kipi-plugins:5
+ panorama? ( media-gfx/hugin )
+ !media-gfx/digikam:4
+"
+
+RESTRICT=test
+# bug 366505
+
+PATCHES=(
+ "${FILESDIR}/${P}-i386-gcc61.patch"
+ "${FILESDIR}/${P}-albums-crashfix.patch"
+ "${FILESDIR}/${P}-memalloc-crash.patch"
+)
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+pkg_pretend() {
+ if use openmp ; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+ kde5_pkg_pretend
+}
+
+src_prepare() {
+ if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ # prepare the translations
+ mv "${WORKDIR}/${MY_P}/po" po || die
+ find po -name "*.po" -and -not -name "digikam.po" -delete || die
+ echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
+ echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+ echo "add_subdirectory( po )" >> CMakeLists.txt || die
+
+ if use handbook; then
+ # subdirs need to be preserved b/c relative paths...
+ # doc-translated is, in fact, broken, and ignored
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
+ echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
+ fi
+ fi
+
+ kde5_src_prepare
+}
+
+src_configure() {
+ # LQR = only allows to choose between bundled/external
+ local mycmakeargs=(
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
+ -DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_MEDIAPLAYER=$(usex video)
+ -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
+ $(cmake-utils_use_find_package gphoto2 Gphoto2)
+ $(cmake-utils_use_find_package jpeg2k Jasper)
+ $(cmake-utils_use_find_package kipi KF5Kipi)
+ $(cmake-utils_use_find_package lensfun LensFun)
+ $(cmake-utils_use_find_package marble Marble)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package openmp OpenMP)
+ $(cmake-utils_use_find_package panorama KF5ThreadWeaver)
+ $(cmake-utils_use_find_package scanner KF5Sane)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch b/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch
new file mode 100644
index 0000000..e22e8df
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch
@@ -0,0 +1,35 @@
+From: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Thu, 11 Aug 2016 11:41:08 +0000
+Subject: Fix CR #1368976
+X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=7c628bac74afe24dbc4ca66b1bd5d513e46f6377
+---
+Fix CR #1368976
+BUGS: 366630
+FIXED-IN: 5.2.0
+---
+
+
+--- a/libs/album/albumtreeview.cpp
++++ b/libs/album/albumtreeview.cpp
+@@ -1089,6 +1089,11 @@
+
+ Album* const album = albumFilterModel()->albumForIndex(indexAt(event->pos()));
+
++ if (!album)
++ {
++ return;
++ }
++
+ if (album->isTrashAlbum())
+ {
+ // For the moment, disabling context menu for trash.
+@@ -1102,7 +1107,7 @@
+ }
+
+ // switch to the selected album if need
+- if (d->selectOnContextMenu && album)
++ if (d->selectOnContextMenu)
+ {
+ setCurrentAlbums(QList<Album*>() << album);
+ }
+
diff --git a/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch b/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch
new file mode 100644
index 0000000..710c147
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch
@@ -0,0 +1,41 @@
+From: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Tue, 09 Aug 2016 18:41:17 +0000
+Subject: apply patch #100514 to fix broken compilation under 32 bits platform with GCC 6.1
+X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=067a88d8c84a5149469961d54b1d5c93df6a3167
+---
+apply patch #100514 to fix broken compilation under 32 bits platform with GCC 6.1
+BUGS: 366542
+FIXED-IN: 5.2.0
+---
+
+
+--- a/libs/rawengine/libraw/libraw/libraw_types.h
++++ b/libs/rawengine/libraw/libraw/libraw_types.h
+@@ -612,10 +612,10 @@
+ #elif defined(__INTEL__)
+ #define LibRawBigEndian 0
+
+-#elif defined(_M_IX86)
++#elif defined(_M_IX86) || defined(__i386__)
+ #define LibRawBigEndian 0
+
+-#elif defined(_M_X64) || defined(__amd64__)
++#elif defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
+ #define LibRawBigEndian 0
+
+ #elif defined(__LITTLE_ENDIAN__)
+@@ -625,6 +625,13 @@
+ #define LibRawBigEndian 1
+ #elif defined(_ARM_)
+ #define LibRawBigEndian 0
++
++#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
++#define LibRawBigEndian 0
++
++#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++#define LibRawBigEndian 1
++
+ #else
+ #ifndef qXCodeRez
+ #error Unable to figure out byte order.
+
diff --git a/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch b/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch
new file mode 100644
index 0000000..1a68f27
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch
@@ -0,0 +1,95 @@
+From: Maik Qualmann <metzpinguin@gmail.com>
+Date: Thu, 11 Aug 2016 19:43:46 +0000
+Subject: fix check of maximum addressable memory on 64bits
+X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=90f31456779f4aeb9ac06a385f398827fd35c985
+---
+fix check of maximum addressable memory on 64bits
+CCBUGS: 366621
+---
+
+
+--- a/libs/dimg/loaders/dimgloader.cpp
++++ b/libs/dimg/loaders/dimgloader.cpp
+@@ -163,7 +163,7 @@
+
+ qint64 DImgLoader::checkAllocation(qint64 fullSize)
+ {
+- if (fullSize > std::numeric_limits<int>::max())
++ if (fullSize > std::numeric_limits<size_t>::max())
+ {
+ qCWarning(DIGIKAM_DIMG_LOG) << "Cannot allocate buffer of size" << fullSize;
+ return 0;
+
+From: Maik Qualmann <metzpinguin@gmail.com>
+Date: Fri, 12 Aug 2016 19:29:50 +0000
+Subject: fix crash by big memory allocation for DImg on 64bit
+X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=65fa04ca097d4ff695690886a9f2be459b4279a9
+---
+fix crash by big memory allocation for DImg on 64bit
+CCBUGS: 366621
+---
+
+
+--- a/libs/dimg/dimg.cpp
++++ b/libs/dimg/dimg.cpp
+@@ -211,7 +211,7 @@
+
+ if (old->data)
+ {
+- int size = allocateData();
++ size_t size = allocateData();
+ memcpy(m_priv->data, old->data, size);
+ }
+ }
+@@ -234,7 +234,7 @@
+ }
+ else if (copyData)
+ {
+- int size = allocateData();
++ size_t size = allocateData();
+
+ if (data)
+ {
+@@ -303,7 +303,7 @@
+ setImageData(src->null, src->width, src->height, src->sixteenBit, src->alpha);
+ }
+
+-int DImg::allocateData()
++size_t DImg::allocateData()
+ {
+ size_t size = m_priv->width * m_priv->height * (m_priv->sixteenBit ? 8 : 4);
+ m_priv->data = DImgLoader::new_failureTolerant(size);
+@@ -2231,7 +2231,7 @@
+
+ void DImg::resize(int w, int h)
+ {
+- if (w <= 0 || h <= 0)
++ if (isNull() || w <= 0 || h <= 0)
+ {
+ return;
+ }
+
+--- a/libs/dimg/dimg.h
++++ b/libs/dimg/dimg.h
+@@ -655,7 +655,7 @@
+ void copyImageData(const Private* const src);
+ void setImageData(bool null, uint width, uint height, bool sixteenBit, bool alpha);
+ void setImageDimension(uint width, uint height);
+- int allocateData();
++ size_t allocateData();
+
+ static void bitBlt(const uchar* const src, uchar* const dest,
+ int sx, int sy, int w, int h, int dx, int dy,
+
+--- a/libs/dimg/loaders/dimgloader.cpp
++++ b/libs/dimg/loaders/dimgloader.cpp
+@@ -163,7 +163,7 @@
+
+ qint64 DImgLoader::checkAllocation(qint64 fullSize)
+ {
+- if (fullSize > std::numeric_limits<size_t>::max())
++ if ((quint64)fullSize > std::numeric_limits<size_t>::max())
+ {
+ qCWarning(DIGIKAM_DIMG_LOG) << "Cannot allocate buffer of size" << fullSize;
+ return 0;
+
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 76eae51..287778c 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -13,6 +13,7 @@
<flag name="kipi">Enable support for <pkg>media-plugins/kipi-plugins</pkg></flag>
<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
<flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag>
+ <flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
<flag name="themedesigner">Build the digikam theme designer</flag>
<flag name="thumbnails">Enable thumbnails database support</flag>
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2016-10-31 19:04 Johannes Huber
0 siblings, 0 replies; 23+ messages in thread
From: Johannes Huber @ 2016-10-31 19:04 UTC (permalink / raw
To: gentoo-commits
commit: bab43b50276c5123416de84fdce994ad3a89a7cd
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 19:03:48 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 19:03:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab43b50
media-gfx/digikam: Remove 5.1.0 (r1)
Package-Manager: portage-2.3.2
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-5.1.0-r1.ebuild | 172 ---------------------
.../files/digikam-5.1.0-albums-crashfix.patch | 35 -----
.../digikam/files/digikam-5.1.0-i386-gcc61.patch | 41 -----
.../files/digikam-5.1.0-memalloc-crash.patch | 95 ------------
5 files changed, 344 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 32c254b..f67754b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,4 +1,3 @@
DIST digikam-4.14.0.tar.bz2 59805228 SHA256 9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad SHA512 3029e9b67d9d055bd9aee0d6d01e87950702e026f9f44b513155946ba087ec58b300f945a035a418afae45365ed007d8db6a1a90ed1d391e5e0e4cb679168ccf WHIRLPOOL 35a3caedc9a4799f161b26b3b4df51da18a31be50a8a6da5b12a339a353755d73a47f103099087e3dc8e6926f65ae19638efea3585c86f72173a086056bf48ce
DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
-DIST digikam-5.1.0.tar.xz 68259780 SHA256 47915e2e41ded21071309c0b387495bd66f6cc488acbfa647d2d8d57595127f1 SHA512 aa6b6b2a2f40dc6e1e90549d3b1cdcd2e886d16cfa4bb140093b67366b4aeaa3ebab96f0a28b1aeb969dca1fa64f8377bb8af44da4feeb4356e1f884357aaa86 WHIRLPOOL c09afdcc67fa0643f84f4b026227eb6f6c651369b1452e670d4c4451d967a78c968ec56a39f724d726f251d5fb51411214aa723860a23e936ce282a7285d89bc
DIST digikam-5.2.0.tar.xz 143583460 SHA256 cf243fc1518b5bb6e289573c76d89b5fdcc50be89f6312b276af3320763c9260 SHA512 483c2331f8f1a145ffd04bfdfe3f3e7e68f7ac4458b8b1698339dc89433d7820548fc461a5acf163997bab086b5faed6dd635af996f2503213a6207603603b4d WHIRLPOOL 9df54368afa4c31791102211a334568c9301082899fa7970b88dcec2047ded299c0a4dc92ccc1d6db3c2efc71be7e78349d6289b68414b6cfbe76bcc0c6fb930
diff --git a/media-gfx/digikam/digikam-5.1.0-r1.ebuild b/media-gfx/digikam/digikam-5.1.0-r1.ebuild
deleted file mode 100644
index 5527034..00000000
--- a/media-gfx/digikam/digikam-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_HANDBOOK="true"
- KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_MIN_VERSION="3.0"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="addressbook gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner video X"
-
-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/${MY_P}.tar.xz"
-
- S="${WORKDIR}/${MY_P}/core"
-
-fi
-
-COMMON_DEPEND="
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_kdeapps_dep libkexiv2)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtscript)
- $(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/boost[threads]
- dev-libs/expat
- media-gfx/exiv2:=
- media-libs/lcms:2
- media-libs/liblqr
- >=media-libs/libpgf-6.12.27
- media-libs/libpng:0=
- media-libs/opencv:=[-qt4]
- || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 )
- media-libs/tiff:0
- virtual/jpeg:0
- addressbook? (
- $(add_kdeapps_dep akonadi-contacts)
- $(add_kdeapps_dep kcontacts)
- )
- gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper )
- kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
- lensfun? ( media-libs/lensfun )
- marble? (
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kitemmodels)
- $(add_kdeapps_dep marble)
- )
- mysql? ( virtual/mysql )
- opengl? (
- $(add_qt_dep qtopengl)
- virtual/opengl
- )
- panorama? ( $(add_frameworks_dep threadweaver) )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- video? ( $(add_qt_dep qtmultimedia 'widgets') )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
-"
-RDEPEND="${COMMON_DEPEND}
- media-plugins/kipi-plugins:5
- panorama? ( media-gfx/hugin )
- !media-gfx/digikam:4
-"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=(
- "${FILESDIR}/${P}-i386-gcc61.patch"
- "${FILESDIR}/${P}-albums-crashfix.patch"
- "${FILESDIR}/${P}-memalloc-crash.patch"
-)
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-pkg_pretend() {
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
- kde5_pkg_pretend
-}
-
-src_prepare() {
- if [[ ${KDE_BUILD_TYPE} != live ]]; then
- # prepare the translations
- mv "${WORKDIR}/${MY_P}/po" po || die
- find po -name "*.po" -and -not -name "digikam.po" -delete || die
- echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
- echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
- echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
- if use handbook; then
- # subdirs need to be preserved b/c relative paths...
- # doc-translated is, in fact, broken, and ignored
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
- echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
- fi
- fi
-
- kde5_src_prepare
-}
-
-src_configure() {
- # LQR = only allows to choose between bundled/external
- local mycmakeargs=(
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_MEDIAPLAYER=$(usex video)
- -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
- $(cmake-utils_use_find_package gphoto2 Gphoto2)
- $(cmake-utils_use_find_package jpeg2k Jasper)
- $(cmake-utils_use_find_package kipi KF5Kipi)
- $(cmake-utils_use_find_package lensfun LensFun)
- $(cmake-utils_use_find_package marble Marble)
- $(cmake-utils_use_find_package opengl OpenGL)
- $(cmake-utils_use_find_package openmp OpenMP)
- $(cmake-utils_use_find_package panorama KF5ThreadWeaver)
- $(cmake-utils_use_find_package scanner KF5Sane)
- $(cmake-utils_use_find_package X X11)
- )
-
- kde5_src_configure
-}
diff --git a/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch b/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch
deleted file mode 100644
index e22e8df..00000000
--- a/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Gilles Caulier <caulier.gilles@gmail.com>
-Date: Thu, 11 Aug 2016 11:41:08 +0000
-Subject: Fix CR #1368976
-X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=7c628bac74afe24dbc4ca66b1bd5d513e46f6377
----
-Fix CR #1368976
-BUGS: 366630
-FIXED-IN: 5.2.0
----
-
-
---- a/libs/album/albumtreeview.cpp
-+++ b/libs/album/albumtreeview.cpp
-@@ -1089,6 +1089,11 @@
-
- Album* const album = albumFilterModel()->albumForIndex(indexAt(event->pos()));
-
-+ if (!album)
-+ {
-+ return;
-+ }
-+
- if (album->isTrashAlbum())
- {
- // For the moment, disabling context menu for trash.
-@@ -1102,7 +1107,7 @@
- }
-
- // switch to the selected album if need
-- if (d->selectOnContextMenu && album)
-+ if (d->selectOnContextMenu)
- {
- setCurrentAlbums(QList<Album*>() << album);
- }
-
diff --git a/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch b/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch
deleted file mode 100644
index 710c147..00000000
--- a/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Gilles Caulier <caulier.gilles@gmail.com>
-Date: Tue, 09 Aug 2016 18:41:17 +0000
-Subject: apply patch #100514 to fix broken compilation under 32 bits platform with GCC 6.1
-X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=067a88d8c84a5149469961d54b1d5c93df6a3167
----
-apply patch #100514 to fix broken compilation under 32 bits platform with GCC 6.1
-BUGS: 366542
-FIXED-IN: 5.2.0
----
-
-
---- a/libs/rawengine/libraw/libraw/libraw_types.h
-+++ b/libs/rawengine/libraw/libraw/libraw_types.h
-@@ -612,10 +612,10 @@
- #elif defined(__INTEL__)
- #define LibRawBigEndian 0
-
--#elif defined(_M_IX86)
-+#elif defined(_M_IX86) || defined(__i386__)
- #define LibRawBigEndian 0
-
--#elif defined(_M_X64) || defined(__amd64__)
-+#elif defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
- #define LibRawBigEndian 0
-
- #elif defined(__LITTLE_ENDIAN__)
-@@ -625,6 +625,13 @@
- #define LibRawBigEndian 1
- #elif defined(_ARM_)
- #define LibRawBigEndian 0
-+
-+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+#define LibRawBigEndian 0
-+
-+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+#define LibRawBigEndian 1
-+
- #else
- #ifndef qXCodeRez
- #error Unable to figure out byte order.
-
diff --git a/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch b/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch
deleted file mode 100644
index 1a68f27..00000000
--- a/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Thu, 11 Aug 2016 19:43:46 +0000
-Subject: fix check of maximum addressable memory on 64bits
-X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=90f31456779f4aeb9ac06a385f398827fd35c985
----
-fix check of maximum addressable memory on 64bits
-CCBUGS: 366621
----
-
-
---- a/libs/dimg/loaders/dimgloader.cpp
-+++ b/libs/dimg/loaders/dimgloader.cpp
-@@ -163,7 +163,7 @@
-
- qint64 DImgLoader::checkAllocation(qint64 fullSize)
- {
-- if (fullSize > std::numeric_limits<int>::max())
-+ if (fullSize > std::numeric_limits<size_t>::max())
- {
- qCWarning(DIGIKAM_DIMG_LOG) << "Cannot allocate buffer of size" << fullSize;
- return 0;
-
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Fri, 12 Aug 2016 19:29:50 +0000
-Subject: fix crash by big memory allocation for DImg on 64bit
-X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=65fa04ca097d4ff695690886a9f2be459b4279a9
----
-fix crash by big memory allocation for DImg on 64bit
-CCBUGS: 366621
----
-
-
---- a/libs/dimg/dimg.cpp
-+++ b/libs/dimg/dimg.cpp
-@@ -211,7 +211,7 @@
-
- if (old->data)
- {
-- int size = allocateData();
-+ size_t size = allocateData();
- memcpy(m_priv->data, old->data, size);
- }
- }
-@@ -234,7 +234,7 @@
- }
- else if (copyData)
- {
-- int size = allocateData();
-+ size_t size = allocateData();
-
- if (data)
- {
-@@ -303,7 +303,7 @@
- setImageData(src->null, src->width, src->height, src->sixteenBit, src->alpha);
- }
-
--int DImg::allocateData()
-+size_t DImg::allocateData()
- {
- size_t size = m_priv->width * m_priv->height * (m_priv->sixteenBit ? 8 : 4);
- m_priv->data = DImgLoader::new_failureTolerant(size);
-@@ -2231,7 +2231,7 @@
-
- void DImg::resize(int w, int h)
- {
-- if (w <= 0 || h <= 0)
-+ if (isNull() || w <= 0 || h <= 0)
- {
- return;
- }
-
---- a/libs/dimg/dimg.h
-+++ b/libs/dimg/dimg.h
-@@ -655,7 +655,7 @@
- void copyImageData(const Private* const src);
- void setImageData(bool null, uint width, uint height, bool sixteenBit, bool alpha);
- void setImageDimension(uint width, uint height);
-- int allocateData();
-+ size_t allocateData();
-
- static void bitBlt(const uchar* const src, uchar* const dest,
- int sx, int sy, int w, int h, int dx, int dy,
-
---- a/libs/dimg/loaders/dimgloader.cpp
-+++ b/libs/dimg/loaders/dimgloader.cpp
-@@ -163,7 +163,7 @@
-
- qint64 DImgLoader::checkAllocation(qint64 fullSize)
- {
-- if (fullSize > std::numeric_limits<size_t>::max())
-+ if ((quint64)fullSize > std::numeric_limits<size_t>::max())
- {
- qCWarning(DIGIKAM_DIMG_LOG) << "Cannot allocate buffer of size" << fullSize;
- return 0;
-
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2016-12-11 10:12 Johannes Huber
0 siblings, 0 replies; 23+ messages in thread
From: Johannes Huber @ 2016-12-11 10:12 UTC (permalink / raw
To: gentoo-commits
commit: cd2f2c655d00e87504cd6ecbf0410ffc802f2930
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 10:12:35 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 10:12:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2f2c65
media-gfx/digikam: Fix db lock issue
Revision bump adds upstream patch to fix a database lock with the batch queue
manager.
Reported-by: Oliver Schwabedissen <Oliver <AT> Schwabedissen.name>
Gentoo-bug: 602320
Package-Manager: portage-2.3.3
media-gfx/digikam/digikam-5.3.0-r1.ebuild | 170 +++++++++++++++++++++
.../digikam/files/digikam-5.3.0-db-lock.patch | 135 ++++++++++++++++
2 files changed, 305 insertions(+)
diff --git a/media-gfx/digikam/digikam-5.3.0-r1.ebuild b/media-gfx/digikam/digikam-5.3.0-r1.ebuild
new file mode 100644
index 00000000..9aeb0cc
--- /dev/null
+++ b/media-gfx/digikam/digikam-5.3.0-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KDE_HANDBOOK="true"
+ KDE_TEST="true"
+fi
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_MIN_VERSION="3.0"
+inherit kde5 toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner video X"
+
+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/${MY_P}.tar.xz"
+ S="${WORKDIR}/${MY_P}/core"
+fi
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep ki18n)
+ $(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 qtdbus)
+ $(add_qt_dep qtgui '-gles2')
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsql 'mysql?')
+ $(add_qt_dep qtwebkit)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/expat
+ media-gfx/exiv2:=
+ media-libs/lcms:2
+ media-libs/liblqr
+ >=media-libs/libpgf-6.12.27
+ media-libs/libpng:0=
+ media-libs/opencv:=[-qt4(-)]
+ || ( <media-libs/opencv-3.0.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) )
+ gphoto2? ( media-libs/libgphoto2:= )
+ jpeg2k? ( media-libs/jasper:= )
+ kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ $(add_frameworks_dep kbookmarks)
+ $(add_kdeapps_dep marble)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtnetwork)
+ )
+ mysql? ( virtual/mysql )
+ opengl? (
+ $(add_qt_dep qtopengl)
+ virtual/opengl
+ )
+ panorama? ( $(add_frameworks_dep threadweaver) )
+ scanner? ( $(add_kdeapps_dep libksane) )
+ semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+ video? ( $(add_qt_dep qtmultimedia 'widgets') )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ dev-cpp/eigen:3
+ dev-libs/boost[threads]
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/kipi-plugins:5
+ panorama? ( media-gfx/hugin )
+ !media-gfx/digikam:4
+"
+
+RESTRICT=test
+# bug 366505
+
+PATCHES=( "${FILESDIR}/${P}-db-lock.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_prepare() {
+ if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ # prepare the translations
+ mv "${WORKDIR}/${MY_P}/po" po || die
+ find po -name "*.po" -and -not -name "digikam.po" -delete || die
+ echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
+ echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+ echo "add_subdirectory( po )" >> CMakeLists.txt || die
+
+ if use handbook; then
+ # subdirs need to be preserved b/c relative paths...
+ # doc-translated is, in fact, broken, and ignored
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
+ echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die
+ echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
+ fi
+ fi
+
+ if ! use marble; then
+ punt_bogus_dep Qt5 Network
+ fi
+
+ kde5_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_APPSTYLES=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ -DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_MEDIAPLAYER=$(usex video)
+ -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
+ $(cmake-utils_use_find_package calendar KF5CalendarCore)
+ $(cmake-utils_use_find_package gphoto2 Gphoto2)
+ $(cmake-utils_use_find_package jpeg2k Jasper)
+ $(cmake-utils_use_find_package kipi KF5Kipi)
+ $(cmake-utils_use_find_package lensfun LensFun)
+ $(cmake-utils_use_find_package marble Marble)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package openmp OpenMP)
+ $(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 X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch b/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch
new file mode 100644
index 00000000..50223f0
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch
@@ -0,0 +1,135 @@
+From f37ef2c195b61a43a40e9cbb7f119fdc8e9d38f4 Mon Sep 17 00:00:00 2001
+From: Maik Qualmann <metzpinguin@gmail.com>
+Date: Sat, 10 Dec 2016 11:16:50 +0100
+Subject: fix locked database with BQM
+
+---
+ utilities/queuemanager/manager/actionthread.cpp | 27 ++++++++++++++++++++++---
+ utilities/queuemanager/manager/actionthread.h | 1 +
+ utilities/queuemanager/manager/task.cpp | 24 +++++-----------------
+ 3 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/utilities/queuemanager/manager/actionthread.cpp b/utilities/queuemanager/manager/actionthread.cpp
+index 48c3fa3..141bb3d 100644
+--- a/utilities/queuemanager/manager/actionthread.cpp
++++ b/utilities/queuemanager/manager/actionthread.cpp
+@@ -28,6 +28,7 @@
+
+ #include "digikam_debug.h"
+ #include "digikam_config.h"
++#include "collectionscanner.h"
+ #include "task.h"
+
+ namespace Digikam
+@@ -82,7 +83,7 @@ void ActionThread::processQueueItems(const QList<AssignedBatchTools>& items)
+ {
+ ActionJobCollection collection;
+
+- for(int i = 0 ; i < items.size() ; i++)
++ for (int i = 0 ; i < items.size() ; i++)
+ {
+ Task* const t = new Task();
+ t->setSettings(d->settings);
+@@ -92,10 +93,12 @@ void ActionThread::processQueueItems(const QList<AssignedBatchTools>& items)
+ this, SIGNAL(signalStarting(Digikam::ActionData)));
+
+ connect(t, SIGNAL(signalFinished(Digikam::ActionData)),
+- this, SIGNAL(signalFinished(Digikam::ActionData)));
++ this, SLOT(slotUpdateImageInfo(Digikam::ActionData)),
++ Qt::BlockingQueuedConnection);
+
+ connect(this, SIGNAL(signalCancelTask()),
+- t, SLOT(slotCancel()), Qt::QueuedConnection);
++ t, SLOT(slotCancel()),
++ Qt::QueuedConnection);
+
+ collection.insert(t, 0);
+ }
+@@ -111,6 +114,24 @@ void ActionThread::cancel()
+ ActionThreadBase::cancel();
+ }
+
++void ActionThread::slotUpdateImageInfo(const Digikam::ActionData& ad)
++{
++ if (ad.status == ActionData::BatchDone)
++ {
++ CollectionScanner scanner;
++ ImageInfo source = ImageInfo::fromUrl(ad.fileUrl);
++ qlonglong id = scanner.scanFile(ad.destUrl.toLocalFile(), CollectionScanner::NormalScan);
++ ImageInfo info(id);
++ QDateTime dateTime = info.dateTime();
++ // Copy the digiKam attributes from original file to the new file
++ CollectionScanner::copyFileProperties(source, info);
++ // Restore date time from new file
++ info.setDateTime(dateTime);
++ }
++
++ emit signalFinished(ad);
++}
++
+ void ActionThread::slotThreadFinished()
+ {
+ if (isEmpty())
+diff --git a/utilities/queuemanager/manager/actionthread.h b/utilities/queuemanager/manager/actionthread.h
+index 8cb848b..3375c2e 100644
+--- a/utilities/queuemanager/manager/actionthread.h
++++ b/utilities/queuemanager/manager/actionthread.h
+@@ -72,6 +72,7 @@ Q_SIGNALS:
+
+ private Q_SLOTS:
+
++ void slotUpdateImageInfo(const Digikam::ActionData& ad);
+ void slotThreadFinished();
+
+ private:
+diff --git a/utilities/queuemanager/manager/task.cpp b/utilities/queuemanager/manager/task.cpp
+index a94b4f9..4c6b710 100644
+--- a/utilities/queuemanager/manager/task.cpp
++++ b/utilities/queuemanager/manager/task.cpp
+@@ -46,10 +46,8 @@ extern "C"
+ #include "dimg.h"
+ #include "dmetadata.h"
+ #include "imageinfo.h"
+-#include "fileactionmngr.h"
+ #include "batchtool.h"
+ #include "batchtoolsmanager.h"
+-#include "collectionscanner.h"
+ #include "fileoperation.h"
+
+ namespace Digikam
+@@ -245,27 +243,15 @@ void Task::run()
+ }
+ }
+
+- if (!FileOperation::localFileRename(d->tools.m_itemUrl.toLocalFile(),
+- outUrl.toLocalFile(),
+- dest.toLocalFile()))
++ if (FileOperation::localFileRename(d->tools.m_itemUrl.toLocalFile(),
++ outUrl.toLocalFile(),
++ dest.toLocalFile()))
+ {
+- emitActionData(ActionData::BatchFailed, i18n("Failed to create file..."), dest);
++ emitActionData(ActionData::BatchDone, i18n("Item processed successfully %1", renameMess), dest);
+ }
+ else
+ {
+- // -- Now copy the digiKam attributes from original file to the new file ------------
+-
+- CollectionScanner scanner;
+- qlonglong id = scanner.scanFile(dest.toLocalFile(), CollectionScanner::NormalScan);
+-
+- ImageInfo destInfo(id);
+- CollectionScanner::copyFileProperties(source, destInfo);
+-
+- // -- Read again new file that the database is up to date ---------------------------
+-
+- scanner.scanFile(destInfo, CollectionScanner::Rescan);
+-
+- emitActionData(ActionData::BatchDone, i18n("Item processed successfully %1", renameMess), dest);
++ emitActionData(ActionData::BatchFailed, i18n("Failed to create file..."), dest);
+ }
+ }
+ else
+--
+cgit v0.11.2
+
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2017-02-12 23:09 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2017-02-12 23:09 UTC (permalink / raw
To: gentoo-commits
commit: da6579f8b2f62c7d0092d3528bde8311e72f3a15
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 22:10:16 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 23:07:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6579f8
media-gfx/digikam: Fix build with KF-5.31 or clang
Gentoo-bug: 609114
Package-Manager: portage-2.3.3
media-gfx/digikam/digikam-5.3.0-r1.ebuild | 6 +-
media-gfx/digikam/files/digikam-5.3.0-clang.patch | 160 +++++++++++++++++++++
.../digikam/files/digikam-5.3.0-kf-5.31.patch | 76 ++++++++++
3 files changed, 241 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-5.3.0-r1.ebuild b/media-gfx/digikam/digikam-5.3.0-r1.ebuild
index 213652c0a5..8777c82e99 100644
--- a/media-gfx/digikam/digikam-5.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-5.3.0-r1.ebuild
@@ -106,7 +106,11 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT=test
# bug 366505
-PATCHES=( "${FILESDIR}/${P}-db-lock.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-db-lock.patch"
+ "${FILESDIR}/${P}-clang.patch"
+ "${FILESDIR}/${P}-kf-5.31.patch"
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam-5.3.0-clang.patch b/media-gfx/digikam/files/digikam-5.3.0-clang.patch
new file mode 100644
index 0000000000..b4af04cd19
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.3.0-clang.patch
@@ -0,0 +1,160 @@
+commit 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Wed Jan 18 10:13:20 2017 +0100
+
+ Fix compilation with clang
+
+diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h
+index 4ba89c9..d7e6c77 100644
+--- a/libs/database/imagehistory/imagehistorygraph_boost.h
++++ b/libs/database/imagehistory/imagehistorygraph_boost.h
+@@ -28,7 +28,7 @@
+ #include "digikam_config.h"
+
+ // Pragma directives to reduce warnings from Boost header files.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+ #endif
+@@ -1554,7 +1554,7 @@ protected:
+ } // namespace Digikam
+
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+
+diff --git a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
+index f5d0640..91e443d 100644
+--- a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
++++ b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
+@@ -52,7 +52,7 @@
+ #define GREYSTORATION_USING_GFACT 1
+
+ // Pragma directives to reduce warnings from CImg header files.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+ #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+@@ -71,7 +71,7 @@
+ #include "cimg/CImg.h"
+
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+
+diff --git a/libs/dimg/filters/randomnumbergenerator.cpp b/libs/dimg/filters/randomnumbergenerator.cpp
+index 93d7cc4..d7b2ed8 100644
+--- a/libs/dimg/filters/randomnumbergenerator.cpp
++++ b/libs/dimg/filters/randomnumbergenerator.cpp
+@@ -26,7 +26,7 @@
+ // Boost includes
+
+ // Pragma directives to reduce warnings from Boost header files.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wundef"
+ #endif
+@@ -44,7 +44,7 @@
+ #include <boost/random/variate_generator.hpp>
+
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+
+diff --git a/libs/dimg/filters/sharp/matrix.cpp b/libs/dimg/filters/sharp/matrix.cpp
+index 4f32aa3..1a3c65a 100644
+--- a/libs/dimg/filters/sharp/matrix.cpp
++++ b/libs/dimg/filters/sharp/matrix.cpp
+@@ -43,7 +43,7 @@
+ // Eigen includes
+
+ // Pragma directives to reduce warnings from Eigen header files.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+@@ -53,7 +53,7 @@
+ #include <Eigen/LU>
+
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+
+diff --git a/libs/dmetadata/metaengine_p.cpp b/libs/dmetadata/metaengine_p.cpp
+index 2c83b58..2b44e06 100644
+--- a/libs/dmetadata/metaengine_p.cpp
++++ b/libs/dmetadata/metaengine_p.cpp
+@@ -49,7 +49,7 @@ extern "C"
+ #include "digikam_debug.h"
+
+ // Pragma directives to reduce warnings from Exiv2.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar)
+ } // namespace Digikam
+
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+
+diff --git a/libs/jpegutils/jpegutils.cpp b/libs/jpegutils/jpegutils.cpp
+index c823f40..60c7469 100644
+--- a/libs/jpegutils/jpegutils.cpp
++++ b/libs/jpegutils/jpegutils.cpp
+@@ -53,7 +53,7 @@ extern "C"
+ }
+
+ // Pragma directives to reduce warnings from libjpeg transupp header file.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+ #endif
+@@ -69,7 +69,7 @@ extern "C"
+ }
+
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+
+diff --git a/libs/rawengine/drawdecoder_p.h b/libs/rawengine/drawdecoder_p.h
+index a27e199..ea653b4 100644
+--- a/libs/rawengine/drawdecoder_p.h
++++ b/libs/rawengine/drawdecoder_p.h
+@@ -31,7 +31,7 @@
+ #include <QByteArray>
+
+ // Pragma directives to reduce warnings from LibRaw header files.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+@@ -46,7 +46,7 @@
+ #include <libraw.h>
+
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+
diff --git a/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch b/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch
new file mode 100644
index 0000000000..ab648ef3da
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch
@@ -0,0 +1,76 @@
+commit 3793b47b6f57a627911bcce819b1ecc2dc9e422a
+Author: Kevin Funk <kfunk@kde.org>
+Date: Wed Jan 18 13:34:55 2017 +0100
+
+ Fix compilation with new KDECompilerSettings.cmake
+
+diff --git a/app/utils/libopencv.h.cmake.in b/app/utils/libopencv.h.cmake.in
+index cc58b7c..6abf642 100644
+--- a/app/utils/libopencv.h.cmake.in
++++ b/app/utils/libopencv.h.cmake.in
+@@ -27,7 +27,7 @@
+ #define LIB_OPEN_CV_H
+
+ // Pragma directives to reduce warnings from OpenCV header files.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+ #pragma GCC diagnostic ignored "-Woverloaded-virtual"
+@@ -82,7 +82,7 @@
+ #endif
+
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+
+diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt
+index c5d9c27..14a7180 100644
+--- a/libs/database/CMakeLists.txt
++++ b/libs/database/CMakeLists.txt
+@@ -10,6 +10,9 @@ if (POLICY CMP0063)
+ cmake_policy(SET CMP0063 NEW)
+ endif (POLICY CMP0063)
+
++# Boost uses operator names (and, not, ...)
++string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++
+ set(libdatabasecore_SRCS
+ server/databaseserverstarter.cpp
+ server/databaseservererror.cpp
+diff --git a/libs/dimg/CMakeLists.txt b/libs/dimg/CMakeLists.txt
+index 3bcada5..04a0a22 100644
+--- a/libs/dimg/CMakeLists.txt
++++ b/libs/dimg/CMakeLists.txt
+@@ -11,6 +11,9 @@ endif (POLICY CMP0063)
+
+ kde_enable_exceptions()
+
++# Boost uses operator names (and, not, ...)
++string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++
+ set(libdimg_SRCS
+ dimg.cpp
+ drawdecoding.cpp
+commit b318820530a4f001bc6621532b5416bf3c4a43cf
+Author: Kevin Funk <kfunk@kde.org>
+Date: Wed Jan 18 15:20:36 2017 +0100
+
+ tests/dimg needs -fno-operator-names dropped, too
+
+diff --git a/tests/dimg/CMakeLists.txt b/tests/dimg/CMakeLists.txt
+index 6d9e6d6..5133f88 100644
+--- a/tests/dimg/CMakeLists.txt
++++ b/tests/dimg/CMakeLists.txt
+@@ -8,6 +8,9 @@ if (POLICY CMP0063)
+ cmake_policy(SET CMP0063 NEW)
+ endif (POLICY CMP0063)
+
++# Boost uses operator names (and, not, ...)
++string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++
+ include_directories(
+ $<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2017-02-18 23:33 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2017-02-18 23:33 UTC (permalink / raw
To: gentoo-commits
commit: 3542c10ba95fb072f50711f53a0b60bbde63b540
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 22:44:27 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 23:33:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3542c10b
media-gfx/digikam: Fix crash on fixing red eyes
Gentoo-bug: 609216
Thanks-to: Oliver Schwabedissen <Oliver <AT> Schwabedissen.name>
Package-Manager: portage-2.3.3
media-gfx/digikam/digikam-5.3.0-r2.ebuild | 174 +++++++++++++++++++++
.../files/digikam-5.3.0-redeyes-crash.patch | 43 +++++
2 files changed, 217 insertions(+)
diff --git a/media-gfx/digikam/digikam-5.3.0-r2.ebuild b/media-gfx/digikam/digikam-5.3.0-r2.ebuild
new file mode 100644
index 0000000000..38187bee3b
--- /dev/null
+++ b/media-gfx/digikam/digikam-5.3.0-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KDE_HANDBOOK="true"
+ KDE_TEST="true"
+fi
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit kde5 toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner video X"
+
+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/${MY_P}.tar.xz"
+ S="${WORKDIR}/${MY_P}/core"
+fi
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep ki18n)
+ $(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 qtdbus)
+ $(add_qt_dep qtgui '-gles2')
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsql 'mysql?')
+ $(add_qt_dep qtwebkit)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/expat
+ media-gfx/exiv2:=
+ media-libs/lcms:2
+ media-libs/liblqr
+ >=media-libs/libpgf-6.12.27
+ media-libs/libpng:0=
+ media-libs/opencv:=[-qt4(-)]
+ || ( <media-libs/opencv-3.0.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) )
+ gphoto2? ( media-libs/libgphoto2:= )
+ jpeg2k? ( media-libs/jasper:= )
+ kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ $(add_frameworks_dep kbookmarks)
+ $(add_kdeapps_dep marble)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtnetwork)
+ )
+ mysql? ( virtual/mysql )
+ opengl? (
+ $(add_qt_dep qtopengl)
+ virtual/opengl
+ )
+ panorama? ( $(add_frameworks_dep threadweaver) )
+ scanner? ( $(add_kdeapps_dep libksane) )
+ semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+ video? ( $(add_qt_dep qtmultimedia 'widgets') )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ dev-cpp/eigen:3
+ dev-libs/boost[threads]
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/kipi-plugins:5
+ panorama? ( media-gfx/hugin )
+ !media-gfx/digikam:4
+"
+
+RESTRICT=test
+# bug 366505
+
+PATCHES=(
+ "${FILESDIR}/${P}-db-lock.patch"
+ "${FILESDIR}/${P}-clang.patch"
+ "${FILESDIR}/${P}-kf-5.31.patch"
+ "${FILESDIR}/${P}-redeyes-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_prepare() {
+ if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ # prepare the translations
+ mv "${WORKDIR}/${MY_P}/po" po || die
+ find po -name "*.po" -and -not -name "digikam.po" -delete || die
+ echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
+ echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+ echo "add_subdirectory( po )" >> CMakeLists.txt || die
+
+ if use handbook; then
+ # subdirs need to be preserved b/c relative paths...
+ # doc-translated is, in fact, broken, and ignored
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
+ echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die
+ echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
+ fi
+ fi
+
+ if ! use marble; then
+ punt_bogus_dep Qt5 Network
+ fi
+
+ kde5_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_APPSTYLES=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ -DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_MEDIAPLAYER=$(usex video)
+ -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
+ $(cmake-utils_use_find_package calendar KF5CalendarCore)
+ $(cmake-utils_use_find_package gphoto2 Gphoto2)
+ $(cmake-utils_use_find_package jpeg2k Jasper)
+ $(cmake-utils_use_find_package kipi KF5Kipi)
+ $(cmake-utils_use_find_package lensfun LensFun)
+ $(cmake-utils_use_find_package marble Marble)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package openmp OpenMP)
+ $(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 X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch b/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch
new file mode 100644
index 0000000000..055f9be3ac
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch
@@ -0,0 +1,43 @@
+commit 1dad795deb0fbfcef5ad4932f7ade781d35ce17e
+Author: Maik Qualmann <metzpinguin@gmail.com>
+Date: Wed Nov 23 19:37:46 2016 +0100
+
+ fix not found shapepredictor.dat file
+ BUGS: 372831
+ FIXED-IN: 5.4.0
+
+diff --git a/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp b/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp
+index 1cbaefc..a834208 100644
+--- a/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp
++++ b/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp
+@@ -99,14 +99,14 @@ RedEyeCorrectionFilter::~RedEyeCorrectionFilter()
+
+ void RedEyeCorrectionFilter::filterImage()
+ {
+- if (d->sp == 0)
++ if (!d->sp)
+ {
+ // Loading the shape predictor model
+
+- QList<QString> path = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
+- QString::fromLatin1("digikam/facesengine"),
+- QStandardPaths::LocateDirectory);
+- QFile model(*path.begin() + QLatin1String("/ShapePredictor.dat"));
++ QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
++ QLatin1String("digikam/facesengine/shapepredictor.dat"));
++
++ QFile model(path);
+
+ if (model.open(QIODevice::ReadOnly))
+ {
+@@ -116,6 +116,10 @@ void RedEyeCorrectionFilter::filterImage()
+ dataStream >> *temp;
+ d->sp = temp;
+ }
++ else
++ {
++ return;
++ }
+ }
+
+ cv::Mat intermediateImage;
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2017-04-27 12:17 Michael Palimaka
0 siblings, 0 replies; 23+ messages in thread
From: Michael Palimaka @ 2017-04-27 12:17 UTC (permalink / raw
To: gentoo-commits
commit: acdd885a073537afe5e3b93a9b3c24dabdd4ac04
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 12:11:08 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 12:17:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdd885a
media-gfx/digikam: remove 5.3.0
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-5.3.0-r1.ebuild | 172 --------------------
media-gfx/digikam/digikam-5.3.0-r2.ebuild | 173 ---------------------
media-gfx/digikam/files/digikam-5.3.0-clang.patch | 160 -------------------
.../digikam/files/digikam-5.3.0-db-lock.patch | 135 ----------------
.../digikam/files/digikam-5.3.0-kf-5.31.patch | 76 ---------
.../files/digikam-5.3.0-redeyes-crash.patch | 43 -----
media-gfx/digikam/metadata.xml | 1 -
8 files changed, 761 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index aa72b433e7d..0ccca3cbdd0 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digikam-5.3.0.tar.xz 121417224 SHA256 b36cfa27278936d41ab5f33c99fe9ccdfd545eada3e1e32efe9f9e3fdf2c3e5c SHA512 6190944d09badec6ddac194f2029e86d0ef658e08a6a120f04c86109dc2b9d9cd2e772a900d09781b563fcd0caaff186fb5fd6cde9744ce3b4e8dcc9ff29d421 WHIRLPOOL c1c0987e23587356968484d936a0a99f10d6e6ce004ffe1f5eb4d0a42b59fc1e84ec4a03f491c91c93be172ab6b78444c684221fb515e1562cc76bcc61346158
DIST digikam-5.5.0.tar.xz 129499600 SHA256 df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252 SHA512 3c64774916d4804d932009ba3753d387ecf31e9e3d435c580497d3badb6cc3e57ab5ef1a2334a23379d0987d96dd107be4f01adbb63039f4510aa94ac6d71344 WHIRLPOOL e67b444975ad37e939b2f62bba949bcafb41eee2975470daa02e4ffdd62c6c792b6656edf4811daead52fdc1bf064951fbec7b687192e5d5ee542d5d706140be
diff --git a/media-gfx/digikam/digikam-5.3.0-r1.ebuild b/media-gfx/digikam/digikam-5.3.0-r1.ebuild
deleted file mode 100644
index 60fe095ca33..00000000000
--- a/media-gfx/digikam/digikam-5.3.0-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_HANDBOOK="true"
- KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner video X"
-
-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/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}/core"
-fi
-
-COMMON_DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep ki18n)
- $(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 qtdbus)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/expat
- media-gfx/exiv2:=
- media-libs/lcms:2
- media-libs/liblqr
- >=media-libs/libpgf-6.12.27
- media-libs/libpng:0=
- media-libs/opencv:=[-qt4(-)]
- || ( <media-libs/opencv-3.0.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) )
- gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper:= )
- kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
- lensfun? ( media-libs/lensfun )
- marble? (
- $(add_frameworks_dep kbookmarks)
- $(add_kdeapps_dep marble)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtnetwork)
- )
- mysql? ( virtual/mysql )
- opengl? (
- $(add_qt_dep qtopengl)
- virtual/opengl
- )
- panorama? ( $(add_frameworks_dep threadweaver) )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- video? ( $(add_qt_dep qtmultimedia 'widgets') )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- $(add_qt_dep qtconcurrent)
- dev-cpp/eigen:3
- dev-libs/boost[threads]
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
-"
-RDEPEND="${COMMON_DEPEND}
- media-plugins/kipi-plugins:5
- panorama? ( media-gfx/hugin )
- !media-gfx/digikam:4
-"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=(
- "${FILESDIR}/${P}-db-lock.patch"
- "${FILESDIR}/${P}-clang.patch"
- "${FILESDIR}/${P}-kf-5.31.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_prepare() {
- if [[ ${KDE_BUILD_TYPE} != live ]]; then
- # prepare the translations
- mv "${WORKDIR}/${MY_P}/po" po || die
- find po -name "*.po" -and -not -name "digikam.po" -delete || die
- echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
- echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
- echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
- if use handbook; then
- # subdirs need to be preserved b/c relative paths...
- # doc-translated is, in fact, broken, and ignored
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
- echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die
- echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
- fi
- fi
-
- if ! use marble; then
- punt_bogus_dep Qt5 Network
- fi
-
- kde5_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_APPSTYLES=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_MEDIAPLAYER=$(usex video)
- -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
- $(cmake-utils_use_find_package calendar KF5CalendarCore)
- $(cmake-utils_use_find_package gphoto2 Gphoto2)
- $(cmake-utils_use_find_package jpeg2k Jasper)
- $(cmake-utils_use_find_package kipi KF5Kipi)
- $(cmake-utils_use_find_package lensfun LensFun)
- $(cmake-utils_use_find_package marble Marble)
- $(cmake-utils_use_find_package opengl OpenGL)
- $(cmake-utils_use_find_package openmp OpenMP)
- $(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 X X11)
- )
-
- kde5_src_configure
-}
diff --git a/media-gfx/digikam/digikam-5.3.0-r2.ebuild b/media-gfx/digikam/digikam-5.3.0-r2.ebuild
deleted file mode 100644
index 3f924d9469a..00000000000
--- a/media-gfx/digikam/digikam-5.3.0-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_HANDBOOK="true"
- KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner video X"
-
-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/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}/core"
-fi
-
-COMMON_DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep ki18n)
- $(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 qtdbus)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/expat
- media-gfx/exiv2:=
- media-libs/lcms:2
- media-libs/liblqr
- >=media-libs/libpgf-6.12.27
- media-libs/libpng:0=
- media-libs/opencv:=[-qt4(-)]
- || ( <media-libs/opencv-3.0.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) )
- gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper:= )
- kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
- lensfun? ( media-libs/lensfun )
- marble? (
- $(add_frameworks_dep kbookmarks)
- $(add_kdeapps_dep marble)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtnetwork)
- )
- mysql? ( virtual/mysql )
- opengl? (
- $(add_qt_dep qtopengl)
- virtual/opengl
- )
- panorama? ( $(add_frameworks_dep threadweaver) )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- video? ( $(add_qt_dep qtmultimedia 'widgets') )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- $(add_qt_dep qtconcurrent)
- dev-cpp/eigen:3
- dev-libs/boost[threads]
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
-"
-RDEPEND="${COMMON_DEPEND}
- media-plugins/kipi-plugins:5
- panorama? ( media-gfx/hugin )
- !media-gfx/digikam:4
-"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=(
- "${FILESDIR}/${P}-db-lock.patch"
- "${FILESDIR}/${P}-clang.patch"
- "${FILESDIR}/${P}-kf-5.31.patch"
- "${FILESDIR}/${P}-redeyes-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_prepare() {
- if [[ ${KDE_BUILD_TYPE} != live ]]; then
- # prepare the translations
- mv "${WORKDIR}/${MY_P}/po" po || die
- find po -name "*.po" -and -not -name "digikam.po" -delete || die
- echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
- echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
- echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
- if use handbook; then
- # subdirs need to be preserved b/c relative paths...
- # doc-translated is, in fact, broken, and ignored
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
- echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die
- echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
- fi
- fi
-
- if ! use marble; then
- punt_bogus_dep Qt5 Network
- fi
-
- kde5_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_APPSTYLES=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_MEDIAPLAYER=$(usex video)
- -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
- $(cmake-utils_use_find_package calendar KF5CalendarCore)
- $(cmake-utils_use_find_package gphoto2 Gphoto2)
- $(cmake-utils_use_find_package jpeg2k Jasper)
- $(cmake-utils_use_find_package kipi KF5Kipi)
- $(cmake-utils_use_find_package lensfun LensFun)
- $(cmake-utils_use_find_package marble Marble)
- $(cmake-utils_use_find_package opengl OpenGL)
- $(cmake-utils_use_find_package openmp OpenMP)
- $(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 X X11)
- )
-
- kde5_src_configure
-}
diff --git a/media-gfx/digikam/files/digikam-5.3.0-clang.patch b/media-gfx/digikam/files/digikam-5.3.0-clang.patch
deleted file mode 100644
index b4af04cd19e..00000000000
--- a/media-gfx/digikam/files/digikam-5.3.0-clang.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-commit 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date: Wed Jan 18 10:13:20 2017 +0100
-
- Fix compilation with clang
-
-diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h
-index 4ba89c9..d7e6c77 100644
---- a/libs/database/imagehistory/imagehistorygraph_boost.h
-+++ b/libs/database/imagehistory/imagehistorygraph_boost.h
-@@ -28,7 +28,7 @@
- #include "digikam_config.h"
-
- // Pragma directives to reduce warnings from Boost header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
- #endif
-@@ -1554,7 +1554,7 @@ protected:
- } // namespace Digikam
-
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
-
-diff --git a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
-index f5d0640..91e443d 100644
---- a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
-+++ b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
-@@ -52,7 +52,7 @@
- #define GREYSTORATION_USING_GFACT 1
-
- // Pragma directives to reduce warnings from CImg header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
- #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-@@ -71,7 +71,7 @@
- #include "cimg/CImg.h"
-
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
-
-diff --git a/libs/dimg/filters/randomnumbergenerator.cpp b/libs/dimg/filters/randomnumbergenerator.cpp
-index 93d7cc4..d7b2ed8 100644
---- a/libs/dimg/filters/randomnumbergenerator.cpp
-+++ b/libs/dimg/filters/randomnumbergenerator.cpp
-@@ -26,7 +26,7 @@
- // Boost includes
-
- // Pragma directives to reduce warnings from Boost header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wundef"
- #endif
-@@ -44,7 +44,7 @@
- #include <boost/random/variate_generator.hpp>
-
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
-
-diff --git a/libs/dimg/filters/sharp/matrix.cpp b/libs/dimg/filters/sharp/matrix.cpp
-index 4f32aa3..1a3c65a 100644
---- a/libs/dimg/filters/sharp/matrix.cpp
-+++ b/libs/dimg/filters/sharp/matrix.cpp
-@@ -43,7 +43,7 @@
- // Eigen includes
-
- // Pragma directives to reduce warnings from Eigen header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-@@ -53,7 +53,7 @@
- #include <Eigen/LU>
-
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
-
-diff --git a/libs/dmetadata/metaengine_p.cpp b/libs/dmetadata/metaengine_p.cpp
-index 2c83b58..2b44e06 100644
---- a/libs/dmetadata/metaengine_p.cpp
-+++ b/libs/dmetadata/metaengine_p.cpp
-@@ -49,7 +49,7 @@ extern "C"
- #include "digikam_debug.h"
-
- // Pragma directives to reduce warnings from Exiv2.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #endif
-@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar)
- } // namespace Digikam
-
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
-
-diff --git a/libs/jpegutils/jpegutils.cpp b/libs/jpegutils/jpegutils.cpp
-index c823f40..60c7469 100644
---- a/libs/jpegutils/jpegutils.cpp
-+++ b/libs/jpegutils/jpegutils.cpp
-@@ -53,7 +53,7 @@ extern "C"
- }
-
- // Pragma directives to reduce warnings from libjpeg transupp header file.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-parameter"
- #endif
-@@ -69,7 +69,7 @@ extern "C"
- }
-
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
-
-diff --git a/libs/rawengine/drawdecoder_p.h b/libs/rawengine/drawdecoder_p.h
-index a27e199..ea653b4 100644
---- a/libs/rawengine/drawdecoder_p.h
-+++ b/libs/rawengine/drawdecoder_p.h
-@@ -31,7 +31,7 @@
- #include <QByteArray>
-
- // Pragma directives to reduce warnings from LibRaw header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #endif
-@@ -46,7 +46,7 @@
- #include <libraw.h>
-
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
-
diff --git a/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch b/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch
deleted file mode 100644
index 50223f01184..00000000000
--- a/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From f37ef2c195b61a43a40e9cbb7f119fdc8e9d38f4 Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Sat, 10 Dec 2016 11:16:50 +0100
-Subject: fix locked database with BQM
-
----
- utilities/queuemanager/manager/actionthread.cpp | 27 ++++++++++++++++++++++---
- utilities/queuemanager/manager/actionthread.h | 1 +
- utilities/queuemanager/manager/task.cpp | 24 +++++-----------------
- 3 files changed, 30 insertions(+), 22 deletions(-)
-
-diff --git a/utilities/queuemanager/manager/actionthread.cpp b/utilities/queuemanager/manager/actionthread.cpp
-index 48c3fa3..141bb3d 100644
---- a/utilities/queuemanager/manager/actionthread.cpp
-+++ b/utilities/queuemanager/manager/actionthread.cpp
-@@ -28,6 +28,7 @@
-
- #include "digikam_debug.h"
- #include "digikam_config.h"
-+#include "collectionscanner.h"
- #include "task.h"
-
- namespace Digikam
-@@ -82,7 +83,7 @@ void ActionThread::processQueueItems(const QList<AssignedBatchTools>& items)
- {
- ActionJobCollection collection;
-
-- for(int i = 0 ; i < items.size() ; i++)
-+ for (int i = 0 ; i < items.size() ; i++)
- {
- Task* const t = new Task();
- t->setSettings(d->settings);
-@@ -92,10 +93,12 @@ void ActionThread::processQueueItems(const QList<AssignedBatchTools>& items)
- this, SIGNAL(signalStarting(Digikam::ActionData)));
-
- connect(t, SIGNAL(signalFinished(Digikam::ActionData)),
-- this, SIGNAL(signalFinished(Digikam::ActionData)));
-+ this, SLOT(slotUpdateImageInfo(Digikam::ActionData)),
-+ Qt::BlockingQueuedConnection);
-
- connect(this, SIGNAL(signalCancelTask()),
-- t, SLOT(slotCancel()), Qt::QueuedConnection);
-+ t, SLOT(slotCancel()),
-+ Qt::QueuedConnection);
-
- collection.insert(t, 0);
- }
-@@ -111,6 +114,24 @@ void ActionThread::cancel()
- ActionThreadBase::cancel();
- }
-
-+void ActionThread::slotUpdateImageInfo(const Digikam::ActionData& ad)
-+{
-+ if (ad.status == ActionData::BatchDone)
-+ {
-+ CollectionScanner scanner;
-+ ImageInfo source = ImageInfo::fromUrl(ad.fileUrl);
-+ qlonglong id = scanner.scanFile(ad.destUrl.toLocalFile(), CollectionScanner::NormalScan);
-+ ImageInfo info(id);
-+ QDateTime dateTime = info.dateTime();
-+ // Copy the digiKam attributes from original file to the new file
-+ CollectionScanner::copyFileProperties(source, info);
-+ // Restore date time from new file
-+ info.setDateTime(dateTime);
-+ }
-+
-+ emit signalFinished(ad);
-+}
-+
- void ActionThread::slotThreadFinished()
- {
- if (isEmpty())
-diff --git a/utilities/queuemanager/manager/actionthread.h b/utilities/queuemanager/manager/actionthread.h
-index 8cb848b..3375c2e 100644
---- a/utilities/queuemanager/manager/actionthread.h
-+++ b/utilities/queuemanager/manager/actionthread.h
-@@ -72,6 +72,7 @@ Q_SIGNALS:
-
- private Q_SLOTS:
-
-+ void slotUpdateImageInfo(const Digikam::ActionData& ad);
- void slotThreadFinished();
-
- private:
-diff --git a/utilities/queuemanager/manager/task.cpp b/utilities/queuemanager/manager/task.cpp
-index a94b4f9..4c6b710 100644
---- a/utilities/queuemanager/manager/task.cpp
-+++ b/utilities/queuemanager/manager/task.cpp
-@@ -46,10 +46,8 @@ extern "C"
- #include "dimg.h"
- #include "dmetadata.h"
- #include "imageinfo.h"
--#include "fileactionmngr.h"
- #include "batchtool.h"
- #include "batchtoolsmanager.h"
--#include "collectionscanner.h"
- #include "fileoperation.h"
-
- namespace Digikam
-@@ -245,27 +243,15 @@ void Task::run()
- }
- }
-
-- if (!FileOperation::localFileRename(d->tools.m_itemUrl.toLocalFile(),
-- outUrl.toLocalFile(),
-- dest.toLocalFile()))
-+ if (FileOperation::localFileRename(d->tools.m_itemUrl.toLocalFile(),
-+ outUrl.toLocalFile(),
-+ dest.toLocalFile()))
- {
-- emitActionData(ActionData::BatchFailed, i18n("Failed to create file..."), dest);
-+ emitActionData(ActionData::BatchDone, i18n("Item processed successfully %1", renameMess), dest);
- }
- else
- {
-- // -- Now copy the digiKam attributes from original file to the new file ------------
--
-- CollectionScanner scanner;
-- qlonglong id = scanner.scanFile(dest.toLocalFile(), CollectionScanner::NormalScan);
--
-- ImageInfo destInfo(id);
-- CollectionScanner::copyFileProperties(source, destInfo);
--
-- // -- Read again new file that the database is up to date ---------------------------
--
-- scanner.scanFile(destInfo, CollectionScanner::Rescan);
--
-- emitActionData(ActionData::BatchDone, i18n("Item processed successfully %1", renameMess), dest);
-+ emitActionData(ActionData::BatchFailed, i18n("Failed to create file..."), dest);
- }
- }
- else
---
-cgit v0.11.2
-
diff --git a/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch b/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch
deleted file mode 100644
index ab648ef3daf..00000000000
--- a/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-commit 3793b47b6f57a627911bcce819b1ecc2dc9e422a
-Author: Kevin Funk <kfunk@kde.org>
-Date: Wed Jan 18 13:34:55 2017 +0100
-
- Fix compilation with new KDECompilerSettings.cmake
-
-diff --git a/app/utils/libopencv.h.cmake.in b/app/utils/libopencv.h.cmake.in
-index cc58b7c..6abf642 100644
---- a/app/utils/libopencv.h.cmake.in
-+++ b/app/utils/libopencv.h.cmake.in
-@@ -27,7 +27,7 @@
- #define LIB_OPEN_CV_H
-
- // Pragma directives to reduce warnings from OpenCV header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
- #pragma GCC diagnostic ignored "-Woverloaded-virtual"
-@@ -82,7 +82,7 @@
- #endif
-
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
-
-diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt
-index c5d9c27..14a7180 100644
---- a/libs/database/CMakeLists.txt
-+++ b/libs/database/CMakeLists.txt
-@@ -10,6 +10,9 @@ if (POLICY CMP0063)
- cmake_policy(SET CMP0063 NEW)
- endif (POLICY CMP0063)
-
-+# Boost uses operator names (and, not, ...)
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+
- set(libdatabasecore_SRCS
- server/databaseserverstarter.cpp
- server/databaseservererror.cpp
-diff --git a/libs/dimg/CMakeLists.txt b/libs/dimg/CMakeLists.txt
-index 3bcada5..04a0a22 100644
---- a/libs/dimg/CMakeLists.txt
-+++ b/libs/dimg/CMakeLists.txt
-@@ -11,6 +11,9 @@ endif (POLICY CMP0063)
-
- kde_enable_exceptions()
-
-+# Boost uses operator names (and, not, ...)
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+
- set(libdimg_SRCS
- dimg.cpp
- drawdecoding.cpp
-commit b318820530a4f001bc6621532b5416bf3c4a43cf
-Author: Kevin Funk <kfunk@kde.org>
-Date: Wed Jan 18 15:20:36 2017 +0100
-
- tests/dimg needs -fno-operator-names dropped, too
-
-diff --git a/tests/dimg/CMakeLists.txt b/tests/dimg/CMakeLists.txt
-index 6d9e6d6..5133f88 100644
---- a/tests/dimg/CMakeLists.txt
-+++ b/tests/dimg/CMakeLists.txt
-@@ -8,6 +8,9 @@ if (POLICY CMP0063)
- cmake_policy(SET CMP0063 NEW)
- endif (POLICY CMP0063)
-
-+# Boost uses operator names (and, not, ...)
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+
- include_directories(
- $<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
diff --git a/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch b/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch
deleted file mode 100644
index 055f9be3acd..00000000000
--- a/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 1dad795deb0fbfcef5ad4932f7ade781d35ce17e
-Author: Maik Qualmann <metzpinguin@gmail.com>
-Date: Wed Nov 23 19:37:46 2016 +0100
-
- fix not found shapepredictor.dat file
- BUGS: 372831
- FIXED-IN: 5.4.0
-
-diff --git a/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp b/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp
-index 1cbaefc..a834208 100644
---- a/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp
-+++ b/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp
-@@ -99,14 +99,14 @@ RedEyeCorrectionFilter::~RedEyeCorrectionFilter()
-
- void RedEyeCorrectionFilter::filterImage()
- {
-- if (d->sp == 0)
-+ if (!d->sp)
- {
- // Loading the shape predictor model
-
-- QList<QString> path = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
-- QString::fromLatin1("digikam/facesengine"),
-- QStandardPaths::LocateDirectory);
-- QFile model(*path.begin() + QLatin1String("/ShapePredictor.dat"));
-+ QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-+ QLatin1String("digikam/facesengine/shapepredictor.dat"));
-+
-+ QFile model(path);
-
- if (model.open(QIODevice::ReadOnly))
- {
-@@ -116,6 +116,10 @@ void RedEyeCorrectionFilter::filterImage()
- dataStream >> *temp;
- d->sp = temp;
- }
-+ else
-+ {
-+ return;
-+ }
- }
-
- cv::Mat intermediateImage;
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index faac150cd06..00059c9b9d3 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -15,6 +15,5 @@
<flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag>
<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
- <flag name="video">Enable video player support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2017-08-06 8:07 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2017-08-06 8:07 UTC (permalink / raw
To: gentoo-commits
commit: e53a832593d385ddf4e2c6304d2265488b0c16ca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 08:06:27 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 6 08:07:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e53a8325
media-gfx/digikam: Fix build w/ cmake-3.9
Thanks-to: Ladislav Jech <archenroot <AT> gmail.com>
Gentoo-bug: 627042
Package-Manager: Portage-2.3.6, Repoman-2.3.1
media-gfx/digikam/digikam-5.5.0.ebuild | 2 +
.../digikam/files/digikam-5.5.0-cmake-3.9.patch | 170 +++++++++++++++++++++
2 files changed, 172 insertions(+)
diff --git a/media-gfx/digikam/digikam-5.5.0.ebuild b/media-gfx/digikam/digikam-5.5.0.ebuild
index 9f508d0ef44..775502a5627 100644
--- a/media-gfx/digikam/digikam-5.5.0.ebuild
+++ b/media-gfx/digikam/digikam-5.5.0.ebuild
@@ -106,6 +106,8 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT=test
# bug 366505
+PATCHES=( "${FILESDIR}/${P}-cmake-3.9.patch" )
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
kde5_pkg_pretend
diff --git a/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch b/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch
new file mode 100644
index 00000000000..d87096a6024
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch
@@ -0,0 +1,170 @@
+commit 7e00441c257e7e9e5dc5ab983fc06046fb72b0c5
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Sat Jul 22 15:46:08 2017 +0200
+
+ fix broken linking stage under MacOS with macports.
+ move database models into libdigikamdatabase.
+ Let's others model in place to be included into libdigikamcore
+
+diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt
+index 7d055363fb..a431a36d7b 100644
+--- a/libs/database/CMakeLists.txt
++++ b/libs/database/CMakeLists.txt
+@@ -13,6 +13,18 @@ endif (POLICY CMP0063)
+ # Boost uses operator names (and, not, ...)
+ string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
++set(libdatabasemodels_SRCS
++ models/imagemodel.cpp
++ models/imagefiltermodel.cpp
++ models/imagefiltermodelpriv.cpp
++ models/imagefiltermodelthreads.cpp
++ models/imagefiltersettings.cpp
++ models/imagelistmodel.cpp
++ models/imagesortsettings.cpp
++ models/imagethumbnailmodel.cpp
++ models/imageversionsmodel.cpp
++)
++
+ set(libdatabasecore_SRCS
+ server/databaseserverstarter.cpp
+ server/databaseservererror.cpp
+@@ -152,10 +164,10 @@ if(ENABLE_DBUS)
+ include_directories($<TARGET_PROPERTY:Qt5::DBus,INTERFACE_INCLUDE_DIRECTORIES>)
+ endif()
+
+-add_library(digikamdatabase_src OBJECT ${digikamdatabase_LIB_SRCS})
++add_library(digikamdatabase_src OBJECT ${digikamdatabase_LIB_SRCS} ${libdatabasemodels_SRCS})
+ add_library(digikamdatabasemain_src OBJECT ${libdatabaseutils_SRCS} ${libimgqsort_SRCS})
+ add_library(digikamdatabasecore_src OBJECT ${libdatabasecore_SRCS})
+-add_library(digikamdatabase SHARED $<TARGET_OBJECTS:digikamdatabase_src> $<TARGET_OBJECTS:digikamdatabasemodels_src>)
++add_library(digikamdatabase $<TARGET_OBJECTS:digikamdatabase_src>)
+
+ generate_export_header(digikamdatabase
+ BASE_NAME digikam_database
+diff --git a/libs/models/imagefiltermodel.cpp b/libs/database/models/imagefiltermodel.cpp
+similarity index 100%
+rename from libs/models/imagefiltermodel.cpp
+rename to libs/database/models/imagefiltermodel.cpp
+diff --git a/libs/models/imagefiltermodel.h b/libs/database/models/imagefiltermodel.h
+similarity index 100%
+rename from libs/models/imagefiltermodel.h
+rename to libs/database/models/imagefiltermodel.h
+diff --git a/libs/models/imagefiltermodelpriv.cpp b/libs/database/models/imagefiltermodelpriv.cpp
+similarity index 100%
+rename from libs/models/imagefiltermodelpriv.cpp
+rename to libs/database/models/imagefiltermodelpriv.cpp
+diff --git a/libs/models/imagefiltermodelpriv.h b/libs/database/models/imagefiltermodelpriv.h
+similarity index 100%
+rename from libs/models/imagefiltermodelpriv.h
+rename to libs/database/models/imagefiltermodelpriv.h
+diff --git a/libs/models/imagefiltermodelthreads.cpp b/libs/database/models/imagefiltermodelthreads.cpp
+similarity index 100%
+rename from libs/models/imagefiltermodelthreads.cpp
+rename to libs/database/models/imagefiltermodelthreads.cpp
+diff --git a/libs/models/imagefiltermodelthreads.h b/libs/database/models/imagefiltermodelthreads.h
+similarity index 100%
+rename from libs/models/imagefiltermodelthreads.h
+rename to libs/database/models/imagefiltermodelthreads.h
+diff --git a/libs/models/imagefiltersettings.cpp b/libs/database/models/imagefiltersettings.cpp
+similarity index 100%
+rename from libs/models/imagefiltersettings.cpp
+rename to libs/database/models/imagefiltersettings.cpp
+diff --git a/libs/models/imagefiltersettings.h b/libs/database/models/imagefiltersettings.h
+similarity index 100%
+rename from libs/models/imagefiltersettings.h
+rename to libs/database/models/imagefiltersettings.h
+diff --git a/libs/models/imagelistmodel.cpp b/libs/database/models/imagelistmodel.cpp
+similarity index 100%
+rename from libs/models/imagelistmodel.cpp
+rename to libs/database/models/imagelistmodel.cpp
+diff --git a/libs/models/imagelistmodel.h b/libs/database/models/imagelistmodel.h
+similarity index 100%
+rename from libs/models/imagelistmodel.h
+rename to libs/database/models/imagelistmodel.h
+diff --git a/libs/models/imagemodel.cpp b/libs/database/models/imagemodel.cpp
+similarity index 100%
+rename from libs/models/imagemodel.cpp
+rename to libs/database/models/imagemodel.cpp
+diff --git a/libs/models/imagemodel.h b/libs/database/models/imagemodel.h
+similarity index 100%
+rename from libs/models/imagemodel.h
+rename to libs/database/models/imagemodel.h
+diff --git a/libs/models/imagesortsettings.cpp b/libs/database/models/imagesortsettings.cpp
+similarity index 100%
+rename from libs/models/imagesortsettings.cpp
+rename to libs/database/models/imagesortsettings.cpp
+diff --git a/libs/models/imagesortsettings.h b/libs/database/models/imagesortsettings.h
+similarity index 100%
+rename from libs/models/imagesortsettings.h
+rename to libs/database/models/imagesortsettings.h
+diff --git a/libs/models/imagethumbnailmodel.cpp b/libs/database/models/imagethumbnailmodel.cpp
+similarity index 100%
+rename from libs/models/imagethumbnailmodel.cpp
+rename to libs/database/models/imagethumbnailmodel.cpp
+diff --git a/libs/models/imagethumbnailmodel.h b/libs/database/models/imagethumbnailmodel.h
+similarity index 100%
+rename from libs/models/imagethumbnailmodel.h
+rename to libs/database/models/imagethumbnailmodel.h
+diff --git a/libs/models/imageversionsmodel.cpp b/libs/database/models/imageversionsmodel.cpp
+similarity index 100%
+rename from libs/models/imageversionsmodel.cpp
+rename to libs/database/models/imageversionsmodel.cpp
+diff --git a/libs/models/imageversionsmodel.h b/libs/database/models/imageversionsmodel.h
+similarity index 100%
+rename from libs/models/imageversionsmodel.h
+rename to libs/database/models/imageversionsmodel.h
+diff --git a/libs/models/CMakeLists.txt b/libs/models/CMakeLists.txt
+index cbabfaa9b8..804456b955 100644
+--- a/libs/models/CMakeLists.txt
++++ b/libs/models/CMakeLists.txt
+@@ -9,18 +9,6 @@ if (POLICY CMP0063)
+ cmake_policy(SET CMP0063 NEW)
+ endif (POLICY CMP0063)
+
+-set(libdatabasemodels_SRCS
+- imagemodel.cpp
+- imagefiltermodel.cpp
+- imagefiltermodelpriv.cpp
+- imagefiltermodelthreads.cpp
+- imagefiltersettings.cpp
+- imagelistmodel.cpp
+- imagesortsettings.cpp
+- imagethumbnailmodel.cpp
+- imageversionsmodel.cpp
+-)
+-
+ set(libalbummodels_SRCS
+ imagealbummodel.cpp
+ imagealbumfiltermodel.cpp
+@@ -52,5 +40,4 @@ endif()
+ #for digikam core lib
+ add_library(digikamgenericmodels_src OBJECT ${libgenericmodels_SRCS})
+
+-add_library(digikamdatabasemodels_src OBJECT ${libdatabasemodels_SRCS})
+-add_library(digikammodels_src OBJECT ${libalbummodels_SRCS} ${libgenericmodels_SRCS})
++add_library(digikammodels_src OBJECT ${libalbummodels_SRCS} ${libgenericmodels_SRCS})
+
+From c51043283aa9d2612b88afe0146f0d63c77b08ed Mon Sep 17 00:00:00 2001
+From: Simon Frei <freisim93@gmail.com>
+Date: Wed, 2 Aug 2017 12:12:55 +0200
+Subject: cmake: Fix warning: Remove ECMPackageConfigHelpers (unused)
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2aaf56b..9a48492 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,7 +80,6 @@ include(ECMAddTests)
+ include(ECMMarkNonGuiExecutable)
+ include(ECMGenerateHeaders)
+ include(ECMGeneratePriFile)
+-include(ECMPackageConfigHelpers)
+ include(ECMSetupVersion)
+ include(ECMInstallIcons)
+ include(ECMAddAppIcon)
+--
+cgit v0.11.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2019-08-08 16:52 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2019-08-08 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 05f50a1122f113c7e8f8f263b98c08e868b179e6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 8 15:54:50 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 8 16:51:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f50a11
media-gfx/digikam: 6.2.0 version bump
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-6.2.0.ebuild | 150 +++++++++++++++++++++
media-gfx/digikam/files/digikam-6.2.0-cmake.patch | 66 +++++++++
.../files/digikam-6.2.0-googlephoto-upload.patch | 25 ++++
4 files changed, 242 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 7f4d0748a0a..6ddcc5345d9 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,3 @@
DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
DIST digikam-6.1.0.tar.xz 332466544 BLAKE2B 2f9aad537108a905d42bd218052287ccdb76a75e4883990c19a4c12318dbf019fa37b547e1adf4394dad14ab6f2a38d5f0c397060382d525ef7c1cabafa649d6 SHA512 36cffce4fdb751dafc45b2d447fbbd1134b7dc59c19eb6f7aebcf8d66327f6d8a49e787e346984cc842c81dc033ff8f7f8614a81073d99a0c6902770a26053da
+DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild
new file mode 100644
index 00000000000..4478b85ae23
--- /dev/null
+++ b/media-gfx/digikam/digikam-6.2.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}-googlephoto-upload.patch"
+ "${FILESDIR}/${P}-cmake.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.2.0-cmake.patch b/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
new file mode 100644
index 00000000000..f25dd6306af
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
@@ -0,0 +1,66 @@
+From d915828e4db2e7b40e799abc01a6fdb683d2b921 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 c04ee1a9c3..c3762437e6 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
+ )
+
+ 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}
+- 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}
+@@ -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.22.0
+
diff --git a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch b/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
new file mode 100644
index 00000000000..1c182ed7c9e
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
@@ -0,0 +1,25 @@
+From 19490eb10de0444219e8b525bb75513c046d184d Mon Sep 17 00:00:00 2001
+From: Maik Qualmann <metzpinguin@gmail.com>
+Date: Wed, 7 Aug 2019 19:52:13 +0200
+Subject: [PATCH] fix upload error to Google Photo when description contains
+ quotes BUGS: 410692 FIXED-IN: 6.3.0
+
+---
+ core/dplugins/generic/webservices/google/gswindow.cpp | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp
+index a03e683e65..a80eac5cdb 100644
+--- a/core/dplugins/generic/webservices/google/gswindow.cpp
++++ b/core/dplugins/generic/webservices/google/gswindow.cpp
+@@ -594,6 +594,7 @@ void GSWindow::slotStartTransfer()
+ QStringList descriptions = QStringList() << info.title() << info.comment();
+ descriptions.removeAll(QLatin1String(""));
+ temp.description = descriptions.join(QLatin1String("\n\n"));
++ temp.description.replace(QLatin1Char('"'), QLatin1String("\\\""));
+ break;
+ }
+
+--
+2.22.0
+
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2019-09-07 11:58 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2019-09-07 11:58 UTC (permalink / raw
To: gentoo-commits
commit: fb9515fff46d4c559294f5098f21c5bd41422e52
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 6 20:55:12 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 11:57:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb9515ff
media-gfx/digikam: 6.3.0 version bump
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-6.3.0.ebuild | 150 +++++++++++++++++++++
media-gfx/digikam/files/digikam-6.3.0-cmake.patch | 66 +++++++++
.../digikam-6.3.0-googlephoto-import-crash.patch | 85 ++++++++++++
4 files changed, 302 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6f307d653ae..7d00b123f1a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,3 @@
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
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 00000000000..3324004430e
--- /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 00000000000..f14f406d88d
--- /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 00000000000..7a8a7e533a1
--- /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
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2019-09-08 16:18 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2019-09-08 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 8de04c5968b95f8fc7e8f6cd6f09444dfe69c281
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 8 15:46:33 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 8 16:17:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de04c59
media-gfx/digikam: Drop 6.0.0
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-6.0.0.ebuild | 143 ----------------------
media-gfx/digikam/files/digikam-6.0.0-cmake.patch | 62 ----------
3 files changed, 206 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 7d00b123f1a..456779d4ba2 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,2 @@
-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
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild b/media-gfx/digikam/digikam-6.0.0.ebuild
deleted file mode 100644
index 2e6852810eb..00000000000
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4
-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 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) )
- gphoto2? ( media-libs/libgphoto2:= )
- 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" )
-
-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
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- $(cmake-utils_use_find_package calendar KF5CalendarCore)
- $(cmake-utils_use_find_package gphoto2 Gphoto2)
- -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
- $(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.0.0-cmake.patch b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
deleted file mode 100644
index f90067f4812..00000000000
--- a/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0d24a8971700454533c66ab9fc63043c67d44da6 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 | 22 ++++++++++------------
- 1 file changed, 10 insertions(+), 12 deletions(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 27d3819323..17c8aa0320 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -134,16 +134,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
- )
-
- 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)
-@@ -154,10 +152,10 @@ endif()
- # Dependencies For unit tests and CLI test tools
-
- if(BUILD_TESTING)
-- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS
-- Test
-- 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}
-@@ -323,7 +321,7 @@ find_package(OpenGL) # For Presentation tool.
- 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.20.1
-
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2019-12-03 5:04 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2019-12-03 5:04 UTC (permalink / raw
To: gentoo-commits
commit: 9e321ebdb7c1d89da49707236fd2b1b3d856bd9b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 2 17:15:34 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 05:03:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e321ebd
media-gfx/digikam: Drop 6.2.0
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-6.2.0.ebuild | 151 ---------------------
media-gfx/digikam/files/digikam-6.2.0-cmake.patch | 66 ---------
.../files/digikam-6.2.0-googlephoto-upload.patch | 25 ----
.../files/digikam-6.2.0-imagemagick-7.0.8.60.patch | 14 --
5 files changed, 257 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 456779d4ba2..e3a64e0cf2b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild
deleted file mode 100644
index bb0556ae05e..00000000000
--- a/media-gfx/digikam/digikam-6.2.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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,contribdnn] )
- 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}-googlephoto-upload.patch"
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-imagemagick-7.0.8.60.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.2.0-cmake.patch b/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
deleted file mode 100644
index f25dd6306af..00000000000
--- a/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From d915828e4db2e7b40e799abc01a6fdb683d2b921 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 c04ee1a9c3..c3762437e6 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
- )
-
- 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}
-- 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}
-@@ -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.22.0
-
diff --git a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch b/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
deleted file mode 100644
index 1c182ed7c9e..00000000000
--- a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 19490eb10de0444219e8b525bb75513c046d184d Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Wed, 7 Aug 2019 19:52:13 +0200
-Subject: [PATCH] fix upload error to Google Photo when description contains
- quotes BUGS: 410692 FIXED-IN: 6.3.0
-
----
- core/dplugins/generic/webservices/google/gswindow.cpp | 1 +
- 1 files changed, 1 insertions(+)
-
-diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp
-index a03e683e65..a80eac5cdb 100644
---- a/core/dplugins/generic/webservices/google/gswindow.cpp
-+++ b/core/dplugins/generic/webservices/google/gswindow.cpp
-@@ -594,6 +594,7 @@ void GSWindow::slotStartTransfer()
- QStringList descriptions = QStringList() << info.title() << info.comment();
- descriptions.removeAll(QLatin1String(""));
- temp.description = descriptions.join(QLatin1String("\n\n"));
-+ temp.description.replace(QLatin1Char('"'), QLatin1String("\\\""));
- break;
- }
-
---
-2.22.0
-
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
deleted file mode 100644
index 264da2c34f2..00000000000
--- a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2020-02-12 15:21 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2020-02-12 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 89485e67a4051277812b8bc06ca80961b24004f4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 15:14:07 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 15:14:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89485e67
media-gfx/digikam: Drop 6.3.0-r1
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-6.3.0-r1.ebuild | 157 ---------------------
.../digikam-6.3.0-googlephoto-import-crash.patch | 85 -----------
3 files changed, 243 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 65079a279da..06c96471be9 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
deleted file mode 100644
index 7a9327fbcb3..00000000000
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="
- >=dev-util/cmake-3.14.3
- 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_frameworks_dep kcontacts)
- $(add_kdeapps_dep kcontacts)
- )
- $(add_kdeapps_dep akonadi-contacts)
- )
- calendar? ( || (
- $(add_frameworks_dep kcalendarcore)
- $(add_kdeapps_dep kcalcore)
- ) )
- dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] )
- 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=(
- -DBUILD_TESTING=OFF # bug #698192
- -DENABLE_APPSTYLES=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- $(cmake_use_find_package calendar KF5CalendarCore)
- -DENABLE_FACESENGINE_DNN=$(usex dnn)
- $(cmake_use_find_package gphoto2 Gphoto2)
- $(cmake_use_find_package imagemagick ImageMagick)
- $(cmake_use_find_package lensfun LensFun)
- $(cmake_use_find_package marble Marble)
- -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
- $(cmake_use_find_package mediaplayer QtAV)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_INTERNALMYSQL=$(usex mysql)
- $(cmake_use_find_package opengl OpenGL)
- $(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)
- )
-
- kde5_src_configure
-}
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
deleted file mode 100644
index 7a8a7e533a1..00000000000
--- a/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-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
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2020-05-26 14:53 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2020-05-26 14:53 UTC (permalink / raw
To: gentoo-commits
commit: baa782f0ec2bad1dbbca0cb233605ef59e35636d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 14:16:21 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 26 14:32:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa782f0
media-gfx/digikam: 7.0.0_beta3 version bump
Fixes build against Qt 5.15.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-7.0.0_beta3.ebuild | 153 +++++++++++++++++++++
.../files/digikam-7.0.0_beta3-qt-5.15.patch | 51 +++++++
3 files changed, 205 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 06c96471be9..c96abe6cb1e 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
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
diff --git a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
new file mode 100644
index 00000000000..777acac8770
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.0
+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
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/unstable/${PN}/${PV}/"
+ fi
+ SRC_URI+="${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"
+SLOT="5"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+
+BDEPEND="
+ >=dev-util/cmake-3.14.3
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+COMMON_DEPEND="
+ dev-libs/expat
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=media-gfx/exiv2-0.27:=
+ media-libs/lcms:2
+ media-libs/liblqr
+ media-libs/libpng:0=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+ media-libs/tiff:0
+ virtual/jpeg:0
+ addressbook? (
+ >=kde-apps/akonadi-contacts-19.04.3:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ )
+ calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+ gphoto2? ( media-libs/libgphoto2:= )
+ heif? ( media-libs/x265:= )
+ imagemagick? ( media-gfx/imagemagick:= )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=kde-apps/marble-19.04.3:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ )
+ mediaplayer? (
+ media-libs/qtav[opengl]
+ media-video/ffmpeg:=
+ )
+ opengl? (
+ >=dev-qt/qtopengl-${QTMIN}:5
+ virtual/opengl
+ )
+ 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? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ 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 )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
+
+RESTRICT+=" test"
+# bug 366505
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_pretend
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=OFF # bug 698192
+ -DENABLE_APPSTYLES=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ $(cmake_use_find_package calendar KF5CalendarCore)
+ $(cmake_use_find_package gphoto2 Gphoto2)
+ $(cmake_use_find_package heif X265)
+ $(cmake_use_find_package imagemagick ImageMagick)
+ $(cmake_use_find_package lensfun LensFun)
+ $(cmake_use_find_package marble Marble)
+ -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+ $(cmake_use_find_package mediaplayer QtAV)
+ -DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_INTERNALMYSQL=$(usex mysql)
+ $(cmake_use_find_package opengl OpenGL)
+ $(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)
+ )
+
+ ecm_src_configure
+}
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
new file mode 100644
index 00000000000..fe865eb73af
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch
@@ -0,0 +1,51 @@
+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
+
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2021-12-18 17:42 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2021-12-18 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 61895f0899758028e72b7f9461177b34640e1683
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 18 17:36:15 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 18 17:38:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61895f08
media-gfx/digikam: Fix build with >=kde-apps/akonadi-contacts-21.12.0
Closes: https://bugs.gentoo.org/829539
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/digikam-7.3.0-r1.ebuild | 5 +++-
.../files/digikam-7.3.0-akonadi-21.12.0.patch | 31 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.3.0-r1.ebuild b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
index 7f3918113e25..46f064167d80 100644
--- a/media-gfx/digikam/digikam-7.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
@@ -108,7 +108,10 @@ RDEPEND="${COMMON_DEPEND}
panorama? ( media-gfx/hugin )
"
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-akonadi-21.12.0.patch"
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
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
new file mode 100644
index 000000000000..6e4dd25a4028
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch
@@ -0,0 +1,31 @@
+From 95a8ece964681fc6823e968541da2da2da06b3dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
+Date: Sat, 2 Oct 2021 21:50:04 +0300
+Subject: [PATCH] Fix compile for newer Akonadi Build Versions
+
+---
+ core/utilities/extrasupport/addressbook/akonadiiface.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+index 8e43dad0da..cb38036e39 100644
+--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
++++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+@@ -41,7 +41,14 @@
+ #endif
+
+ #include <kjob.h>
++#include <akonadi_version.h>
++
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Item>
++#else
+ #include <AkonadiCore/Item>
++#endif
++
+ #include <Akonadi/Contact/ContactSearchJob>
+ #include <KContacts/Addressee>
+
+--
+2.34.1
+
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2021-12-18 17:42 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2021-12-18 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 024c45ad4532e5a05ec7005e11c46875f79342ad
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 18 17:29:27 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 18 17:38:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024c45ad
media-gfx/digikam: Add missing usedep, fix cmake (again)
Closes: https://bugs.gentoo.org/829539
Closes: https://bugs.gentoo.org/829571
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/digikam-7.3.0-r1.ebuild | 149 ++++++++++++++++++++++
media-gfx/digikam/digikam-7.4.0-r1.ebuild | 147 +++++++++++++++++++++
media-gfx/digikam/files/digikam-7.3.0-cmake.patch | 118 +++++++++++++++++
3 files changed, 414 insertions(+)
diff --git a/media-gfx/digikam/digikam-7.3.0-r1.ebuild b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
new file mode 100644
index 000000000000..7f3918113e25
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+QTMIN=5.15.2
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ MY_P=${PN}-${PV/_/-}
+ if [[ ${PV} =~ rc[0-9]*$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+ fi
+ SRC_URI+="${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"
+SLOT="5"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
+
+# bug 366505
+RESTRICT+=" test"
+
+BDEPEND="
+ >=dev-util/cmake-3.14.3
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+COMMON_DEPEND="
+ dev-libs/expat
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?]
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=media-gfx/exiv2-0.27:=[xmp]
+ media-libs/lcms:2
+ media-libs/liblqr
+ media-libs/libpng:0=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+ media-libs/tiff:0
+ virtual/jpeg:0
+ addressbook? (
+ >=kde-apps/akonadi-contacts-19.04.3:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ )
+ calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+ gphoto2? ( media-libs/libgphoto2:= )
+ heif? ( media-libs/x265:= )
+ imagemagick? ( media-gfx/imagemagick:= )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=kde-apps/marble-19.04.3:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ )
+ mediaplayer? (
+ media-libs/qtav[opengl(+)]
+ media-video/ffmpeg:=
+ )
+ opengl? (
+ >=dev-qt/qtopengl-${QTMIN}:5
+ virtual/opengl
+ )
+ panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+ scanner? ( >=kde-apps/libksane-19.04.3:5 )
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ 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 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_pretend
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=OFF # bug 698192
+ -DENABLE_APPSTYLES=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+ -DENABLE_QWEBENGINE=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
+ $(cmake_use_find_package calendar KF5CalendarCore)
+ $(cmake_use_find_package gphoto2 Gphoto2)
+ $(cmake_use_find_package heif X265)
+ $(cmake_use_find_package imagemagick ImageMagick)
+ $(cmake_use_find_package lensfun LensFun)
+ $(cmake_use_find_package marble Marble)
+ -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+ $(cmake_use_find_package mediaplayer QtAV)
+ -DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_INTERNALMYSQL=$(usex mysql)
+ $(cmake_use_find_package opengl OpenGL)
+ $(cmake_use_find_package panorama KF5ThreadWeaver)
+ $(cmake_use_find_package scanner KF5Sane)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/media-gfx/digikam/digikam-7.4.0-r1.ebuild b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
new file mode 100644
index 000000000000..b9ebebffc487
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.88.0
+QTMIN=5.15.2
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ if [[ ${PV} =~ beta[0-9]$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+ fi
+ SRC_URI+="digiKam-${PV/_/-}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+DESCRIPTION="Digital photo management application"
+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 X"
+
+# bug 366505
+RESTRICT="test"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?]
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=media-gfx/exiv2-0.27:=[xmp]
+ media-libs/lcms:2
+ media-libs/liblqr
+ media-libs/libpng:0=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+ media-libs/tiff:0
+ virtual/jpeg:0
+ addressbook? (
+ >=kde-apps/akonadi-contacts-19.04.3:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ )
+ calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+ gphoto2? ( media-libs/libgphoto2:= )
+ heif? ( media-libs/x265:= )
+ imagemagick? ( media-gfx/imagemagick:= )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=kde-apps/marble-19.04.3:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ )
+ mediaplayer? (
+ media-libs/qtav[opengl(+)]
+ media-video/ffmpeg:=
+ )
+ opengl? (
+ >=dev-qt/qtopengl-${QTMIN}:5
+ virtual/opengl
+ )
+ panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+ scanner? ( >=kde-apps/libksane-19.04.3:5 )
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ 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 )
+"
+BDEPEND="
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_pretend
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=OFF # bug 698192
+ -DENABLE_APPSTYLES=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+ -DENABLE_QWEBENGINE=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ $(cmake_use_find_package calendar KF5CalendarCore)
+ $(cmake_use_find_package gphoto2 Gphoto2)
+ $(cmake_use_find_package heif X265)
+ $(cmake_use_find_package imagemagick ImageMagick)
+ $(cmake_use_find_package lensfun LensFun)
+ $(cmake_use_find_package marble Marble)
+ -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+ $(cmake_use_find_package mediaplayer QtAV)
+ -DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_INTERNALMYSQL=$(usex mysql)
+ $(cmake_use_find_package opengl OpenGL)
+ $(cmake_use_find_package panorama KF5ThreadWeaver)
+ $(cmake_use_find_package scanner KF5Sane)
+ $(cmake_use_find_package semantic-desktop KF5FileMetaData)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-7.3.0-cmake.patch b/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
new file mode 100644
index 000000000000..2b580f92a1cc
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
@@ -0,0 +1,118 @@
+From 370308fb8381b55e7ebfcdd77f1361b49a288f88 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/KF5 detection
+
+---
+ core/CMakeLists.txt | 58 ++++++++++++++++-----------------------------
+ 1 file changed, 20 insertions(+), 38 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 16bba83335..b8cdc59baa 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
+ )
+
+ if(ENABLE_QWEBENGINE)
+- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebEngineWidgets)
++ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
+ else()
+- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebKitWidgets)
++ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
+ endif()
+
+-find_package(Qt5 ${QT_MIN_VERSION}
+- OPTIONAL_COMPONENTS
+- DBus
+- OpenGL
+- XmlPatterns # For Rajce plugin
+-)
++find_package(Qt5DBus ${QT_MIN_VERSION})
++find_package(Qt5OpenGL ${QT_MIN_VERSION})
++find_package(Qt5XmlPatterns ${QT_MIN_VERSION}) # For Rajce plugin
+
+ if(ENABLE_DBUS)
+ if(NOT Qt5DBus_FOUND)
+@@ -86,16 +83,11 @@ 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}
+- QUIET
+- 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} QUIET NO_MODULE)
++ find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE)
+ endif()
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+@@ -113,38 +105,28 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
+ OPTIONAL_COMPONENTS
+ KIO # For Desktop integration (Widgets only).
+ IconThemes # For Desktop integration.
+- FileMetaData # For KDE file indexer support.
+ ThreadWeaver # For Panorama tool.
+ NotifyConfig # KDE desktop application notify configuration.
+ Notifications # KDE desktop notifications integration.
+ )
+
+-find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- AkonadiContact # For KDE Mail Contacts support.
+- Contacts # API for contacts/address book data.
+-)
++find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support.
+
+-find_package(KF5 ${KSANE_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- Sane # For digital scanner support.
+-)
+-
+-find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- CalendarCore # For Calendar tool.
+-)
++find_package(KF5CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool.
+
+ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+ set(HAVE_KCALENDAR_QDATETIME TRUE)
+ endif()
+
+-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND))
+- set(ENABLE_AKONADICONTACTSUPPORT OFF)
++if(ENABLE_AKONADICONTACTSUPPORT)
++ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED
++ AkonadiContact # For KDE Mail Contacts support.
++ Contacts # API for contacts/address book data.
++ )
+ endif()
+
+-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND)
+- set(ENABLE_KFILEMETADATASUPPORT OFF)
++if(ENABLE_KFILEMETADATASUPPORT)
++ find_package(KF5FileMetaData ${KF5_MIN_VERSION} REQUIRED) # For KDE file indexer support.
+ endif()
+
+ # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one.
+@@ -275,7 +257,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.34.1
+
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2022-01-19 8:29 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-01-19 8:29 UTC (permalink / raw
To: gentoo-commits
commit: 7bf7cf6f0c21532ad1a934dfdeab9b61bd5c1338
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 19 07:56:06 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 19 08:29:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf7cf6f
media-gfx/digikam: Drop 7.3.0-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-7.3.0-r1.ebuild | 152 ---------------------
.../files/digikam-7.3.0-akonadi-21.12.0.patch | 31 -----
3 files changed, 184 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index f6db00554838..c4ae0fa1606a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,2 @@
DIST digiKam-7.4.0.tar.xz 339575096 BLAKE2B b7a556cd8d86bbc60530d697d8ffe42c497cd8ff5dd408f7a2afd1106c96804908e15b6faf1d8090f12aaea62e99d90751ea36c6e36a7bbec62b5f194452d0f1 SHA512 aea494c4636255e25db1cee7968cdec49530064f737897940b9e2184d214b77024f31226fa76e099362966e687e5ed05bc8486ae0645c2c18d9bbcc452dd1b6e
DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B 26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6 SHA512 a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
-DIST digikam-7.3.0.tar.xz 256985340 BLAKE2B 9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed SHA512 71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad
diff --git a/media-gfx/digikam/digikam-7.3.0-r1.ebuild b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
deleted file mode 100644
index 46f064167d80..000000000000
--- a/media-gfx/digikam/digikam-7.3.0-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.74.0
-QTMIN=5.15.2
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- MY_P=${PN}-${PV/_/-}
- if [[ ${PV} =~ rc[0-9]*$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
- else
- SRC_URI="mirror://kde/stable/${PN}/${PV}/"
- fi
- SRC_URI+="${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"
-SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
-
-# bug 366505
-RESTRICT+=" test"
-
-BDEPEND="
- >=dev-util/cmake-3.14.3
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
-"
-COMMON_DEPEND="
- dev-libs/expat
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?]
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=media-gfx/exiv2-0.27:=[xmp]
- media-libs/lcms:2
- media-libs/liblqr
- media-libs/libpng:0=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn]
- media-libs/tiff:0
- virtual/jpeg:0
- addressbook? (
- >=kde-apps/akonadi-contacts-19.04.3:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- )
- calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
- gphoto2? ( media-libs/libgphoto2:= )
- heif? ( media-libs/x265:= )
- imagemagick? ( media-gfx/imagemagick:= )
- lensfun? ( media-libs/lensfun )
- marble? (
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-apps/marble-19.04.3:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- )
- mediaplayer? (
- media-libs/qtav[opengl(+)]
- media-video/ffmpeg:=
- )
- opengl? (
- >=dev-qt/qtopengl-${QTMIN}:5
- virtual/opengl
- )
- panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
- scanner? ( >=kde-apps/libksane-19.04.3:5 )
- semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- 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 )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-akonadi-21.12.0.patch"
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- ecm_pkg_pretend
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=OFF # bug 698192
- -DENABLE_APPSTYLES=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
- -DENABLE_QWEBENGINE=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
- $(cmake_use_find_package calendar KF5CalendarCore)
- $(cmake_use_find_package gphoto2 Gphoto2)
- $(cmake_use_find_package heif X265)
- $(cmake_use_find_package imagemagick ImageMagick)
- $(cmake_use_find_package lensfun LensFun)
- $(cmake_use_find_package marble Marble)
- -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
- $(cmake_use_find_package mediaplayer QtAV)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_INTERNALMYSQL=$(usex mysql)
- $(cmake_use_find_package opengl OpenGL)
- $(cmake_use_find_package panorama KF5ThreadWeaver)
- $(cmake_use_find_package scanner KF5Sane)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
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
deleted file mode 100644
index 6e4dd25a4028..000000000000
--- a/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 95a8ece964681fc6823e968541da2da2da06b3dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
-Date: Sat, 2 Oct 2021 21:50:04 +0300
-Subject: [PATCH] Fix compile for newer Akonadi Build Versions
-
----
- core/utilities/extrasupport/addressbook/akonadiiface.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
-index 8e43dad0da..cb38036e39 100644
---- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
-+++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
-@@ -41,7 +41,14 @@
- #endif
-
- #include <kjob.h>
-+#include <akonadi_version.h>
-+
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
-+#include <Akonadi/Item>
-+#else
- #include <AkonadiCore/Item>
-+#endif
-+
- #include <Akonadi/Contact/ContactSearchJob>
- #include <KContacts/Addressee>
-
---
-2.34.1
-
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2022-05-09 0:13 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-05-09 0:13 UTC (permalink / raw
To: gentoo-commits
commit: f9d833272ef7ee42b6f9514fcac499b2dc691e3c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 00:07:28 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 9 00:13:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d83327
media-gfx/digikam: Fix build with kde-apps/akonadi-22.04.0
Closes: https://bugs.gentoo.org/841695
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/digikam-7.5.0.ebuild | 6 ++++-
.../files/digikam-7.5.0-akonadi-22.04.0.patch | 28 ++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild b/media-gfx/digikam/digikam-7.5.0.ebuild
index 1c774239c811..63edd26cbf88 100644
--- a/media-gfx/digikam/digikam-7.5.0.ebuild
+++ b/media-gfx/digikam/digikam-7.5.0.ebuild
@@ -106,7 +106,11 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-7.3.0-cmake.patch"
+ # upstream git master
+ "${FILESDIR}/${P}-akonadi-22.04.0.patch"
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
new file mode 100644
index 000000000000..a2933bc71d3f
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
@@ -0,0 +1,28 @@
+From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 22 Apr 2022 19:13:28 +0200
+Subject: [PATCH] Fix build with akonadi-contacts 22.04
+
+---
+ core/utilities/extrasupport/addressbook/akonadiiface.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+index 6a78863cf6..8e65a405da 100644
+--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
++++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+@@ -49,7 +49,11 @@
+ #include <AkonadiCore/Item>
+ #endif
+
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
++#include <Akonadi/ContactSearchJob>
++#else
+ #include <Akonadi/Contact/ContactSearchJob>
++#endif
+ #include <KContacts/Addressee>
+
+ #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2022-09-14 13:07 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2022-09-14 13:07 UTC (permalink / raw
To: gentoo-commits
commit: b7a2d1dd52fe571e0db36d70644c7a263a9b93c4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 13:03:46 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 13:06:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a2d1dd
media-gfx/digikam: add 7.8.0
Closes: https://bugs.gentoo.org/861341
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-7.8.0.ebuild | 150 ++++++++++++++++++++++
media-gfx/digikam/files/digikam-7.8.0-cmake.patch | 119 +++++++++++++++++
3 files changed, 270 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e6006dd17b38..dc7db88aa272 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B 26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6 SHA512 a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
+DIST digiKam-7.8.0.tar.xz 345431764 BLAKE2B 43fff59b51b98a04ca852cadedafc2792aafa5cf9e90f1ce0ad6174533844c7164e72b623a253d42fc4ea695fa7e4bd6cc954287ac72a35211f9fa564a13cb92 SHA512 d2ec96239760cc06808a73bcbf1a2131653764719d1e23afa8cea8eda449e221b177f2a96ca2a997d1c82a6a4977c4227165c932bdd006d5305cdb4c63f454fc
diff --git a/media-gfx/digikam/digikam-7.8.0.ebuild b/media-gfx/digikam/digikam-7.8.0.ebuild
new file mode 100644
index 000000000000..5919dbb0d5d7
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.8.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.88.0
+QTMIN=5.15.5
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ if [[ ${PV} =~ beta[0-9]$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+ fi
+ SRC_URI+="digiKam-${PV/_/-}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+DESCRIPTION="Digital photo management application"
+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 X"
+
+# bug 366505
+RESTRICT="test"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?]
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=media-gfx/exiv2-0.27:=[xmp]
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/liblqr
+ media-libs/libpng:0=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+ media-libs/tiff:0
+ addressbook? (
+ >=kde-apps/akonadi-contacts-19.04.3:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ )
+ calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+ gphoto2? ( media-libs/libgphoto2:= )
+ heif? (
+ media-libs/libheif:=
+ media-libs/x265:=
+ )
+ imagemagick? ( media-gfx/imagemagick:= )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=kde-apps/marble-19.04.3:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ )
+ mediaplayer? (
+ media-libs/qtav[opengl(+)]
+ media-video/ffmpeg:=
+ )
+ opengl? (
+ >=dev-qt/qtopengl-${QTMIN}:5
+ virtual/opengl
+ )
+ panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+ scanner? ( >=kde-apps/libksane-19.04.3:5 )
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+ mysql? ( virtual/mysql[server(+)] )
+ panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_pretend
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=OFF # bug 698192
+ -DENABLE_APPSTYLES=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+ -DENABLE_QWEBENGINE=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ $(cmake_use_find_package calendar KF5CalendarCore)
+ $(cmake_use_find_package gphoto2 Gphoto2)
+ $(cmake_use_find_package heif Libheif)
+ $(cmake_use_find_package imagemagick ImageMagick)
+ $(cmake_use_find_package lensfun LensFun)
+ $(cmake_use_find_package marble Marble)
+ -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+ $(cmake_use_find_package mediaplayer QtAV)
+ -DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_INTERNALMYSQL=$(usex mysql)
+ $(cmake_use_find_package opengl OpenGL)
+ $(cmake_use_find_package panorama KF5ThreadWeaver)
+ $(cmake_use_find_package scanner KF5Sane)
+ -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-7.8.0-cmake.patch b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
new file mode 100644
index 000000000000..d698626e8c7e
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
@@ -0,0 +1,119 @@
+From 618e3f3ba195a3b50812d1184ebf90555d659055 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/KF5 detection
+
+And if we enable an option, make the necessary libraries REQUIRED.
+---
+ core/CMakeLists.txt | 50 +++++++++++++--------------------------------
+ 1 file changed, 14 insertions(+), 36 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index de599ee881..8aef35e062 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
+ )
+
+ if(ENABLE_QWEBENGINE)
+- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebEngineWidgets)
++ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
+ else()
+- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebKitWidgets)
++ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
+ endif()
+
+-find_package(Qt5 ${QT_MIN_VERSION}
+- OPTIONAL_COMPONENTS
+- DBus
+- OpenGL
+- XmlPatterns # For Rajce plugin
+-)
++find_package(Qt5DBus ${QT_MIN_VERSION})
++find_package(Qt5OpenGL ${QT_MIN_VERSION})
++find_package(Qt5XmlPatterns ${QT_MIN_VERSION}) # For Rajce plugin
+
+ if(ENABLE_DBUS)
+ if(NOT Qt5DBus_FOUND)
+@@ -86,16 +83,11 @@ 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(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
+
+- find_package(Qt5 ${QT_MIN_VERSION}
+- QUIET
+- OPTIONAL_COMPONENTS
+- Qml WebView # Optional, for 'sialis' O2 library test tool.
+- )
++ # Optional, for 'sialis' O2 library test tool.
++ find_package(Qt5Qml ${QT_MIN_VERSION} QUIET NO_MODULE)
++ find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE)
+ endif()
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+@@ -121,7 +113,7 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
+ if(ENABLE_KFILEMETADATASUPPORT)
+
+ find_package(KF5 ${KF5_MIN_VERSION}
+- QUIET
++ REQUIRED
+ OPTIONAL_COMPONENTS
+ FileMetaData # For Plasma destop file indexer support.
+ )
+@@ -130,7 +122,7 @@ endif()
+
+ if(ENABLE_AKONADICONTACTSUPPORT)
+
+- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
++ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED
+ OPTIONAL_COMPONENTS
+ AkonadiContact # For KDE Mail Contacts support.
+ Contacts # API for contacts/address book data.
+@@ -138,28 +130,14 @@ if(ENABLE_AKONADICONTACTSUPPORT)
+
+ endif()
+
+-find_package(KF5 ${KSANE_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- Sane # For digital scanner support.
+-)
++find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support.
+
+-find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- CalendarCore # For Calendar tool.
+-)
++find_package(KF5CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool.
+
+ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+ set(HAVE_KCALENDAR_QDATETIME TRUE)
+ endif()
+
+-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND))
+- set(ENABLE_AKONADICONTACTSUPPORT OFF)
+-endif()
+-
+-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND)
+- set(ENABLE_KFILEMETADATASUPPORT OFF)
+-endif()
+-
+ # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one.
+ if(KF5KIO_FOUND)
+ get_target_property(KIOWidgets_INCLUDE_DIRS KF5::KIOWidgets
+@@ -296,7 +274,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.37.3
+
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2023-08-03 15:34 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2023-08-03 15:34 UTC (permalink / raw
To: gentoo-commits
commit: fb253a2f9374a08cc77241967e859ab6f59386d4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 3 15:18:11 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 3 15:34:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb253a2f
media-gfx/digikam: drop 7.10.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-7.10.0-r1.ebuild | 150 ---------------------
media-gfx/digikam/files/digikam-7.10.0-gcc13.patch | 25 ----
media-gfx/digikam/files/digikam-7.8.0-cmake.patch | 119 ----------------
.../files/digikam-7.9.0-akonadi-23.04.patch | 27 ----
5 files changed, 322 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 95b47c54690a..da935f8858a3 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B 527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64 SHA512 1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27
DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B 0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069 SHA512 cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
diff --git a/media-gfx/digikam/digikam-7.10.0-r1.ebuild b/media-gfx/digikam/digikam-7.10.0-r1.ebuild
deleted file mode 100644
index 5dc278727087..000000000000
--- a/media-gfx/digikam/digikam-7.10.0-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.88.0
-QTMIN=5.15.5
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- if [[ ${PV} =~ beta[0-9]$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
- else
- SRC_URI="mirror://kde/stable/${PN}/${PV}/"
- fi
- SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="amd64 ~x86"
- S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop X"
-
-# bug 366505
-RESTRICT="test"
-
-COMMON_DEPEND="
- dev-libs/expat
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?]
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=media-gfx/exiv2-0.27:=[xmp]
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/liblqr
- media-libs/libpng:=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
- media-libs/tiff:=
- addressbook? (
- >=kde-apps/akonadi-contacts-19.04.3:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- )
- calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
- gphoto2? ( media-libs/libgphoto2:= )
- heif? (
- media-libs/libheif:=
- media-libs/x265:=
- )
- imagemagick? ( media-gfx/imagemagick:= )
- lensfun? ( media-libs/lensfun )
- marble? (
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-apps/marble-19.04.3:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- )
- opengl? (
- >=dev-qt/qtopengl-${QTMIN}:5
- virtual/opengl
- )
- panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
- scanner? ( >=kde-apps/libksane-19.04.3:5 )
- semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-libs/boost
- addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- mysql? ( virtual/mysql[server(+)] )
- panorama? ( media-gfx/hugin )
-"
-BDEPEND="
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.8.0-cmake.patch"
- "${FILESDIR}/${PN}-7.9.0-akonadi-23.04.patch" # bug 904976
- "${FILESDIR}/${P}-gcc13.patch"
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- ecm_pkg_pretend
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=OFF # bug 698192
- -DENABLE_APPSTYLES=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
- -DENABLE_MEDIAPLAYER=OFF # bug 758641, last-rited
- -DENABLE_QWEBENGINE=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- $(cmake_use_find_package calendar KF5CalendarCore)
- $(cmake_use_find_package gphoto2 Gphoto2)
- $(cmake_use_find_package heif Libheif)
- $(cmake_use_find_package imagemagick ImageMagick)
- $(cmake_use_find_package lensfun LensFun)
- $(cmake_use_find_package marble Marble)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_INTERNALMYSQL=$(usex mysql)
- $(cmake_use_find_package opengl OpenGL)
- $(cmake_use_find_package panorama KF5ThreadWeaver)
- $(cmake_use_find_package scanner KF5Sane)
- -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
diff --git a/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch b/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch
deleted file mode 100644
index 98e78df74d8c..000000000000
--- a/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9c4fed4b5562c777fc6639ead9bcc95faacdb992 Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Sun, 26 Mar 2023 13:19:40 +0200
-Subject: [PATCH] fix compile DNG-SDK with GCC13
-
----
- core/libs/dngwriter/extra/dng_sdk/dng_string.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
-index 4e76fc4c86a..7814aff145d 100644
---- a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
-+++ b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
-@@ -27,7 +27,7 @@
- # endif
- #endif
-
--#if qiPhone || qAndroid
-+#if qLinux || qiPhone || qAndroid
- #include <ctype.h> // for isdigit
- #endif
-
---
-GitLab
-
diff --git a/media-gfx/digikam/files/digikam-7.8.0-cmake.patch b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
deleted file mode 100644
index d698626e8c7e..000000000000
--- a/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 618e3f3ba195a3b50812d1184ebf90555d659055 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/KF5 detection
-
-And if we enable an option, make the necessary libraries REQUIRED.
----
- core/CMakeLists.txt | 50 +++++++++++++--------------------------------
- 1 file changed, 14 insertions(+), 36 deletions(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index de599ee881..8aef35e062 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
- )
-
- if(ENABLE_QWEBENGINE)
-- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebEngineWidgets)
-+ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
- else()
-- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebKitWidgets)
-+ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
- endif()
-
--find_package(Qt5 ${QT_MIN_VERSION}
-- OPTIONAL_COMPONENTS
-- DBus
-- OpenGL
-- XmlPatterns # For Rajce plugin
--)
-+find_package(Qt5DBus ${QT_MIN_VERSION})
-+find_package(Qt5OpenGL ${QT_MIN_VERSION})
-+find_package(Qt5XmlPatterns ${QT_MIN_VERSION}) # For Rajce plugin
-
- if(ENABLE_DBUS)
- if(NOT Qt5DBus_FOUND)
-@@ -86,16 +83,11 @@ 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(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
-
-- find_package(Qt5 ${QT_MIN_VERSION}
-- QUIET
-- OPTIONAL_COMPONENTS
-- Qml WebView # Optional, for 'sialis' O2 library test tool.
-- )
-+ # Optional, for 'sialis' O2 library test tool.
-+ find_package(Qt5Qml ${QT_MIN_VERSION} QUIET NO_MODULE)
-+ find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE)
- endif()
-
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-@@ -121,7 +113,7 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
- if(ENABLE_KFILEMETADATASUPPORT)
-
- find_package(KF5 ${KF5_MIN_VERSION}
-- QUIET
-+ REQUIRED
- OPTIONAL_COMPONENTS
- FileMetaData # For Plasma destop file indexer support.
- )
-@@ -130,7 +122,7 @@ endif()
-
- if(ENABLE_AKONADICONTACTSUPPORT)
-
-- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
-+ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED
- OPTIONAL_COMPONENTS
- AkonadiContact # For KDE Mail Contacts support.
- Contacts # API for contacts/address book data.
-@@ -138,28 +130,14 @@ if(ENABLE_AKONADICONTACTSUPPORT)
-
- endif()
-
--find_package(KF5 ${KSANE_MIN_VERSION} QUIET
-- OPTIONAL_COMPONENTS
-- Sane # For digital scanner support.
--)
-+find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support.
-
--find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET
-- OPTIONAL_COMPONENTS
-- CalendarCore # For Calendar tool.
--)
-+find_package(KF5CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool.
-
- if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
- set(HAVE_KCALENDAR_QDATETIME TRUE)
- endif()
-
--if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND))
-- set(ENABLE_AKONADICONTACTSUPPORT OFF)
--endif()
--
--if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND)
-- set(ENABLE_KFILEMETADATASUPPORT OFF)
--endif()
--
- # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one.
- if(KF5KIO_FOUND)
- get_target_property(KIOWidgets_INCLUDE_DIRS KF5::KIOWidgets
-@@ -296,7 +274,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.37.3
-
diff --git a/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch b/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch
deleted file mode 100644
index d9b46a7966f0..000000000000
--- a/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5b4ba173f6a84a8be1131b1523dc42df95171ec7 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Thu, 20 Apr 2023 17:49:44 +0200
-Subject: [PATCH] Fix build with akonadi 23.04
-
-In KDE PIM 23.04 the KF5:: targets have been renamed to KPim5::
-While the KF5:: targets are kept for backwards compatibility, they no longer recursively include other KF5:: targets.
-We need to search for Akonadi explicitly so that the KF5::AkonadiCore target is defined.
----
- core/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 4cb33d2f9e6..610033425cd 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -124,6 +124,7 @@ if(ENABLE_AKONADICONTACTSUPPORT)
-
- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET REQUIRED
- OPTIONAL_COMPONENTS
-+ Akonadi
- AkonadiContact # For KDE Mail Contacts support.
- Contacts # API for contacts/address book data.
- )
---
-GitLab
-
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2023-08-26 10:32 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2023-08-26 10:32 UTC (permalink / raw
To: gentoo-commits
commit: ec20f1d83e744fbeb7310fc3cf31be0e8faa6630
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 09:42:17 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 10:31:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec20f1d8
media-gfx/digikam: Fix build with >=kde-apps/akonadi-contact-23.08
Closes: https://bugs.gentoo.org/913046
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/digikam-8.1.0-r1.ebuild | 12 +++++++++
media-gfx/digikam/files/digikam-8.1.0-cmake.patch | 31 ++++++++++++-----------
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
index 3eebbe374fb0..1480188f76bc 100644
--- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -122,6 +122,18 @@ pkg_setup() {
ecm_pkg_setup
}
+src_prepare() {
+ ecm_src_prepare
+ if has_version ">=kde-apps/akonadi-contacts-23.08.0"; then
+ sed -e "/KF5[:]*Akonadi/s/KF5/KPim5/" \
+ -i core/CMakeLists.txt \
+ core/utilities/extrasupport/CMakeLists.txt \
+ core/utilities/extrasupport/addressbook/CMakeLists.txt \
+ core/app/DigikamCoreTarget.cmake \
+ core/cmake/rules/RulesKDEFramework.cmake || die
+ fi
+}
+
# FIXME: Unbundle libraw (libs/rawengine/libraw)
src_configure() {
local mycmakeargs=(
diff --git a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
index 16c1ffa5c37d..8e1f71e661a1 100644
--- a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
+++ b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
@@ -1,20 +1,20 @@
-From 05b6e81bd4ceca8d6166aa0a000919cde2bfde3e Mon Sep 17 00:00:00 2001
+From 5171575601ebc553cb747a2757caf63b433820b3 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 Qt/KF5 detection
And if we enable an option, make the necessary libraries REQUIRED.
---
- core/cmake/rules/RulesKDEFramework.cmake | 34 +++-----------
+ core/cmake/rules/RulesKDEFramework.cmake | 41 +++--------------
core/cmake/rules/RulesQtFramework.cmake | 58 +++++-------------------
core/cmake/rules/RulesX11.cmake | 7 +--
- 3 files changed, 18 insertions(+), 81 deletions(-)
+ 3 files changed, 19 insertions(+), 87 deletions(-)
diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake
-index 610033425c..2d8acc7956 100644
+index 610033425c..3ea9b1351d 100644
--- a/core/cmake/rules/RulesKDEFramework.cmake
+++ b/core/cmake/rules/RulesKDEFramework.cmake
-@@ -26,19 +26,15 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
+@@ -26,35 +26,20 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
)
if(ENABLE_KFILEMETADATASUPPORT)
@@ -30,16 +30,17 @@ index 610033425c..2d8acc7956 100644
if(ENABLE_AKONADICONTACTSUPPORT)
-
+-
- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
- OPTIONAL_COMPONENTS
-+ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED
-+ COMPONENTS
- Akonadi
- AkonadiContact # For KDE Mail Contacts support.
- Contacts # API for contacts/address book data.
-@@ -46,15 +42,9 @@ if(ENABLE_AKONADICONTACTSUPPORT)
-
+- Akonadi
+- AkonadiContact # For KDE Mail Contacts support.
+- Contacts # API for contacts/address book data.
+- )
+-
++ find_package(KF5Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
++ find_package(KF5AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
++ find_package(KF5Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for contacts/address book data.
endif()
-find_package(KF5 ${KSANE_MIN_VERSION} QUIET
@@ -56,7 +57,7 @@ index 610033425c..2d8acc7956 100644
if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
-@@ -62,18 +52,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+@@ -62,18 +47,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
endif()
@@ -175,5 +176,5 @@ index d7659eed34..9c145970b2 100644
set(HAVE_X11 TRUE)
--
-2.41.0
+2.42.0
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2023-12-26 8:59 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2023-12-26 8:59 UTC (permalink / raw
To: gentoo-commits
commit: 3a6f76cb9b62df941aa0b3d933449baf8e45198a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 08:57:06 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 08:59:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a6f76cb
media-gfx/digikam: add 8.2.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-8.2.0.ebuild | 162 ++++++++++++++++++
.../digikam/files/digikam-8.2.0-akonadi.patch | 95 +++++++++++
media-gfx/digikam/files/digikam-8.2.0-cmake.patch | 181 +++++++++++++++++++++
4 files changed, 439 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index da935f8858a3..9fa06bb1336f 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B 0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069 SHA512 cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
+DIST digiKam-8.2.0.tar.xz 48172600 BLAKE2B 436f8dcd905ff993cfde3e358e27ac23cb4ad49d24a6328cda209a742874e9fcbc12da507095e2f75a167b653bb1d9e579438bf517e2911f2cb32705230023f1 SHA512 a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb
diff --git a/media-gfx/digikam/digikam-8.2.0.ebuild b/media-gfx/digikam/digikam-8.2.0.ebuild
new file mode 100644
index 000000000000..0c699038a243
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.2.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ if [[ ${PV} =~ beta[0-9]$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+ fi
+ SRC_URI+="digiKam-${PV/_/-}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop spell"
+
+# bug 366505
+RESTRICT="test"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtnetworkauth-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?]
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=media-gfx/exiv2-0.27.1:=[xmp]
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/liblqr
+ media-libs/libpng:=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+ media-libs/tiff:=
+ x11-libs/libX11
+ addressbook? (
+ >=kde-apps/akonadi-contacts-19.04.3:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ )
+ calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+ gphoto2? ( media-libs/libgphoto2:= )
+ heif? (
+ media-libs/libheif:=
+ media-libs/x265:=
+ )
+ imagemagick? ( media-gfx/imagemagick:= )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=kde-apps/marble-19.04.3:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ )
+ opengl? (
+ >=dev-qt/qtopengl-${QTMIN}:5
+ virtual/opengl
+ )
+ panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+ scanner? ( >=kde-apps/libksane-19.04.3:5 )
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost
+ addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-libs/exiftool
+ mysql? ( virtual/mysql[server(+)] )
+ panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-{cmake,akonadi}.patch )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_pretend
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_setup
+}
+
+src_prepare() {
+ ecm_src_prepare
+ if has_version ">=kde-apps/akonadi-contacts-23.08.0"; then
+ sed -e "/KF5[:]*Akonadi/s/KF5/KPim5/" \
+ -i core/CMakeLists.txt \
+ core/utilities/extrasupport/CMakeLists.txt \
+ core/utilities/extrasupport/addressbook/CMakeLists.txt \
+ core/app/DigikamCoreTarget.cmake \
+ core/cmake/rules/RulesKDEFramework.cmake || die
+ fi
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_WITH_CCACHE=OFF
+ -DBUILD_WITH_QT6=OFF # KF6 not stable upstream yet
+ -DBUILD_TESTING=OFF # bug 698192
+ -DENABLE_APPSTYLES=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+ -DENABLE_MEDIAPLAYER=OFF # bug 758641; bundled as of 8.0, KDE-bug 448681
+ -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
+ -DENABLE_QWEBENGINE=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ $(cmake_use_find_package calendar KF5CalendarCore)
+ $(cmake_use_find_package gphoto2 Gphoto2)
+ $(cmake_use_find_package heif Libheif)
+ $(cmake_use_find_package imagemagick ImageMagick)
+ $(cmake_use_find_package lensfun LensFun)
+ $(cmake_use_find_package marble Marble)
+ -DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_INTERNALMYSQL=$(usex mysql)
+ $(cmake_use_find_package opengl OpenGL)
+ $(cmake_use_find_package panorama KF5ThreadWeaver)
+ $(cmake_use_find_package scanner KF5Sane)
+ $(cmake_use_find_package spell KF5Sonnet)
+ -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
+ )
+
+ ecm_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-8.2.0-akonadi.patch b/media-gfx/digikam/files/digikam-8.2.0-akonadi.patch
new file mode 100644
index 000000000000..4e2954d0f0de
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-8.2.0-akonadi.patch
@@ -0,0 +1,95 @@
+From 90e00bb17bea76030c3b532c2156d040e202c4a2 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 1 Dec 2023 23:22:53 +0100
+Subject: [PATCH] Fix build against >=akonadi-contacts-23.08
+
+---
+ core/CMakeLists.txt | 2 +-
+ core/app/DigikamCoreTarget.cmake | 6 +++---
+ core/utilities/extrasupport/CMakeLists.txt | 2 +-
+ core/utilities/extrasupport/addressbook/CMakeLists.txt | 10 +++++-----
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 8115ddc6ca..c5940b1d6e 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -270,7 +270,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("bison" "https://www.gnu.org/software/
+ PRINT_OPTIONAL_LIBRARY_STATUS("doxygen" "https://github.com/doxygen/doxygen" "(version >= 1.8.0)" "digiKam will be compiled without API documentation building support." Doxygen_FOUND)
+ PRINT_OPTIONAL_LIBRARY_STATUS("ccache" "https://ccache.dev" "(version >= 3.0.0)" "digiKam will be compiled without CCACHE build support." HAVE_CCACHE)
+ PRINT_OPTIONAL_LIBRARY_STATUS("flex" "https://github.com/westes/flex" "(version >= 2.5.0)" "digiKam will be compiled without Panorama support." FLEX_FOUND)
+-PRINT_OPTIONAL_LIBRARY_STATUS("libakonadicontact" "https://invent.kde.org/pim/akonadi-contacts" "(version >= ${AKONADI_MIN_VERSION})" "digiKam will be compiled without KDE desktop address book support." KF${QT_VERSION_MAJOR}AkonadiContact_FOUND)
++PRINT_OPTIONAL_LIBRARY_STATUS("libakonadicontact" "https://invent.kde.org/pim/akonadi-contacts" "(version >= ${AKONADI_MIN_VERSION})" "digiKam will be compiled without KDE desktop address book support." KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND)
+ PRINT_OPTIONAL_LIBRARY_STATUS("libimagemagick" "https://github.com/ImageMagick/ImageMagick.git" "(version >= 6.7.0)" "digiKam will be compiled without ImageMagick codecs." HAVE_IMAGE_MAGICK)
+ PRINT_OPTIONAL_LIBRARY_STATUS("libeigen3" "https://github.com/eigenteam/eigen-git-mirror" "(version >= 3.0.0)" "digiKam will be compiled without Refocus tool support." Eigen3_FOUND)
+ PRINT_OPTIONAL_LIBRARY_STATUS("libgphoto2" "https://github.com/gphoto/libgphoto2" "(version >= 2.4.0)" "digiKam will be compiled without GPhoto2 camera drivers support." Gphoto2_FOUND)
+diff --git a/core/app/DigikamCoreTarget.cmake b/core/app/DigikamCoreTarget.cmake
+index 5ba888e259..2cc8807079 100644
+--- a/core/app/DigikamCoreTarget.cmake
++++ b/core/app/DigikamCoreTarget.cmake
+@@ -81,7 +81,7 @@ if(KF${QT_VERSION_MAJOR}FileMetaData_FOUND)
+
+ endif()
+
+-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND)
++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND)
+
+ set(DIGIKAMCORE_OBJECTS
+ ${DIGIKAMCORE_OBJECTS}
+@@ -395,11 +395,11 @@ if(KF${QT_VERSION_MAJOR}FileMetaData_FOUND)
+
+ endif()
+
+-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND)
++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND)
+
+ target_link_libraries(digikamcore
+ PRIVATE
+- KF${QT_VERSION_MAJOR}::AkonadiContact
++ KPim${QT_VERSION_MAJOR}::AkonadiContact
+ )
+
+ endif()
+diff --git a/core/utilities/extrasupport/CMakeLists.txt b/core/utilities/extrasupport/CMakeLists.txt
+index 910961937e..f911522b58 100644
+--- a/core/utilities/extrasupport/CMakeLists.txt
++++ b/core/utilities/extrasupport/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ #
+
+-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND)
++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND)
+ add_subdirectory(addressbook)
+ endif()
+
+diff --git a/core/utilities/extrasupport/addressbook/CMakeLists.txt b/core/utilities/extrasupport/addressbook/CMakeLists.txt
+index e44a67d4dd..8ecc8fee4e 100644
+--- a/core/utilities/extrasupport/addressbook/CMakeLists.txt
++++ b/core/utilities/extrasupport/addressbook/CMakeLists.txt
+@@ -14,9 +14,9 @@ include_directories($<TARGET_PROPERTY:Qt${QT_VERSION_MAJOR}::Widgets,INTERFACE_I
+ $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::I18n,INTERFACE_INCLUDE_DIRECTORIES>
+ )
+
+-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND)
++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND)
+ include_directories(
+- $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES>
++ $<TARGET_PROPERTY:KPim${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::Contacts,INTERFACE_INCLUDE_DIRECTORIES>
+
+ $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::CoreAddons,INTERFACE_INCLUDE_DIRECTORIES>
+@@ -35,7 +35,7 @@ add_library(akonadiiface STATIC $<TARGET_OBJECTS:core_akonadiiface_obj>)
+
+ target_link_libraries(akonadiiface PRIVATE Qt${QT_VERSION_MAJOR}::Core KF${QT_VERSION_MAJOR}::I18n)
+
+-if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND)
+- target_include_directories(core_akonadiiface_obj PRIVATE $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::AkonadiContact,INTERFACE_INCLUDE_DIRECTORIES>)
+- target_link_libraries(akonadiiface PRIVATE KF${QT_VERSION_MAJOR}::AkonadiContact KF${QT_VERSION_MAJOR}::Contacts)
++if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND)
++ target_include_directories(core_akonadiiface_obj PRIVATE $<TARGET_PROPERTY:KPim${QT_VERSION_MAJOR}::AkonadiContact,INTERFACE_INCLUDE_DIRECTORIES>)
++ target_link_libraries(akonadiiface PRIVATE KPim${QT_VERSION_MAJOR}::AkonadiContact KF${QT_VERSION_MAJOR}::Contacts)
+ endif()
+--
+2.43.0
+
diff --git a/media-gfx/digikam/files/digikam-8.2.0-cmake.patch b/media-gfx/digikam/files/digikam-8.2.0-cmake.patch
new file mode 100644
index 000000000000..8ca9e4a3b8d2
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-8.2.0-cmake.patch
@@ -0,0 +1,181 @@
+From 433d0148be1cedea7e318bf3603fd17f906e721c 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 Qt/KF detection
+
+And if we enable an option, make the necessary libraries REQUIRED.
+---
+ core/cmake/rules/RulesKDEFramework.cmake | 41 +++-------------
+ core/cmake/rules/RulesQtFramework.cmake | 59 +++++-------------------
+ core/cmake/rules/RulesX11.cmake | 7 +--
+ 3 files changed, 19 insertions(+), 88 deletions(-)
+
+diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake
+index 9c646d0112..defa399391 100644
+--- a/core/cmake/rules/RulesKDEFramework.cmake
++++ b/core/cmake/rules/RulesKDEFramework.cmake
+@@ -26,35 +26,20 @@ find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
+ )
+
+ if(ENABLE_KFILEMETADATASUPPORT)
+-
+- find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- FileMetaData # For Plasma desktop file indexer support.
+- )
+-
++ # For Plasma desktop file indexer support.
++ find_package(KF${QT_VERSION_MAJOR}FileMetaData ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED)
+ endif()
+
+
+ if(ENABLE_AKONADICONTACTSUPPORT)
+-
+- find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- Akonadi
+- AkonadiContact # For KDE Mail Contacts support.
+- Contacts # API for contacts/address book data.
+- )
+-
++ find_package(KF${QT_VERSION_MAJOR}Contacts ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) # API for contacts/address book data.
++ find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
++ find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
+ endif()
+
+-find_package(KF${QT_VERSION_MAJOR} ${KSANE_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- Sane # For digital scanner support.
+-)
++find_package(KF${QT_VERSION_MAJOR}Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support.
+
+-find_package(KF${QT_VERSION_MAJOR} ${CALENDAR_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- CalendarCore # For Calendar tool.
+-)
++find_package(KF${QT_VERSION_MAJOR}CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool.
+
+ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+
+@@ -62,18 +47,6 @@ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+
+ endif()
+
+-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF${QT_VERSION_MAJOR}AkonadiContact_FOUND OR NOT KF${QT_VERSION_MAJOR}Contacts_FOUND))
+-
+- set(ENABLE_AKONADICONTACTSUPPORT OFF)
+-
+-endif()
+-
+-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF${QT_VERSION_MAJOR}FileMetaData_FOUND)
+-
+- set(ENABLE_KFILEMETADATASUPPORT OFF)
+-
+-endif()
+-
+ # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one.
+
+ if(KF${QT_VERSION_MAJOR}KIO_FOUND)
+diff --git a/core/cmake/rules/RulesQtFramework.cmake b/core/cmake/rules/RulesQtFramework.cmake
+index 495ce4f4ef..0c58f3552a 100644
+--- a/core/cmake/rules/RulesQtFramework.cmake
++++ b/core/cmake/rules/RulesQtFramework.cmake
+@@ -18,48 +18,19 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+ )
+
+ if(ENABLE_QWEBENGINE)
+-
+- find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+- NO_MODULE
+- COMPONENTS
+- WebEngineWidgets
+- )
+-
++ find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets REQUIRED NO_MODULE)
+ else()
+-
+- find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+- NO_MODULE
+- COMPONENTS
+- WebKitWidgets
+- )
+-
++ find_package(Qt${QT_VERSION_MAJOR}WebKitWidgets REQUIRED NO_MODULE)
+ endif()
+
+-find_package(Qt${QT_VERSION_MAJOR}
+- OPTIONAL_COMPONENTS
+- DBus
+- OpenGL
+-)
++find_package(Qt${QT_VERSION_MAJOR}DBus)
++find_package(Qt${QT_VERSION_MAJOR}OpenGL)
+
+ if(Qt6_FOUND)
+-
+- find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+- NO_MODULE COMPONENTS
+- StateMachine
+- )
+-
+- find_package(Qt${QT_VERSION_MAJOR}
+- OPTIONAL_COMPONENTS
+- OpenGLWidgets
+- )
+-
++ find_package(Qt${QT_VERSION_MAJOR}StateMachine REQUIRED NO_MODULE)
++ find_package(Qt${QT_VERSION_MAJOR}OpenGLWidgets)
+ else()
+-
+- find_package(Qt${QT_VERSION_MAJOR}
+- OPTIONAL_COMPONENTS
+- XmlPatterns # For Rajce plugin
+- )
+-
++ find_package(Qt${QT_VERSION_MAJOR}XmlPatterns) # For Rajce plugin
+ endif()
+
+ if(ENABLE_DBUS)
+@@ -75,17 +46,9 @@ endif()
+ # Qt Dependencies For unit tests and CLI test tools
+
+ if(BUILD_TESTING)
++ find_package(Qt${QT_VERSION_MAJOR}Test REQUIRED NO_MODULE)
+
+- find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+- NO_MODULE
+- COMPONENTS
+- Test
+- )
+-
+- find_package(Qt${QT_VERSION_MAJOR}
+- QUIET
+- OPTIONAL_COMPONENTS
+- Qml WebView # Optional, for 'sialis' O2 library test tool.
+- )
+-
++ # Optional, for 'sialis' O2 library test tool.
++ find_package(Qt${QT_VERSION_MAJOR}Qml QUIET NO_MODULE)
++ find_package(Qt${QT_VERSION_MAJOR}WebView QUIET NO_MODULE)
+ endif()
+diff --git a/core/cmake/rules/RulesX11.cmake b/core/cmake/rules/RulesX11.cmake
+index d7659eed34..9c145970b2 100644
+--- a/core/cmake/rules/RulesX11.cmake
++++ b/core/cmake/rules/RulesX11.cmake
+@@ -11,12 +11,7 @@ find_package(X11)
+ if(X11_FOUND)
+
+ if(NOT Qt6_FOUND)
+-
+- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE
+- COMPONENTS
+- X11Extras
+- )
+-
++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
+ endif()
+
+ set(HAVE_X11 TRUE)
+--
+2.43.0
+
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2024-03-25 14:46 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2024-03-25 14:46 UTC (permalink / raw
To: gentoo-commits
commit: 618f27a796065b2f0e48d85d1cd2c3affddffc76
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 14:00:44 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 14:45:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618f27a7
media-gfx/digikam: add 8.3.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-8.3.0.ebuild | 148 +++++++++++++++++
media-gfx/digikam/files/digikam-8.3.0-cmake.patch | 192 ++++++++++++++++++++++
3 files changed, 341 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index c25e1b879012..5511dff9e23a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digiKam-8.2.0.tar.xz 48172600 BLAKE2B 436f8dcd905ff993cfde3e358e27ac23cb4ad49d24a6328cda209a742874e9fcbc12da507095e2f75a167b653bb1d9e579438bf517e2911f2cb32705230023f1 SHA512 a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb
+DIST digiKam-8.3.0-1.tar.xz 55664168 BLAKE2B 46b0f26bb781d370c1046fd6de6afb0a0878175f9722a2fc9ed23aad89eb0671f8b219bb7c169ccd22d440ce493d958304a5a527a733862fe4e2c5cd07da8a21 SHA512 c2fdcecafa68641f08b31286d1b9c44828164a0a0bea607fb64a71c73ff53417cdfefa110245adab164fae8ea0980ea86cd69d693dcd43a96bb188197dc78fcd
diff --git a/media-gfx/digikam/digikam-8.3.0.ebuild b/media-gfx/digikam/digikam-8.3.0.ebuild
new file mode 100644
index 000000000000..cc2ba25def3e
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.3.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ TARNAME="digiKam-${PV/_/-}-1"
+ if [[ ${PV} =~ beta[0-9]$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz"
+ else
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
+ fi
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop spell"
+
+# bug 366505
+RESTRICT="test"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtnetworkauth-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?]
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=media-gfx/exiv2-0.27.1:=[xmp]
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/liblqr
+ media-libs/libpng:=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+ media-libs/tiff:=
+ x11-libs/libX11
+ addressbook? (
+ >=kde-apps/akonadi-contacts-23.08.3:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ )
+ calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+ gphoto2? ( media-libs/libgphoto2:= )
+ heif? (
+ media-libs/libheif:=
+ media-libs/x265:=
+ )
+ imagemagick? ( media-gfx/imagemagick:= )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=kde-apps/marble-23.08.3:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ )
+ opengl? (
+ >=dev-qt/qtopengl-${QTMIN}:5
+ virtual/opengl
+ )
+ panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+ scanner? ( >=kde-apps/libksane-23.08.3:5 )
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost
+ addressbook? ( >=kde-apps/akonadi-23.08.3:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-libs/exiftool
+ mysql? ( virtual/mysql[server(+)] )
+ panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+ sys-devel/gettext
+ panorama? (
+ app-alternatives/lex
+ app-alternatives/yacc
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_pretend
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_WITH_QT6=OFF # KF6 not stable upstream yet
+ -DBUILD_TESTING=OFF # bug 698192
+ -DENABLE_APPSTYLES=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+ -DENABLE_MEDIAPLAYER=OFF # bug 758641; bundled as of 8.0, KDE-bug 448681
+ -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
+ -DENABLE_QWEBENGINE=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ $(cmake_use_find_package calendar KF5CalendarCore)
+ $(cmake_use_find_package gphoto2 Gphoto2)
+ $(cmake_use_find_package heif Libheif)
+ $(cmake_use_find_package imagemagick ImageMagick)
+ $(cmake_use_find_package lensfun LensFun)
+ $(cmake_use_find_package marble Marble)
+ -DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_INTERNALMYSQL=$(usex mysql)
+ $(cmake_use_find_package opengl OpenGL)
+ $(cmake_use_find_package panorama KF5ThreadWeaver)
+ $(cmake_use_find_package scanner KF5Sane)
+ $(cmake_use_find_package spell KF5Sonnet)
+ -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
+ )
+
+ ecm_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-8.3.0-cmake.patch b/media-gfx/digikam/files/digikam-8.3.0-cmake.patch
new file mode 100644
index 000000000000..03438e3f2245
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-8.3.0-cmake.patch
@@ -0,0 +1,192 @@
+From c6ae81abf56851c818285d555e192c660635247b 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 Qt/KF detection
+
+And if we enable an option, make the necessary libraries REQUIRED.
+---
+ core/cmake/rules/RulesKDEFramework.cmake | 43 +++--------------
+ core/cmake/rules/RulesQtFramework.cmake | 61 +++++-------------------
+ core/cmake/rules/RulesX11.cmake | 7 +--
+ 3 files changed, 20 insertions(+), 91 deletions(-)
+
+diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake
+index e34e5f4a8d..3cde25928f 100644
+--- a/core/cmake/rules/RulesKDEFramework.cmake
++++ b/core/cmake/rules/RulesKDEFramework.cmake
+@@ -26,26 +26,15 @@ find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
+ )
+
+ if(ENABLE_KFILEMETADATASUPPORT)
+-
+- find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- FileMetaData # For Plasma desktop file indexer support.
+- )
+-
++ # For Plasma desktop file indexer support.
++ find_package(KF${QT_VERSION_MAJOR}FileMetaData ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED)
+ endif()
+
+
+ if(ENABLE_AKONADICONTACTSUPPORT)
+-
+- find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- Akonadi
+- AkonadiContact # For KDE Mail Contacts support.
+- Contacts # API for contacts/address book data.
+- )
+- find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
+- find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET)
+-
++ find_package(KF${QT_VERSION_MAJOR}Contacts ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) # API for contacts/address book data.
++ find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
++ find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
+ endif()
+
+ if(Qt6_FOUND)
+@@ -54,17 +43,11 @@ if(Qt6_FOUND)
+
+ else()
+
+- find_package(KF${QT_VERSION_MAJOR} ${KSANE_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- Sane # For digital scanner support.
+- )
++ find_package(KF${QT_VERSION_MAJOR}Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support.
+
+ endif()
+
+-find_package(KF${QT_VERSION_MAJOR} ${CALENDAR_MIN_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- CalendarCore # For Calendar tool.
+-)
++find_package(KF${QT_VERSION_MAJOR}CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool.
+
+ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+
+@@ -72,18 +55,6 @@ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+
+ endif()
+
+-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND OR NOT KPim${QT_VERSION_MAJOR}Contacts_FOUND))
+-
+- set(ENABLE_AKONADICONTACTSUPPORT OFF)
+-
+-endif()
+-
+-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF${QT_VERSION_MAJOR}FileMetaData_FOUND)
+-
+- set(ENABLE_KFILEMETADATASUPPORT OFF)
+-
+-endif()
+-
+ # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one.
+
+ if(ENABLE_KIO)
+diff --git a/core/cmake/rules/RulesQtFramework.cmake b/core/cmake/rules/RulesQtFramework.cmake
+index 6f233ccfbc..7e29a09a40 100644
+--- a/core/cmake/rules/RulesQtFramework.cmake
++++ b/core/cmake/rules/RulesQtFramework.cmake
+@@ -19,49 +19,20 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+ )
+
+ if(ENABLE_QWEBENGINE)
+-
+- find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+- NO_MODULE
+- COMPONENTS
+- WebEngineWidgets
+- )
+-
++ find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets REQUIRED NO_MODULE)
+ else()
+-
+- find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+- NO_MODULE
+- COMPONENTS
+- WebKitWidgets
+- )
+-
++ find_package(Qt${QT_VERSION_MAJOR}WebKitWidgets REQUIRED NO_MODULE)
+ endif()
+
+-find_package(Qt${QT_VERSION_MAJOR}
+- OPTIONAL_COMPONENTS
+- DBus
+- OpenGL
+-)
++find_package(Qt${QT_VERSION_MAJOR}DBus)
++find_package(Qt${QT_VERSION_MAJOR}OpenGL)
+
+ if(Qt6_FOUND)
+-
+- find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+- NO_MODULE COMPONENTS
+- StateMachine
+- SvgWidgets
+- )
+-
+- find_package(Qt${QT_VERSION_MAJOR}
+- OPTIONAL_COMPONENTS
+- OpenGLWidgets
+- )
+-
++ find_package(Qt${QT_VERSION_MAJOR}StateMachine REQUIRED NO_MODULE)
++ find_package(Qt${QT_VERSION_MAJOR}SvgWidgets REQUIRED NO_MODULE)
++ find_package(Qt${QT_VERSION_MAJOR}OpenGLWidgets)
+ else()
+-
+- find_package(Qt${QT_VERSION_MAJOR}
+- OPTIONAL_COMPONENTS
+- XmlPatterns # For Rajce plugin
+- )
+-
++ find_package(Qt${QT_VERSION_MAJOR}XmlPatterns) # For Rajce plugin
+ endif()
+
+ if(ENABLE_DBUS)
+@@ -77,17 +48,9 @@ endif()
+ # Qt Dependencies For unit tests and CLI test tools
+
+ if(BUILD_TESTING)
++ find_package(Qt${QT_VERSION_MAJOR}Test REQUIRED NO_MODULE)
+
+- find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+- NO_MODULE
+- COMPONENTS
+- Test
+- )
+-
+- find_package(Qt${QT_VERSION_MAJOR}
+- QUIET
+- OPTIONAL_COMPONENTS
+- Qml WebView # Optional, for 'sialis' O2 library test tool.
+- )
+-
++ # Optional, for 'sialis' O2 library test tool.
++ find_package(Qt${QT_VERSION_MAJOR}Qml QUIET NO_MODULE)
++ find_package(Qt${QT_VERSION_MAJOR}WebView QUIET NO_MODULE)
+ endif()
+diff --git a/core/cmake/rules/RulesX11.cmake b/core/cmake/rules/RulesX11.cmake
+index d7830f3923..4401a57c87 100644
+--- a/core/cmake/rules/RulesX11.cmake
++++ b/core/cmake/rules/RulesX11.cmake
+@@ -11,12 +11,7 @@ find_package(X11)
+ if(X11_FOUND)
+
+ if(NOT Qt6_FOUND)
+-
+- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE
+- COMPONENTS
+- X11Extras
+- )
+-
++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
+ endif()
+
+ set(HAVE_X11 TRUE)
+--
+2.44.0
+
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
@ 2024-03-26 12:59 Andreas Sturmlechner
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Sturmlechner @ 2024-03-26 12:59 UTC (permalink / raw
To: gentoo-commits
commit: c3f608950506703a0b4fa667b638434ee8d22cf2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 12:56:13 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 12:59:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f60895
media-gfx/digikam: Fix IUSE addressbook
Closes: https://bugs.gentoo.org/927858
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/digikam-8.3.0.ebuild | 14 +++++-------
.../files/digikam-8.3.0-cmake-addressbook.patch | 26 ++++++++++++++++++++++
2 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/media-gfx/digikam/digikam-8.3.0.ebuild b/media-gfx/digikam/digikam-8.3.0.ebuild
index cc2ba25def3e..887be4124f06 100644
--- a/media-gfx/digikam/digikam-8.3.0.ebuild
+++ b/media-gfx/digikam/digikam-8.3.0.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.digikam.org/"
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop spell"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell"
# bug 366505
RESTRICT="test"
@@ -74,11 +74,6 @@ COMMON_DEPEND="
)
imagemagick? ( media-gfx/imagemagick:= )
lensfun? ( media-libs/lensfun )
- marble? (
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-apps/marble-23.08.3:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- )
opengl? (
>=dev-qt/qtopengl-${QTMIN}:5
virtual/opengl
@@ -106,7 +101,10 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-cmake-addressbook.patch"
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -130,11 +128,11 @@ src_configure() {
-DENABLE_QWEBENGINE=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake_use_find_package calendar KF5CalendarCore)
+ -DENABLE_GEOLOCATION=$(usex geolocation)
$(cmake_use_find_package gphoto2 Gphoto2)
$(cmake_use_find_package heif Libheif)
$(cmake_use_find_package imagemagick ImageMagick)
$(cmake_use_find_package lensfun LensFun)
- $(cmake_use_find_package marble Marble)
-DENABLE_MYSQLSUPPORT=$(usex mysql)
-DENABLE_INTERNALMYSQL=$(usex mysql)
$(cmake_use_find_package opengl OpenGL)
diff --git a/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch b/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch
new file mode 100644
index 000000000000..537a36990404
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch
@@ -0,0 +1,26 @@
+From 82ce7f02d65c43605c28b9ca69f8cbd7e12a5bee Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 26 Mar 2024 13:23:51 +0100
+Subject: [PATCH] addressbook: Fix upstream's AkonadiCore prefix confusion
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ core/utilities/extrasupport/addressbook/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/utilities/extrasupport/addressbook/CMakeLists.txt b/core/utilities/extrasupport/addressbook/CMakeLists.txt
+index 5923f1fc34..23f31d01d8 100644
+--- a/core/utilities/extrasupport/addressbook/CMakeLists.txt
++++ b/core/utilities/extrasupport/addressbook/CMakeLists.txt
+@@ -16,7 +16,7 @@ include_directories($<TARGET_PROPERTY:Qt${QT_VERSION_MAJOR}::Widgets,INTERFACE_I
+
+ if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND)
+ include_directories(
+- $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES>
++ $<TARGET_PROPERTY:KPim${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::Contacts,INTERFACE_INCLUDE_DIRECTORIES>
+
+ $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::CoreAddons,INTERFACE_INCLUDE_DIRECTORIES>
+--
+2.44.0
+
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2024-03-26 12:59 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-27 12:17 [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2024-03-26 12:59 Andreas Sturmlechner
2024-03-25 14:46 Andreas Sturmlechner
2023-12-26 8:59 Andreas Sturmlechner
2023-08-26 10:32 Andreas Sturmlechner
2023-08-03 15:34 Andreas Sturmlechner
2022-09-14 13:07 Andreas Sturmlechner
2022-05-09 0:13 Andreas Sturmlechner
2022-01-19 8:29 Andreas Sturmlechner
2021-12-18 17:42 Andreas Sturmlechner
2021-12-18 17:42 Andreas Sturmlechner
2020-05-26 14:53 Andreas Sturmlechner
2020-02-12 15:21 Andreas Sturmlechner
2019-12-03 5:04 Andreas Sturmlechner
2019-09-08 16:18 Andreas Sturmlechner
2019-09-07 11:58 Andreas Sturmlechner
2019-08-08 16:52 Andreas Sturmlechner
2017-08-06 8:07 Andreas Sturmlechner
2017-02-18 23:33 Andreas Sturmlechner
2017-02-12 23:09 Andreas Sturmlechner
2016-12-11 10:12 Johannes Huber
2016-10-31 19:04 Johannes Huber
2016-08-17 20:47 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox