From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-gfx/digikam/Manifest | 8 + media-gfx/digikam/digikam-5.5.0.ebuild | 169 ++++++++++++++++++++ media-gfx/digikam/digikam-5.7.0.ebuild | 168 ++++++++++++++++++++ .../digikam/files/digikam-5.5.0-cmake-3.9.patch | 170 +++++++++++++++++++++ media-gfx/digikam/metadata.xml | 20 +++ 5 files changed, 535 insertions(+) create mode 100644 media-gfx/digikam/Manifest create mode 100644 media-gfx/digikam/digikam-5.5.0.ebuild create mode 100644 media-gfx/digikam/digikam-5.7.0.ebuild create mode 100644 media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch create mode 100644 media-gfx/digikam/metadata.xml (limited to 'media-gfx/digikam') diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest new file mode 100644 index 000000000000..588fb489247e --- /dev/null +++ b/media-gfx/digikam/Manifest @@ -0,0 +1,8 @@ +AUX digikam-5.5.0-cmake-3.9.patch 7298 SHA256 e5c0d53fef931b7b63ea5ef308786309edb755449b07c9c0df3f7eca8f3efdfc SHA512 0a0f33f8b288fc98b95397ff615ab747bb78e35f8b6ed517e814dfebd32dd3f626f0c232d5b45a69bf80c4b548b72932fb376ce2308b0786b196e7fcdeda9b19 WHIRLPOOL 458201b08777e280a574e97c3bee759a50b2b5e595fc746661362b4132caf80795195ed4505d5d330aafab5d66a7e9c1c13fcacdf8364ba61f08a708c999d8b0 +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 +EBUILD digikam-5.5.0.ebuild 4754 SHA256 8d6e79167f0b922cc86dcf70cd49422c43695ba3ea6bde850ce2b54df381aba7 SHA512 19dd72651406bb4f3a899aa2e4e4ea6c650c5b33963bd9c437510c355349baeea89a91e7394868d57f3b73cf24433833428076cf574429dc9224c2799a08ed19 WHIRLPOOL 67932349fa632aeac00c97ed569b23d233c77572d177312c4c8c8e4005edec5215d054240ff30be7bc0c718eb6cd59184171b7e8e4d9c1d50cb857e8baed7a9d +EBUILD digikam-5.7.0.ebuild 4808 SHA256 a4d9124705b69de516acbc3d6fa2ab3fe92ad24ff40b2423c85667916f1b8710 SHA512 da8fd9cbf5c4100856bd5c0dd161cc1e3dfc1aac6e33807e863a4c35ab14fb037bfc7b8da4cbdfeaf2ea22d803588225def5277fb5d87021f0a89c8609a45de5 WHIRLPOOL e9085f28a46a8a9d2c703a8d7cadc55abec639ca120f7b20f52f9485e3a82e071ce1f925d1afeea42c483e86e13315395c2cdfb27e66138592639b2e5177f103 +MISC ChangeLog 9931 SHA256 42d1c27e78baa5a8aa81696d859750e9e2b8c623d37d9ddbe80b3f0cabb56ada SHA512 2f1d5403d69a218fed1de26ad57a93a27ada29f676344e7e8b9b244ce7a77575635a952f87d034d169a16ce506b4646e3f628909f287e56ca413cd0ae04287c7 WHIRLPOOL 9ea6c963c28b4e9a952cbf42baadc8ad2545ed1d5469e7f8cfa06fa38bf182b8cfc53e223ddf385a845233f91d6d503676a9ee3f6227bbc99866cd01abbab679 +MISC ChangeLog-2015 45875 SHA256 b1324873b9728f31410ed0fa181335f50629c14fbcee2c5c26410b21633ecf8c SHA512 6e1edc01ad27802b6db00f8bf7cb45a36654fc9f11b66c63a22473715771f8528f45cc092cdfe28f6953af071ca865d294d2ecab024b760a0b5816944354dea7 WHIRLPOOL 17329f0a8e1ac9364e477006c7225b508cf0aa745b3e28744490b686a18266c115ef004276425ab9c725401b5be875e03cc883dd5edb0bcf1223a6efb4e47f2f +MISC metadata.xml 962 SHA256 9767bec5276d984cf7905b25d8f556cf3b36bfe9ca01e1cf03da03dd715bdf75 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab WHIRLPOOL b9e2dac6d982a1eea48a5030f3a02444a4a10dc11044e8b2e8fe0947a2b7cec8e86728a9470adc589b9ba9cd1ee36b3afaf40642e18e4a32b8b3ac93fcdba1a1 diff --git a/media-gfx/digikam/digikam-5.5.0.ebuild b/media-gfx/digikam/digikam-5.5.0.ebuild new file mode 100644 index 000000000000..89258b8a7dae --- /dev/null +++ b/media-gfx/digikam/digikam-5.5.0.ebuild @@ -0,0 +1,169 @@ +# 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 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 + +# 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 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.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[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} + $(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}-cmake-3.9.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=OFF + -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.7.0.ebuild b/media-gfx/digikam/digikam-5.7.0.ebuild new file mode 100644 index 000000000000..f5836f87eb1a --- /dev/null +++ b/media-gfx/digikam/digikam-5.7.0.ebuild @@ -0,0 +1,168 @@ +# 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.5.0-cmake-3.9.patch b/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch new file mode 100644 index 000000000000..d87096a6024e --- /dev/null +++ b/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch @@ -0,0 +1,170 @@ +commit 7e00441c257e7e9e5dc5ab983fc06046fb72b0c5 +Author: Gilles Caulier +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($) + 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 $ $) ++add_library(digikamdatabase $) + + 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 +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 diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml new file mode 100644 index 000000000000..59e835b01838 --- /dev/null +++ b/media-gfx/digikam/metadata.xml @@ -0,0 +1,20 @@ + + + + + dilfridge@gentoo.org + + + kde@gentoo.org + Gentoo KDE Project + + + Enable akonadi contact integration + Enable support for media-plugins/kipi-plugins + Enable support for media-libs/lensfun + Enable support for geolocation using kde-apps/marble + Enable support for media player using media-libs/qtav + Build the panorama plugin which requires media-gfx/hugin + Enable kde-frameworks/kfilemetadata support + + -- cgit v1.2.3