From fc68863e718441fe15bb0dea2ca03ea06a6f558d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Mar 2024 19:01:08 +0000 Subject: gentoo auto-resync : 25:03:2024 - 19:01:08 --- media-gfx/Manifest.gz | Bin 38010 -> 38011 bytes media-gfx/digikam/Manifest | 5 +- media-gfx/digikam/digikam-8.3.0.ebuild | 148 +++++++++++++++++ media-gfx/digikam/files/digikam-8.3.0-cmake.patch | 192 ++++++++++++++++++++++ media-gfx/digikam/metadata.xml | 1 + media-gfx/ttfautohint/Manifest | 2 +- media-gfx/ttfautohint/metadata.xml | 4 - 7 files changed, 346 insertions(+), 6 deletions(-) create mode 100644 media-gfx/digikam/digikam-8.3.0.ebuild create mode 100644 media-gfx/digikam/files/digikam-8.3.0-cmake.patch (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 5d35a8c317e5..24f6bbf922ae 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 30c62bc87488..949fd937737a 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,5 +1,8 @@ AUX digikam-8.2.0-akonadi.patch 5940 BLAKE2B 80261f43d9365dcc533926ea60d432956576d84afceea5fb6b9a660efd02b414a904cac8677333ac56d6746ec1b04a71ffaebaad40005c400cd8d2b3695a6147 SHA512 99bf267d3e16bcc5c085a2b05db558a4ff59eda6f0b68b69841ca835e3ba1e620eeb2ac0f3a01d981d8a50704d33538f20344a2f74d4c10214e01da1c863a52e AUX digikam-8.2.0-cmake.patch 6440 BLAKE2B 8542ff5edf0d16a701b7d82452a1d2c4d86d05f7b33726898e2a910e687c7a92cc017b5e7701eac7fca94b1cb61755a467ad5ef75fb99482f9da2849d91dcf91 SHA512 0c3a3256d21bacfe0df02d001551cb9eef69c123618067171936f9a33d27a7aaabf31af17ad12087d1807e8cc1643d8146907344e13166d70337645e460f9852 +AUX digikam-8.3.0-cmake.patch 6775 BLAKE2B 1c93e204bd3b5f3d73ecf812ee851e0a3a9bb3e414e41afbc0a072bf05e6b615a147e545f6a16e8e218e1f910e9f1667e012bc35e06eab7d192f4c8c8d814746 SHA512 42707d0bff593114de412697a037cfaccfbfc568ba3a90b3b68a3cbdba32d79e5e61d2e8cd6f185c2543cac4c6de66f36e5f549908781243064b17aececba72b 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 EBUILD digikam-8.2.0.ebuild 4672 BLAKE2B 87beab1f4b3ace902fae7e252eec87cb4e8fe3ac9adf47a6ecb677b2848d556a8b115a577692540ec552985d9ec1dbffa8abecbf967da45426dfa5c5c3c6c397 SHA512 cd80378facb6bac72c3cacb2994c3c25cef9bc73de0c0ae4bf6ad2f06db260c8f6dd4109920b01479c158d73a50caa68740d2a3064fc3f90ef47a24184b511a1 -MISC metadata.xml 955 BLAKE2B 49eb64d1179383122e4fe65b2edc22929b46dba0fdb44cbd6230b33268143a9c7d4dc56a7414029864bce0a06c60c56476abc0264f151fad356020b5998b79e3 SHA512 dbe088987df5f09a8d166a293423f006eb97ab57fd0415871dc30a1a066e33a7e9e4c13a5608dd69dd96b06082bac5c216c7d9506ca60d326ab10ade96b6af39 +EBUILD digikam-8.3.0.ebuild 4263 BLAKE2B cb7bac6dbc019a5f12184c7834f73a8628401b87178c052d03c2b4601c9bda8c264c1440da767ff502c2822bbbb76ef28179c981051d59fb67308d0004db12da SHA512 fd9f7c8d3d88f682808c37e285e3ece8620936e01a4a98a114f2093682e0dc97f7ca1a036c69ae5edceed748c28bb1d65a6b4a26d48730e029dd2601debd737c +MISC metadata.xml 1015 BLAKE2B 62d29597b1f39bea08cafe34c6a140ecad211a4f0fe335024a7a5bc62ab63e5b0b355bc1ebdceb35e7b7c7ef209734042e2c06a88a784685735eec8706d80edb SHA512 454000942e0e24ced69a66f6b4ff7d8dd799799312d4e6607f997a97f6a7ca0ca6a89d4dd5522427907603fd712bc63e49aa47c88ea36b59158fb11553fa6808 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 +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 + diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 98caf7822427..4c55a9727c8b 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -10,6 +10,7 @@ https://bugs.kde.org/ + graphics/digikam Enable akonadi contact integration diff --git a/media-gfx/ttfautohint/Manifest b/media-gfx/ttfautohint/Manifest index f4892e1e9a69..02c6b72070e9 100644 --- a/media-gfx/ttfautohint/Manifest +++ b/media-gfx/ttfautohint/Manifest @@ -1,3 +1,3 @@ DIST ttfautohint-1.8.4.tar.gz 3539332 BLAKE2B 314c5196f01828d180d3b3e9b09c66fad9c8a8958f36003c8ae0d54b945391cb53c40f92cf57ff70e57b5a21a6aa46bc14ff9419d4b877421fdc2500ce9004e3 SHA512 983517c360f8e65ccbf17f28f045f1c0a45078707f2e30f465a7b6df4014f0ec212780ea2703bc16be1a3c6ede70f71ea3051c067fbfd06eff40ae3b20840eec EBUILD ttfautohint-1.8.4-r3.ebuild 1239 BLAKE2B d4e08dd60da20c388e7cf06a028377e95914482d00d5f9faa317475bf70dbda1c3daead21c94222e729558898d2a48de38da710179a39ae960fae5e7bd01d28e SHA512 cdf00cf87a9d5656017ff0adf1a24af85d97534540be71b2ecd927ea43af934be0af034e2d9e65bdb6102713b63eb41b5ecbbda816831618cf3241991772111f -MISC metadata.xml 451 BLAKE2B 3bfb21c66cf3e415000f370130a6771cefcc04e9dab8122fff9187c03bb622318104c0c927a340915f155a82e0022cf635d9567f1dc459645b6a33d61f5f9bc3 SHA512 d1488ee772b8f88f489b63c14abf58308e82337b693c4b72661d82c2f268ba8ef63f6bd1d8bd202c87ee0690e86c4d335707b4cb8d21a0d20a8fb24f0e044aff +MISC metadata.xml 319 BLAKE2B aadffcaca19db31f29f3b7a25fb0d3b795cc15f8920fef3e674d7614fe5b2bd93c13c0afa91299b9b2ccd318f03ee8b45f5eb41d69d1e3253678a081f2f2e4e2 SHA512 582e2fca2456cabafa5ef03ed1aeb96aaebaa54264682e0c641fe3b6ed5e17da6004f579ce3b91c0ea59db8e0ae949554433e129d6c142f4725db695e29bd5e8 diff --git a/media-gfx/ttfautohint/metadata.xml b/media-gfx/ttfautohint/metadata.xml index f444ebcb9d85..82f6e7d06a5b 100644 --- a/media-gfx/ttfautohint/metadata.xml +++ b/media-gfx/ttfautohint/metadata.xml @@ -5,10 +5,6 @@ matthew@gentoo.org Matthew Smith - - lssndrbarbieri@gmail.com - Alessandro Barbieri - reflect soname of libttfautohint -- cgit v1.2.3