diff options
author | Johannes Huber <johu@gentoo.org> | 2016-12-08 18:43:55 +0100 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2016-12-08 18:43:55 +0100 |
commit | 8203a96a596336e05b490098c109812bb095ea8c (patch) | |
tree | 5777d3cac1a12ba527cf87e72048f48263fb1e16 /media-gfx | |
parent | media-gfx/digikam: stabilise 5.3.0 on amd64/x86 (diff) | |
download | gentoo-8203a96a596336e05b490098c109812bb095ea8c.tar.gz gentoo-8203a96a596336e05b490098c109812bb095ea8c.tar.bz2 gentoo-8203a96a596336e05b490098c109812bb095ea8c.zip |
media-gfx/digikam: Drop slot 4
Package-Manager: portage-2.3.3
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/digikam/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-4.14.0-r1.ebuild | 133 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-4.4.0-r1.ebuild | 156 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-4.14.0-lensfun.patch | 26 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-4.4.0-hang.patch | 85 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch | 53 | ||||
-rw-r--r-- | media-gfx/digikam/metadata.xml | 2 |
7 files changed, 0 insertions, 457 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index c0d6405ca640..322cdeeabde3 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,3 +1 @@ -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.3.0.tar.xz 121417224 SHA256 b36cfa27278936d41ab5f33c99fe9ccdfd545eada3e1e32efe9f9e3fdf2c3e5c SHA512 6190944d09badec6ddac194f2029e86d0ef658e08a6a120f04c86109dc2b9d9cd2e772a900d09781b563fcd0caaff186fb5fd6cde9744ce3b4e8dcc9ff29d421 WHIRLPOOL c1c0987e23587356968484d936a0a99f10d6e6ce004ffe1f5eb4d0a42b59fc1e84ec4a03f491c91c93be172ab6b78444c684221fb515e1562cc76bcc61346158 diff --git a/media-gfx/digikam/digikam-4.14.0-r1.ebuild b/media-gfx/digikam/digikam-4.14.0-r1.ebuild deleted file mode 100644 index 744d58ee043c..000000000000 --- a/media-gfx/digikam/digikam-4.14.0-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_LINGUAS="ar be bg bs ca cs da de el en_GB eo es et eu fa fi fr ga gl he hi -hr hu is it ja km ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sq -sv th tr uk vi zh_CN zh_TW" -KDE_HANDBOOK="optional" -KDE_DOC_DIRS="doc-digikam doc-showfoto" -inherit kde4-base - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Digital photo management application for KDE" -HOMEPAGE="http://www.digikam.org/" -SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS="~amd64 ~x86" -SLOT="4" -IUSE="addressbook debug doc gphoto2 mysql semantic-desktop +thumbnails video" - -CDEPEND=" - $(add_kdebase_dep kdelibs '' 4.14.14) - kde-apps/kdebase-kioslaves:4 - kde-apps/libkdcraw:4= - kde-apps/libkexiv2:4= - >=kde-apps/libkface-15.08.2-r1:4 - kde-apps/libkgeomap:4= - kde-apps/libkipi:4 - kde-apps/kcmshell:4 - dev-qt/qtgui:4 - || ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] ) - media-libs/jasper:= - media-libs/lcms:2 - >=media-libs/lensfun-0.2.6 - media-libs/liblqr - >=media-libs/libpgf-6.12.27 - media-libs/libpng:0= - media-libs/opencv:=[contrib(+),-qt5] - media-libs/phonon[qt4] - >=media-libs/tiff-3.8.2:0 - virtual/jpeg:0 - x11-libs/libX11 - addressbook? ( $(add_kdeapps_dep kdepimlibs) ) - gphoto2? ( media-libs/libgphoto2:= ) - mysql? ( virtual/mysql ) - semantic-desktop? ( kde-frameworks/baloo:4 ) -" -RDEPEND="${CDEPEND} - $(add_kdeapps_dep kreadconfig) - media-plugins/kipi-plugins:4 - video? ( $(add_kdeapps_dep ffmpegthumbs) ) -" -DEPEND="${CDEPEND} - dev-cpp/eigen:3 - dev-libs/boost - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -S="${WORKDIR}/${MY_P}/core" - -RESTRICT=test -# bug 366505 - -PATCHES=( "${FILESDIR}/${PN}-4.14.0-lensfun.patch" ) # bug 566624 - -src_prepare() { - # just to make absolutely sure - rm -rf "${WORKDIR}/${MY_P}/extra" || die - - # prepare the handbook - mkdir doc-digikam doc-showfoto || die - echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die - mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die - echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die - mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die - sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die - - # prepare the translations - mv "${WORKDIR}/${MY_P}/po" po || die - find po -name "*.po" -and -not -name "digikam.po" -delete || die - - echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die - echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die - echo "add_subdirectory( po )" >> CMakeLists.txt || die - - kde4-base_src_prepare - - if use handbook; then - echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt || die - echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt || die - fi -} - -src_configure() { - # LQR = only allows to choose between bundled/external - local mycmakeargs=( - -DENABLE_LCMS2=ON - -DWITH_LQR=ON - -DWITH_LENSFUN=ON - -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) - $(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT) - $(cmake-utils_use_enable debug DEBUG_MESSAGES) - $(cmake-utils_use_enable gphoto2 GPHOTO2) - $(cmake-utils_use_with gphoto2) - $(cmake-utils_use_enable mysql INTERNALMYSQL) - $(cmake-utils_use_enable mysql MYSQLSUPPORT) - $(cmake-utils_use_enable semantic-desktop BALOOSUPPORT) - $(cmake-utils_use_enable thumbnails THUMBS_DB) - ) - - kde4-base_src_configure -} - -src_compile() { - local mytargets="all" - use doc && mytargets+=" doc" - - kde4-base_src_compile ${mytargets} -} - -src_install() { - kde4-base_src_install - - # install the api documentation - use doc && dodoc -r ${CMAKE_BUILD_DIR}/api/html -} diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild deleted file mode 100644 index b28b720e0869..000000000000 --- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_LINGUAS="ar be bg bs ca cs da de el en_GB eo es et eu fa fi fr ga gl he hi -hr hu is it ja km ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sq -sv th tr uk vi zh_CN zh_TW" -KDE_HANDBOOK="optional" -CMAKE_MIN_VERSION="2.8" -KDE_MINIMAL="4.10" - -KDE_DOC_DIRS="doc-digikam doc-showfoto" - -inherit kde4-base - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Digital photo management application for KDE" -HOMEPAGE="http://www.digikam.org/" -SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS="amd64 x86" -SLOT="4" -IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video" - -CDEPEND=" - kde-apps/kdebase-kioslaves:4 - kde-apps/libkdcraw:4= - kde-apps/libkexiv2:4= - <=kde-apps/libkface-4.4.0 - kde-apps/libkgeomap:4 - kde-apps/libkipi:4 - kde-apps/marble:4=[plasma] - media-libs/jasper:= - media-libs/lcms:2 - media-libs/lensfun - media-libs/liblqr - >=media-libs/libpgf-6.12.27 - media-libs/libpng:0= - >=media-libs/opencv-2.4.9[-qt5] - media-libs/tiff:0 - virtual/jpeg:0 - dev-qt/qtgui:4 - || ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] ) - addressbook? ( $(add_kdeapps_dep kdepimlibs) ) - gphoto2? ( media-libs/libgphoto2:= ) - mysql? ( virtual/mysql ) - semantic-desktop? ( kde-frameworks/baloo:4 ) -" -RDEPEND="${CDEPEND} - kde-apps/kreadconfig:4 - media-plugins/kipi-plugins:4 - video? ( - || ( - kde-apps/ffmpegthumbs:4 - $(add_kdeapps_dep ffmpegthumbs) - ) - ) -" -DEPEND="${CDEPEND} - dev-cpp/eigen:3 - dev-libs/boost - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -S="${WORKDIR}/${MY_P}/core" - -RESTRICT=test -# bug 366505 - -PATCHES=( - "${FILESDIR}/${P}-libkexiv2.patch" - "${FILESDIR}/${P}-hang.patch" - "${FILESDIR}/${PN}-4.14.0-lensfun.patch" # bug 566624 -) - -src_prepare() { - # just to make absolutely sure - rm -rf "${WORKDIR}/${MY_P}/extra" || die - - # prepare the handbook - mkdir doc-digikam doc-showfoto || die - echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die - mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die - echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die - mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die - sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die - - # prepare the translations - mv "${WORKDIR}/${MY_P}/po" po || die - find po -name "*.po" -and -not -name "digikam.po" -exec rm {} + - - echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die - echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die - echo "add_subdirectory( po )" >> CMakeLists.txt || die - - kde4-base_src_prepare - - if use handbook; then - echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt - echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt - fi -} - -src_configure() { - # LQR = only allows to choose between bundled/external - local mycmakeargs=( - -DENABLE_LCMS2=ON - -DFORCED_UNBUNDLE=ON - -DWITH_LQR=ON - -DWITH_LENSFUN=ON - -DWITH_MarbleWidget=ON - -DENABLE_NEPOMUKSUPPORT=OFF - $(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT) - $(cmake-utils_use_enable gphoto2 GPHOTO2) - $(cmake-utils_use_with gphoto2) - $(cmake-utils_use_enable themedesigner) - $(cmake-utils_use_enable thumbnails THUMBS_DB) - $(cmake-utils_use_enable mysql INTERNALMYSQL) - $(cmake-utils_use_enable debug DEBUG_MESSAGES) - $(cmake-utils_use_enable semantic-desktop BALOOSUPPORT) - ) - - kde4-base_src_configure -} - -src_compile() { - local mytargets="all" - use doc && mytargets+=" doc" - - kde4-base_src_compile ${mytargets} -} - -src_install() { - kde4-base_src_install - - if use doc; then - # install the api documentation - insinto /usr/share/doc/${PF}/ - doins -r ${CMAKE_BUILD_DIR}/api/html - fi -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if use doc; then - einfo "The digikam api documentation has been installed at /usr/share/doc/${PF}/html" - fi -} diff --git a/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch b/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch deleted file mode 100644 index 37776f6e316b..000000000000 --- a/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Gilles Caulier <caulier.gilles@gmail.com> -Date: Mon, 14 Dec 2015 21:41:55 +0000 -Subject: fix compilation with Lensfun 0.3.2 -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=0f159981176faa6da701f112bfe557b79804d468 ---- -fix compilation with Lensfun 0.3.2 -It still compatible with older lensfun releases. -BUGS: 356672 -FIXED-IN: 5.0.0 ---- - - ---- a/libs/dimg/filters/lens/lensfuniface.h -+++ b/libs/dimg/filters/lens/lensfuniface.h -@@ -24,10 +24,7 @@ - - // Lib LensFun includes - --extern "C" --{ - #include <lensfun.h> --} - - // Local includes - - diff --git a/media-gfx/digikam/files/digikam-4.4.0-hang.patch b/media-gfx/digikam/files/digikam-4.4.0-hang.patch deleted file mode 100644 index 2757a4a5947b..000000000000 --- a/media-gfx/digikam/files/digikam-4.4.0-hang.patch +++ /dev/null @@ -1,85 +0,0 @@ -commit f0400ec7e518e753e0c4ccab4eb2b8b022f91767 -Author: Gilles Caulier <caulier.gilles@gmail.com> -Date: Tue Oct 28 15:58:55 2014 +0100 - - apply patch #89156 - BUGS: 337737 - FIXED-IN: 4.5.0 - -diff --git a/libs/widgets/common/databasewidget.cpp b/libs/widgets/common/databasewidget.cpp -index b04355b..858cf40 100644 ---- a/core/libs/widgets/common/databasewidget.cpp -+++ b/core/libs/widgets/common/databasewidget.cpp -@@ -172,30 +172,21 @@ void DatabaseWidget::setupMainArea() - "<p><b>MySQL</b> backend is a more robust solution especially for remote and shared database storage. " - "It is also more efficient to manage huge collection sizes. " - "Be careful: this one it is still in experimental stage.</p>")); -- setDatabaseInputFields(DatabaseParameters::SQLiteDatabaseType()); -- -- // -------------------------------------------------------- - -- adjustSize(); -+ setDatabaseInputFields(DatabaseParameters::SQLiteDatabaseType()); - - // -------------------------------------------------------- - -- connect(databasePathEdit, SIGNAL(urlSelected(KUrl)), -- this, SLOT(slotChangeDatabasePath(KUrl))); -- -- connect(databasePathEdit, SIGNAL(textChanged(QString)), -- this, SLOT(slotDatabasePathEditedDelayed())); -- - connect(databaseType, SIGNAL(currentIndexChanged(int)), - this, SLOT(slotHandleDBTypeIndexChanged(int))); - -+ connect(checkDatabaseConnectionButton, SIGNAL(clicked()), -+ this, SLOT(checkDatabaseConnection())); -+ - #ifdef HAVE_INTERNALMYSQL - connect(internalServer, SIGNAL(stateChanged(int)), - this, SLOT(slotHandleInternalServerCheckbox(int))); - #endif // HAVE_INTERNALMYSQL -- -- connect(checkDatabaseConnectionButton, SIGNAL(clicked()), -- this, SLOT(checkDatabaseConnection())); - } - - QString DatabaseWidget::currentDatabaseType() const -@@ -261,12 +252,24 @@ void DatabaseWidget::setDatabaseInputFields(const QString& currentIndexStr) - d->databasePathLabel->setVisible(true); - databasePathEdit->setVisible(true); - d->expertSettings->setVisible(false); -+ -+ connect(databasePathEdit, SIGNAL(urlSelected(KUrl)), -+ this, SLOT(slotChangeDatabasePath(KUrl))); -+ -+ connect(databasePathEdit, SIGNAL(textChanged(QString)), -+ this, SLOT(slotDatabasePathEditedDelayed())); - } - else - { - d->databasePathLabel->setVisible(false); - databasePathEdit->setVisible(false); - d->expertSettings->setVisible(true); -+ -+ disconnect(databasePathEdit, SIGNAL(urlSelected(KUrl)), -+ this, SLOT(slotChangeDatabasePath(KUrl))); -+ -+ disconnect(databasePathEdit, SIGNAL(textChanged(QString)), -+ this, SLOT(slotDatabasePathEditedDelayed())); - } - - adjustSize(); -@@ -355,9 +358,9 @@ void DatabaseWidget::setParametersFromSettings(const ApplicationSettings* const - - password->setText(settings->getDatabasePassword()); - -- /* Now set the type according the database type from the settings. -- * If no item is found, ignore the setting. -- */ -+ // Now set the type according the database type from the settings. -+ // If no item is found, ignore the setting. -+ - for (int i=0; i<databaseType->count(); ++i) - { - //kDebug(50003) << "Comparing comboboxentry on index ["<< i <<"] [" << databaseType->itemData(i) diff --git a/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch b/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch deleted file mode 100644 index 018ce67a57d2..000000000000 --- a/media-gfx/digikam/files/digikam-4.4.0-libkexiv2.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e -Author: Pino Toscano <pino@kde.org> -Date: Tue Oct 14 22:26:19 2014 +0200 - - fix libkexiv2 version for AltLangStrEdit::textEdit() - - it is part of current libkexiv2/master only (i.e. post 4.14.x, which - is 2.3.x) - -diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp -index 88413fc..70bdb6d 100644 ---- a/libs/imageproperties/captionedit.cpp -+++ b/libs/imageproperties/captionedit.cpp -@@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text) - - MsgTextEdit* CaptionEdit::textEdit() const - { --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - return d->altLangStrEdit->textEdit(); - #else - return 0; -diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp -index ebfbae1..3d12777 100644 ---- a/libs/imageproperties/imagedescedittab.cpp -+++ b/libs/imageproperties/imagedescedittab.cpp -@@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent) - - // Initialize --------------------------------------------- - --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->titleEdit->textEdit()->installEventFilter(this); - d->captionsEdit->textEdit()->installEventFilter(this); - #endif -@@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit() - void ImageDescEditTab::setFocusToTitlesEdit() - { - d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS); --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->titleEdit->textEdit()->setFocus(); - #endif - } -@@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit() - void ImageDescEditTab::setFocusToCommentsEdit() - { - d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS); --#if KEXIV2_VERSION >= 0x020302 -+#if KEXIV2_VERSION >= 0x020400 - d->captionsEdit->textEdit()->setFocus(); - #endif - } diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 287778c260cf..faac150cd067 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -15,8 +15,6 @@ <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> <flag name="video">Enable video player support</flag> </use> </pkgmetadata> |