From c7b5a281b2f19df584053abc11abb47ccad9c381 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Apr 2023 18:13:05 +0100 Subject: gentoo auto-resync : 25:04:2023 - 18:13:05 --- media-gfx/Manifest.gz | Bin 37881 -> 37874 bytes media-gfx/digikam/Manifest | 5 +- media-gfx/digikam/digikam-7.10.0-r1.ebuild | 149 +++++++++++++++++++++ media-gfx/digikam/digikam-7.10.0.ebuild | 145 -------------------- media-gfx/digikam/digikam-7.9.0-r1.ebuild | 6 +- .../files/digikam-7.9.0-akonadi-23.04.patch | 27 ++++ media-gfx/freecad/Manifest | 5 +- ...-0001-Gentoo-specific-Remove-ccache-usage.patch | 6 - ...ecad-9999-Gentoo-specific-don-t-check-vcs.patch | 15 +++ media-gfx/freecad/freecad-9999.ebuild | 2 +- media-gfx/gnome-photos/Manifest | 6 +- media-gfx/gnome-photos/gnome-photos-43.0.ebuild | 6 +- media-gfx/gnome-photos/gnome-photos-44.0.ebuild | 4 +- media-gfx/gnome-photos/metadata.xml | 2 +- 14 files changed, 209 insertions(+), 169 deletions(-) create mode 100644 media-gfx/digikam/digikam-7.10.0-r1.ebuild delete mode 100644 media-gfx/digikam/digikam-7.10.0.ebuild create mode 100644 media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch create mode 100644 media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 88f54f6f6a37..3498b6a436b4 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 794c4d9089b4..566d365e548d 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,6 +1,7 @@ AUX digikam-7.8.0-cmake.patch 4066 BLAKE2B 3f18ad5c25629cf7f32ced42c55875e3158a68083c28ca70c5b6a32795117339aebf930753f82ad21cc57990d4a0f030f39583a7b318433e3feb47ed1c4a3ddd SHA512 83626bdeacb91afd069ce4b9023f4a62154a53b2de569fb24286153fd5083a1970e3b34d37abae61ed77928d9f22bde84622ad67fd8659fefd105c1c15ed34d0 +AUX digikam-7.9.0-akonadi-23.04.patch 1030 BLAKE2B 11996d57bfd2647a604d28f7fa976aeaa9cbe4329f266e813944320b3bdd7b1b8761685b670bbb4499181a77b5b8da49e65d4218014ce5e0124ff3dae346228a SHA512 52fbf63e46f50fde477266bc0b30888ae7bf83f6986294c17307705f536468889d312eba61647e125431dee4331cbd56a458c2999f31d29a0b1c989586732d6e DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B 527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64 SHA512 1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27 DIST digiKam-7.9.0.tar.xz 349286920 BLAKE2B 222d614d16bd805f87ea10afd7bed683b80166a115641ccebac75ede7d85b46a1e1c2cdd9fb4a9c5c5395a6703362277b727e6cbefcbfc53323648a0a2fcf863 SHA512 6c5c9dac8a056d4c8c3b4d67f5a607592ee6319b9f372aebf6ef4245d58883897424d4fabae1d04f43ff3561d8e79b4e4bf5c697aa57467f831437b1cf0da1e6 -EBUILD digikam-7.10.0.ebuild 3941 BLAKE2B da145d4ef635029ff5412eb93c4d55f91cc5bf60e52fb389756b217909727bfc6ace99f1671c418ce1b898fc3f935a223828e8f515dd5e1d6c44b4959134e6c7 SHA512 336f2e35b291b870edd96b029f77269b17b598488c26f76af295c250720086c22fde58b729c9a18b1ab86cefcade54e3a2539a25d80869ef304ae6822fc8fe4a -EBUILD digikam-7.9.0-r1.ebuild 4064 BLAKE2B f4fa4de5cdc5dcd6c9e24d4256c30f0cb58edd909d9f0e9591e007ff6be9e6c56559564fa64b3c87657083284be8f97f9f7fc567b5e92720f6fc5f67127ed11e SHA512 1d6a6b59b9a02987c15d93c1fee5da8bdade279e92b619086f0fa3a852a2ab482496a27500a90dc2ae3bd081a139aab259670668589b35e8cd8dba940ff39df1 +EBUILD digikam-7.10.0-r1.ebuild 4054 BLAKE2B f3a2cf98f7e1cb0822b01d81955cdd635440b5194e32e51baaadb75d5ec860cc281f6241ece160f5eac640481035fc9cb5659bc619ab981e155f7b57f045bce1 SHA512 c9f8b43dcac4e37fda6be3f751d4da0781fd55db9091fc01f193c1effc7ea1bbc796806c16aba037a073c4e388fd66eba87ed9acd9c535e34bea858ce0b2616f +EBUILD digikam-7.9.0-r1.ebuild 4165 BLAKE2B 404b7725fb5b40b11b5005d83c24881521990aca9e05fff90536a2f3821c9ec1cad386dd1fe67ce3da6ac5e0138fd7381cc5d5ea85ee03d6082084029d8d9aff SHA512 8b765fc565b8a30e1eb03440425bd1d2108d3cc02e4ac29f4acf33a1040670fa919f6bf69522d5325a8605347207bc8f2932d6821fa70c57af3fcbef763e7b21 MISC metadata.xml 1054 BLAKE2B 7263a191f8935c2a52ad84701366969a39e42412efc26d30c28e8703d545aa49454331dc8da159d08007cd6eed682d647099ca76137acf378eef2ac481b2d8cc SHA512 224c4c6188bb6978d8e2a83bfb8cc4fb7e22937fede593e6227b7afe1c6533f9685814d8721282312015a42d601f85b0a48f587e6b0fce2a69a5e142d8266ce5 diff --git a/media-gfx/digikam/digikam-7.10.0-r1.ebuild b/media-gfx/digikam/digikam-7.10.0-r1.ebuild new file mode 100644 index 000000000000..a87c4c457218 --- /dev/null +++ b/media-gfx/digikam/digikam-7.10.0-r1.ebuild @@ -0,0 +1,149 @@ +# 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 +) + +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/digikam-7.10.0.ebuild b/media-gfx/digikam/digikam-7.10.0.ebuild deleted file mode 100644 index 3e705737e624..000000000000 --- a/media-gfx/digikam/digikam-7.10.0.ebuild +++ /dev/null @@ -1,145 +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-22*: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 -" -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" ) - -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/digikam-7.9.0-r1.ebuild b/media-gfx/digikam/digikam-7.9.0-r1.ebuild index 72affdeb5cb8..8dceca760739 100644 --- a/media-gfx/digikam/digikam-7.9.0-r1.ebuild +++ b/media-gfx/digikam/digikam-7.9.0-r1.ebuild @@ -96,6 +96,7 @@ COMMON_DEPEND=" 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(+)] ) @@ -109,7 +110,10 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-7.8.0-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-7.8.0-cmake.patch" + "${FILESDIR}/${P}-akonadi-23.04.patch" # bug 904976 +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp 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 new file mode 100644 index 000000000000..d9b46a7966f0 --- /dev/null +++ b/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch @@ -0,0 +1,27 @@ +From 5b4ba173f6a84a8be1131b1523dc42df95171ec7 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +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 + diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 1cdfd82222a2..748722e22dac 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -1,10 +1,11 @@ -AUX freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch 797 BLAKE2B 1bd09caaa265e370b70efe9dd23171a61a98920d659c2f19bb3ec07bf77b1d59712c135f421bbc3164bec6c2b19ac0886185bb6200c45cefaaaea94d5cf54222 SHA512 b449fc466a22300c8a4b0a5b223d68b0ef4437512abcdf875580efc364570b157a55e283faa0ddaad5fd4ce98585bf6dd043b4e7a2a7aa86e98bdb9e8a846a30 +AUX freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch 659 BLAKE2B c8a50dc8da2b9d9793be5f71832a4880456f5a576d1ebe8be5acdaea1f14203500457df71994428c642e9334fad57380c74a25140f186c853addea7a2fd624d9 SHA512 7448c2b8613cf4fde3a7d785ddf057b53f7b72b7b141a07326740498da13bdf5e0ba4fd40e9030e00d693af1b1cdeee7024bd1985a287f6b39a8cd6cb854e05e AUX freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch 701 BLAKE2B 963afb463acc00fc20f2ed2aa356c0bb9df8b359fb350e948fa7b23df6cd65db521ebd76d74fda53ca76ce0ba89e7ea3737e1903f850c5a04271eaeba45e5eaf SHA512 457f58461744d42db81db6868498b583ba9a4f599cc0cc1d8e98dae50f2d9d91216cd9787548ae83db57b4a8d056e0267e70055d3fba6405f51de80355eef18f AUX freecad-0.20.2-Fixes-8206-FreeCAD-segfaults-being-run-with-paramete.patch 746 BLAKE2B 7cba7847956b9f6dbb4161c2bf70a72790cab98a1110c98ac34160c9dd5005b87ff9a2c71e42b7c4523f3fff9cc428ca0ad3b8f61e13b73d1b3bfdd142f5794f SHA512 08d3a8b849eed184b557b8e918c77e294daa40dad81944e19f0ce0c3a8477910ef6cb426e83a986d03050f1a1bfd935b5efbc27146704930d48ff65cd73389db AUX freecad-0.20.2-Netgen-add-headers-to-support-recent-Netgen.patch 3622 BLAKE2B fb68ca931c5fa67873d5a60a8b175d6481c572e233974f8b59545f05aef13ced9baf576a51f4aba89020ecb794f39431bca5e8e081536db34f3a15737a11e374 SHA512 ef2ea194176ff10fdf71b7335a84ab97dead7093f9f46b562e8e659ae793d8d7a1e204cdc0be253d3fc4402a88caf95694f1249c38908f150263a00ec37150c7 +AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 350 BLAKE2B e1b612ac81f73546a3a7ae93e447aba6e3f28dea1292f5d308f567307c8c6146b8dfdcc1cef946c64991d41c41fa9c8949f56e2e8573833bad2a3826bab960ba SHA512 f96678dbfe13668a9f65131996ddc5eb2cbe80296b7eb2cc7d248e3ee1d991bea95568b0241da8387106812aac5762c330afb1d8c38b2281c3ee2600db120627 AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 606 BLAKE2B acef2151a4ddc90a40ae565fe89032d832a8596b9f9c2608b6b8c3e76125b69b9be12db34d72e3646bd76abeae041bb3f0fd33a0933f22174f48095634568dc2 SHA512 f1d830591dc6532d9517e13da00cfc886e70fc57ec84f7a406f68096a683dd4b86909190858e8aba69c4f668dd963d8de3765e8363ce9661718ac873c729f3f6 DIST freecad-0.20.2.tar.gz 75555561 BLAKE2B 278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8 SHA512 c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d EBUILD freecad-0.20.2-r1.ebuild 10338 BLAKE2B 6743b981e7f7c152a6045960b9e5e79315497af2e5b1fc3e706afeac3b1208162c2ea4e1b3f02652188685068875492e0bcd28dd5558861723f818c5cb0ce3db SHA512 ee94890a79bd87c944ef2215b890360518627f5d4dcae95ebe2ab7c810f113d10c366515193d6bfe1ced550cd0d3c1d4d0e5bb72938b7de0e25827c61687f388 EBUILD freecad-0.20.2.ebuild 9858 BLAKE2B 254dcc53a8eecf329854e10af1d13bd6995f4d2720268cd0e0e59ca3e5c10385d6edfe18ff1c5a36fe03d4ae0a4bccf4eafa6f778424b9ef281b15e0e368c6e4 SHA512 5e6f6bffadf57ab79b578790e9bf62934f5b598e09cdb8a6f08c07a06ff8a4d8daf297114c88f4abb5400991526abd28bb00cd7be79333b27a8f0f92179b49cb -EBUILD freecad-9999.ebuild 10321 BLAKE2B b60abf8a65abfdd34592b6501ef077dd93f73f83498fadf4cc5bc350f6876ae7d947f37fa409c7af4293d6cf592e88a739694912ce5084f99c861e58eba18773 SHA512 9182cfd3c7fccffd33d963fb2b0bed38c7812ca87782495e6f7afb89c79bce4954c9d8b56f21d7ba0b0a083cc315f8d7f034431a0b93b0f8c02d60ce9b3024d3 +EBUILD freecad-9999.ebuild 10319 BLAKE2B 2a16a1e5de8c93b2591423a8979f0fc9722dc2ac4e075421dae266e304c3a17a71cc804d72c892e51419b2750e47aca96b4ccd2d98905f2e9ebbd989c39fe820 SHA512 770927d701d22d0c7274d41f53f3eaf3cbd5590f4c2cf9b3320b33658fa2038c1a6711640b6f5cd9e18e6ff94bcff3f74ae09a95619bbfa1766867007c964422 MISC metadata.xml 3189 BLAKE2B b236dc1ac3c1a56609cc0d40b6f6ed5cb0c70ce06bd3c5dce45c5f3bcf1d06548a3d62e7e5c786278f84a6874ed330a470a753946c1e6963e7b5fa7d43854eb8 SHA512 ac8018f6c6819c237168228bd767659e1fd1b7aec18c8581a284e498a91dceda78ced26f7a5a1f3b110956fd940f72c677984e1127f76c9fd6330a7d54044fa2 diff --git a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch index c8772febdee8..8e875c1811f5 100644 --- a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch +++ b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch @@ -4,12 +4,6 @@ Date: Fri, 12 Mar 2021 23:55:09 +0100 Subject: [PATCH] [Gentoo specific] Remove ccache usage Signed-off-by: Bernd Waibel ---- - CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b17736..38e482a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,11 +8,6 @@ if (POLICY CMP0072) diff --git a/media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch new file mode 100644 index 000000000000..3c8b61ab56a4 --- /dev/null +++ b/media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch @@ -0,0 +1,15 @@ +--- a/src/Tools/SubWCRev.py ++++ b/src/Tools/SubWCRev.py +@@ -509,12 +509,6 @@ def main(): + bindir = a + + vcs = [ +- GitControl(), +- DebianGitHub(), +- BazaarControl(), +- Subversion(), +- MercurialControl(), +- DebianChangelog(), + UnknownControl(), + ] + for i in vcs: diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index b9d1e7ae4206..47fbacf3eba4 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -136,7 +136,7 @@ REQUIRED_USE=" " PATCHES=( - "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch "${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch ) diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest index a7e6dd13faeb..491ac356d5be 100644 --- a/media-gfx/gnome-photos/Manifest +++ b/media-gfx/gnome-photos/Manifest @@ -1,5 +1,5 @@ DIST gnome-photos-43.0.tar.xz 2857296 BLAKE2B f7e51fadcf213e9eb08e38629bc137e81afb67d227d2c9ddc6b2cc136eb18f2df7aae91112c61129d0a77439aac773925b2abd65f1267fb4a69ca66f86e72a4d SHA512 003f9bda3aa8a3d72aec960d7377d4df08784a95de66505b77ac2e2a75c44fb772fc560162f0e5195b4c3cb8a648263f2403ecc18648fafdc3e748eccf297e7c DIST gnome-photos-44.0.tar.xz 2862604 BLAKE2B 0f6e2837c0beb4f4cef1ac79363c0b67b1ea1bb69e9d6fd81fb6a726067bf4c0106d16b3bfdee5b50ce786a1805bef74b2126b41046ec104a52cc476735633b8 SHA512 00ad3d431ffaaf245c3d5790b86fb3ec9d1c6ed8bc50bf4de872899a409d779bd964f6b63017182f797dd879655b2717f4b034cac029e0a3bc50c8df8fe3193b -EBUILD gnome-photos-43.0.ebuild 2432 BLAKE2B 281906c169b5e99dab53c244ddca80811ad8f6d69dac7b86b71dab1687bf227cb5e7aa7e5d0a8301649fe95867d55972995c5c0348b0937ff2858da7df397ea1 SHA512 6b211b943df1db55a72a6c4d868331164604cedab9acc53b9ebcf30407a1149be1155ebb8e3473d0dbd58a8bbfda2654e572ea608e20b3a4467b98b1b76b71ec -EBUILD gnome-photos-44.0.ebuild 2330 BLAKE2B 3da03d91ec223f354bf8bb842e9086112eb19de13fda76af1aeb28cae7a0edf131dc29d8a21ba4e946db80a637f4335ebe470a6871ff8e27699fb7063cde7dcd SHA512 e4450078902f9d1709b4cd74d01a55cd6a6d6f891f1afd66e8c357f0a13cacd7a837af2437614ed413d44101ecf377df92a82f3519f9cfafb02e0fc722892375 -MISC metadata.xml 1068 BLAKE2B ad0df4e00933774313a112146cec7c8ef16a8f35a539189c6bb91bee1d09981035d600366c0b583199ad2cb47b42d5d0309eed17ab95e500cf0ffbdfb55e5044 SHA512 1a0694b55547a23b752aeb2f9aaec2a48fc80f1637fae552e152ee8434ec72041fbceb3caf0594649055cb65f95377ec2ad457262d0dc0ba085e0253705aeb3d +EBUILD gnome-photos-43.0.ebuild 2154 BLAKE2B 9f0c86904e88b511c9cf819f1e684a4d121148ea46cee983b73e81c3b5388d3307f79a00d3566cc85154c926d7660f566a1b1af20da4714d55095996135bb79e SHA512 0247fdd461a9fb7c1f4e642438b194f561aba0db1bf76aa4084564b30630996636c2693e10960359ff1a94b555f43bf5270c279e5cfabed451c9e79dcd4a3d4b +EBUILD gnome-photos-44.0.ebuild 2154 BLAKE2B 9f0c86904e88b511c9cf819f1e684a4d121148ea46cee983b73e81c3b5388d3307f79a00d3566cc85154c926d7660f566a1b1af20da4714d55095996135bb79e SHA512 0247fdd461a9fb7c1f4e642438b194f561aba0db1bf76aa4084564b30630996636c2693e10960359ff1a94b555f43bf5270c279e5cfabed451c9e79dcd4a3d4b +MISC metadata.xml 1068 BLAKE2B 611c61f3ba39a6f4bd41e221a574d67fdec2f340a9f5fbd544f3a96b82e0966f2646cc9d6c5dab7fbd1d5e044cda46d639f3bf38f7d9c9cb84d981e28e2d9414 SHA512 d3eee2527fa2a21dbe63a7f13f2a5bcfbd1005aec972f6ff71f74ad08b25c80a75d1195ffea28d67b0dc48147c9b8c692ed4a8baabdb9219705fe2a78b6aeefd diff --git a/media-gfx/gnome-photos/gnome-photos-43.0.ebuild b/media-gfx/gnome-photos/gnome-photos-43.0.ebuild index b12d1a32a456..567d30c844a8 100644 --- a/media-gfx/gnome-photos/gnome-photos-43.0.ebuild +++ b/media-gfx/gnome-photos/gnome-photos-43.0.ebuild @@ -36,13 +36,9 @@ DEPEND=" " # >=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts] # Upstream left this commented in meson.build. Probably comes back with the next version -# gnome-online-miners is also used for google, facebook, DLNA - not only upnp-av -# but out of all the grilo-plugins, only upnp-av gets used, which has a USE flag here, -# so don't pull it always, but only if USE flag is enabled. # tracker-miners gschema used at runtime. RDEPEND="${DEPEND} - net-misc/gnome-online-miners - upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) + upnp-av? ( net-libs/dleyna:1.0= ) app-misc/tracker-miners:3 " BDEPEND=" diff --git a/media-gfx/gnome-photos/gnome-photos-44.0.ebuild b/media-gfx/gnome-photos/gnome-photos-44.0.ebuild index e710ad49627b..567d30c844a8 100644 --- a/media-gfx/gnome-photos/gnome-photos-44.0.ebuild +++ b/media-gfx/gnome-photos/gnome-photos-44.0.ebuild @@ -36,11 +36,9 @@ DEPEND=" " # >=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts] # Upstream left this commented in meson.build. Probably comes back with the next version -# but out of all the grilo-plugins, only upnp-av gets used, which has a USE flag here, -# so don't pull it always, but only if USE flag is enabled. # tracker-miners gschema used at runtime. RDEPEND="${DEPEND} - upnp-av? ( >=media-plugins/grilo-plugins-0.3.16:0.3[upnp-av] ) + upnp-av? ( net-libs/dleyna:1.0= ) app-misc/tracker-miners:3 " BDEPEND=" diff --git a/media-gfx/gnome-photos/metadata.xml b/media-gfx/gnome-photos/metadata.xml index 69b833c90b08..42a7abd42e08 100644 --- a/media-gfx/gnome-photos/metadata.xml +++ b/media-gfx/gnome-photos/metadata.xml @@ -14,8 +14,8 @@ You can: - Automatically find all your pictures - View recent local and online photos - - Access your Facebook or Flickr pictures - View photos on TVs, laptops or other DLNA renderers on your local network + - Access your Facebook or Flickr pictures - Set pictures as your desktop background - Print photos - Select favorites -- cgit v1.2.3