gentoo auto-resync : 05:03:2023 - 23:52:45

4 files changed, 158 insertions, 2 deletions

diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 8cc3b3032ed4..9b0fa9a32500 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,4 +1,7 @@
 AUX 0.30.16-optional-wayland.patch 2111 BLAKE2B 9d928c8b449792b198314c9f169dc2ddfddb97efbf43bf888a6e00fc47e9f60635f8d482a6b227335e0e7ef028e663b8b959a18658ba300ceb925704e977b8cb SHA512 4b6e00823a4cd271ba72b382b35694737d6944cbb123465da4243a16cb5cf6bbf3a8d3ecc707ded6e74df47ac76c5ebe1f789aebfc7c4a7b0ecd8e926d32c120
+AUX shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch 1835 BLAKE2B 7538be63cb6ca6c3a0a2706b652e7a804be03926528186a5348fc11b9c3bb815bca276d1bc4f9f09139dfdc69b5691926e7e55f199c192bd24cbb6582ed91c7c SHA512 e182c8bff3e22e31570fcdf2e23d481189d7ccd7fc95b69131c5fb222ca7e257d29e9eb41313b05fd9d7d7b7f726a4345a3c5d9fc0a802df42053fd1dba1f1bb
 DIST shotwell-0.30.17.tar.xz 6533460 BLAKE2B 58ec94f21bf465dcc19760f40235db7d2ad7d00c214802cd3ad6cfd67cb1088a5999f183c8ae36398e492a1b387e6ea717a9b8d0f31f4ef369e67c10150ae57a SHA512 f680b6f58538fb7b584594d00da7fe997dbc766583a5b5a85943b3df905dbc7192d3e7b5c7b47b6bd1221280995aaba878ea1afff9b042995bf30fbcbce5f7ea
-EBUILD shotwell-0.30.17-r1.ebuild 1922 BLAKE2B 9d0196fecccc9f2a970864ab39e5c8f12c9803bcaa538281f0695d4171ba8b0bffe9694ef86b3bd2fea5475c316a1a467e767a610bdb382b900e3fc5cfc09062 SHA512 5a0631c325964b4b601a6c53824d42838165ac47a520bc37607c2e63b2efd0e61c3de6d4653abe64629766805611682112bb76eedd32bc85b31d4c9145f17314
+DIST shotwell-0.31.7.tar.xz 6610144 BLAKE2B b8f69237abb987508f565d5bfd59123fabf2fa1023783362b189da2690a2b72d5908e13c1371097b48db9eddf1b1361b0b92ca1b5e86287dd35b484bbf119593 SHA512 6653cbc2b2147f65d615f6ea879d012e6a5c5b55c9dfcdb8ff9fecf909ee6f5db96ac8124608d8223e0a95ab26508064b9376a293a2bd4fe05a821988400f42e
+EBUILD shotwell-0.30.17-r1.ebuild 2003 BLAKE2B 1b00a0247eccac96d54b539b268544453d62341afb6bd84f0c707480e2e39b0dfaf686ee011fb0b91fbaf77c190ab72a8cbb6444080943a67237f01b16656b4d SHA512 844c5db5695d761ccb9bb08927d519898f777859dd2d967e37456cb1baceab564f7cbfa3609f1f518ce440ac28b55bf4619af1fce75384acd64cf39e59bddadc
+EBUILD shotwell-0.31.7.ebuild 2030 BLAKE2B 1a9935aac9de68539be322b2bd3302653125e854293c8413f2b15fe9525ebdac92727637ebc2d8e5cb750c52b4e732d954538256a3d66ee23c4b041d5998ad36 SHA512 b8d6aa7433be49d3bec26ade9c938235bcab41b3a4b06209dc84d8f8d5a3ea2b0bf70067a1ef7b657645fb043a99cfa410ccf72b9fc3e30516b983ae05aed391
 MISC metadata.xml 794 BLAKE2B c1eb4a08828db11ba473fe21036201d3b57c2fa36a2bd39b18e7671cf5e4c42b2b9e82956456a0376a60bfc982d9af106577075d936dba3c0cb73947da46f427 SHA512 2c65cdf3c6d5a953b52ad81e0a85d1c1465f5c38c3475e5c1408baea0b14a053255e97c0efc560059c77c51dbe98b72a90c6164fe575e68cba3eb04d4774f490
diff --git a/media-gfx/shotwell/files/shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch b/media-gfx/shotwell/files/shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
new file mode 100644
index 000000000000..76e959266fc7
--- /dev/null
+++ b/media-gfx/shotwell/files/shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
@@ -0,0 +1,57 @@
+From cd82759231e5ece2fa0dea40397c9051d15fd5c2 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 5 Feb 2023 20:44:49 +0100
+Subject: [PATCH] gphoto2: Add missing cheader attributes of delegate symbols
+
+---
+ vapi/libgphoto2.vapi | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
+index e9387b29..67cb2098 100644
+--- a/vapi/libgphoto2.vapi
++++ b/vapi/libgphoto2.vapi
+@@ -340,19 +340,40 @@ namespace GPhoto {
+         public void set_message_func([CCode (delegate_target_pos=3.1)] ContextMessageFunc messageFunc);
+     }
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextIdleFunc(Context context);
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextErrorFunc(Context context, string text);
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextStatusFunc(Context context, string text);
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextMessageFunc(Context context, string text);
+     
+     // TODO: Support for va_args in Vala, esp. for delegates?
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate uint ContextProgressStartFunc(Context context, float target, string text);
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextProgressUpdateFunc(Context context, uint id, float current);
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextProgressStopFunc(Context context, uint id);
+     
+     [CCode (
+-- 
+2.39.2
+
diff --git a/media-gfx/shotwell/shotwell-0.30.17-r1.ebuild b/media-gfx/shotwell/shotwell-0.30.17-r1.ebuild
index 3eb97823c813..332fa0c27c41 100644
--- a/media-gfx/shotwell/shotwell-0.30.17-r1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.17-r1.ebuild
@@ -51,7 +51,10 @@ BDEPEND="
 	app-crypt/gcr:0[vala]
 "
 
-PATCHES=( "${FILESDIR}"/0.30.16-optional-wayland.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
+	"${FILESDIR}"/0.30.16-optional-wayland.patch
+)
 
 src_prepare() {
 	default
diff --git a/media-gfx/shotwell/shotwell-0.31.7.ebuild b/media-gfx/shotwell/shotwell-0.31.7.ebuild
new file mode 100644
index 000000000000..2e50785196e9
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.31.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+IUSE="opencv udev"
+
+DEPEND="
+	>=x11-libs/gtk+-3.22.0:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8.5:0.8=
+	>=net-libs/webkit-gtk-2.26:4.1
+	net-libs/libsoup:3.0
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libxml2-2.6.32:2
+	x11-libs/gdk-pixbuf:2
+	>=dev-db/sqlite-3.5.9:3
+	>=media-libs/gstreamer-1.20:1.0
+	>=media-libs/gst-plugins-base-1.20:1.0
+	>=media-libs/libgphoto2-2.5:=
+	udev? ( >=dev-libs/libgudev-145:= )
+	>=media-libs/gexiv2-0.12.3
+	>=media-libs/libraw-0.13.2:=
+	>=media-libs/libexif-0.6.16
+	app-crypt/libsecret
+	>=dev-libs/libportal-0.5:=[gtk]
+	media-libs/libwebp:=
+
+	>=app-crypt/gcr-3:0=[gtk]
+	x11-libs/cairo
+	opencv? ( >=media-libs/opencv-4.0.0:= )
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/libsoup:3.0[vala]
+	media-libs/gexiv2[vala]
+	app-crypt/gcr:0[vala]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
+)
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dunity_support=false
+		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+		#trace
+		#measure
+		-Ddupe_detection=true
+		$(meson_use udev)
+		-Dinstall_apport_hook=false
+		$(meson_use opencv face_detection)
+		-Dfatal_warnings=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}