From 407525b571b48cfd65e1ad7a02d250a927c967c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Dec 2017 03:04:39 +0000 Subject: gentoo resync : 01.12.2017 --- media-gfx/digikam/Manifest | 5 +- media-gfx/digikam/digikam-5.7.0-r1.ebuild | 170 +++++++++++++++++++++ media-gfx/digikam/digikam-5.7.0.ebuild | 168 -------------------- .../digikam/files/digikam-5.7.0-qt-5.9.3.patch | 32 ++++ 4 files changed, 205 insertions(+), 170 deletions(-) create mode 100644 media-gfx/digikam/digikam-5.7.0-r1.ebuild delete mode 100644 media-gfx/digikam/digikam-5.7.0.ebuild create mode 100644 media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch (limited to 'media-gfx/digikam') diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index a9099d452a59..0d9f74fde61b 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,6 +1,7 @@ AUX digikam-5.5.0-cmake-3.9.patch 7298 BLAKE2B d4c9085b9d65977dad1932cbd57f132c8aee844827d28dd74b4ab3ce8dea199ce959306f56064f5abe0a6acaad11c2c45f3932444bda79bb72520ab68c240320 SHA512 0a0f33f8b288fc98b95397ff615ab747bb78e35f8b6ed517e814dfebd32dd3f626f0c232d5b45a69bf80c4b548b72932fb376ce2308b0786b196e7fcdeda9b19 +AUX digikam-5.7.0-qt-5.9.3.patch 1137 BLAKE2B bf369d28083de46d11444eea8ddd35ccc1aa8d052bcd48d8da04a14737d404238717cc70eec7681931f46a455f2e1b441fd1851d3df12d19d8f5653fcc9b2847 SHA512 bfd453d6f4212dfd3e2402d0bba73f9498c04264a7199119fe117a9af834aa95bd12ac8cb2df8be063a8120bbfe159d52f96229692ac7258c4128909dbbffe61 DIST digikam-5.5.0.tar.xz 129499600 SHA256 df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252 SHA512 3c64774916d4804d932009ba3753d387ecf31e9e3d435c580497d3badb6cc3e57ab5ef1a2334a23379d0987d96dd107be4f01adbb63039f4510aa94ac6d71344 WHIRLPOOL e67b444975ad37e939b2f62bba949bcafb41eee2975470daa02e4ffdd62c6c792b6656edf4811daead52fdc1bf064951fbec7b687192e5d5ee542d5d706140be -DIST digikam-5.7.0.tar.xz 123315064 SHA256 3605ffb5b6e8fbd6b725e5075f74f505d7edee7531789c2882d11df2d20150f5 SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4 WHIRLPOOL b452919ce9bcf8ccc8434586ace23b96b68b76f49d7229d418b2dc5883e9646c79fb99ecd660d732b8d96efc3a49b70d218756b09a3f16ef9f7f2b174679be70 +DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4 EBUILD digikam-5.5.0.ebuild 4754 BLAKE2B 15740067a8a2da70baa564d5dbac7af3998c65975dc48938b67c52326ff500fecc35e6d1a7cdaa7e2b75cefca3ab0354d1c45a742b65a6e9bc2f428f6b60dfeb SHA512 19dd72651406bb4f3a899aa2e4e4ea6c650c5b33963bd9c437510c355349baeea89a91e7394868d57f3b73cf24433833428076cf574429dc9224c2799a08ed19 -EBUILD digikam-5.7.0.ebuild 4808 BLAKE2B d041011b2dc676d3ee25cca0345c0faa5c90aec564578d2fa0d0d1ac04e40293312d27313c7674efbf35fddf983bb1923f6693652a5283baae5056d73c3753b2 SHA512 da8fd9cbf5c4100856bd5c0dd161cc1e3dfc1aac6e33807e863a4c35ab14fb037bfc7b8da4cbdfeaf2ea22d803588225def5277fb5d87021f0a89c8609a45de5 +EBUILD digikam-5.7.0-r1.ebuild 4855 BLAKE2B 7f3d5e6002b3daccee31f1c7ab7fe9a57824bdf4f31d50b4319b07e71c5ecbd476f6c6140b84497b4fbc8fa5cfa707d358b0afa69a0883dc9689018e4726321e SHA512 c6836145cc5cc8b69b66da9494ef0d7101a7fd4c9df1779d1bd2a296ae14f9da88384a7fb58e79c56c53d8c731b1b027145e858b6b919642cfb7bdeada0d5954 MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab diff --git a/media-gfx/digikam/digikam-5.7.0-r1.ebuild b/media-gfx/digikam/digikam-5.7.0-r1.ebuild new file mode 100644 index 000000000000..62c259e566c2 --- /dev/null +++ b/media-gfx/digikam/digikam-5.7.0-r1.ebuild @@ -0,0 +1,170 @@ +# 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" +IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X" + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + KEYWORDS="~amd64 ~x86" + 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 + +# TODO: Package QtAV http://www.qtav.org/ +# video? ( media-video/qtav ) +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 qtprintsupport) + $(add_qt_dep qtsql 'mysql?') + $(add_qt_dep qtwebkit) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-libs/expat + >=media-gfx/exiv2-0.26:= + media-libs/lcms:2 + media-libs/liblqr + media-libs/libpng:0= + media-libs/opencv:=[-qt4(-)] + || ( =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) + ) + mediaplayer? ( media-libs/qtav[opengl] ) + mysql? ( virtual/mysql[server] ) + opengl? ( + $(add_qt_dep qtopengl) + virtual/opengl + ) + panorama? ( $(add_frameworks_dep threadweaver) ) + scanner? ( $(add_kdeapps_dep libksane) ) + semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + ) +" +DEPEND="${COMMON_DEPEND} + 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}-qt-5.9.3.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_MEDIAPLAYER=$(usex mediaplayer) + -DENABLE_MYSQLSUPPORT=$(usex mysql) + -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 mediaplayer QtAV) + $(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.7.0.ebuild b/media-gfx/digikam/digikam-5.7.0.ebuild deleted file mode 100644 index f5836f87eb1a..000000000000 --- a/media-gfx/digikam/digikam-5.7.0.ebuild +++ /dev/null @@ -1,168 +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" -IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - KEYWORDS="~amd64 ~x86" - 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 - -# TODO: Package QtAV http://www.qtav.org/ -# video? ( media-video/qtav ) -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 qtprintsupport) - $(add_qt_dep qtsql 'mysql?') - $(add_qt_dep qtwebkit) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-libs/expat - >=media-gfx/exiv2-0.26:= - media-libs/lcms:2 - media-libs/liblqr - media-libs/libpng:0= - media-libs/opencv:=[-qt4(-)] - || ( =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) - ) - mediaplayer? ( media-libs/qtav[opengl] ) - mysql? ( virtual/mysql[server] ) - opengl? ( - $(add_qt_dep qtopengl) - virtual/opengl - ) - panorama? ( $(add_frameworks_dep threadweaver) ) - scanner? ( $(add_kdeapps_dep libksane) ) - semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - 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 - -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_MEDIAPLAYER=$(usex mediaplayer) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -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 mediaplayer QtAV) - $(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.7.0-qt-5.9.3.patch b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch new file mode 100644 index 000000000000..7001850cd9c4 --- /dev/null +++ b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch @@ -0,0 +1,32 @@ +From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001 +From: Maik Qualmann +Date: Tue, 28 Nov 2017 21:29:00 +0100 +Subject: try to fix the Qt-5.9.3 empty album problem CCBUGS: 387373 + +* asturm: Fix build w/ Qt-5.7 +--- + libs/database/coredb/coredburl.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/libs/database/coredb/coredburl.cpp b/libs/database/coredb/coredburl.cpp +index 2c0d0eb..b1bdf71 100644 +--- a/libs/database/coredb/coredburl.cpp ++++ b/libs/database/coredb/coredburl.cpp +@@ -88,8 +88,13 @@ CoreDbUrl CoreDbUrl::fromAlbumAndName(const QString& name, + const DbEngineParameters& parameters) + { + CoreDbUrl url; ++ QString path(album); + url.setScheme(QLatin1String("digikamalbums")); +- url.setPath(QLatin1Char('/') + album + QLatin1Char('/') + name); ++ ++ if (path != QLatin1String("/")) ++ path += QLatin1Char('/'); ++ ++ url.setPath(path + name); + + QUrlQuery q(url); + q.addQueryItem(QLatin1String("albumRoot"), albumRoot.adjusted(QUrl::StripTrailingSlash).toLocalFile()); +-- +cgit v0.11.2 + -- cgit v1.2.3