gentoo auto-resync : 22:08:2023 - 09:45:59

4 files changed, 128 insertions, 5 deletions

diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index 8c18cd42ff38..5c22ecb9a26c 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,3 +1,5 @@
+AUX mate-settings-daemon-1.26.0-fix-buid-with-clang16.patch 1953 BLAKE2B fcd9cb4f539776b09646d094b2e924708b3e3cd9e469939d3c5a0c01a067e89a977c6f2bb87f3f8ca85dac9c04b359db2775f058f14051f821a63ea1f08119fd SHA512 b48f83a7bfa8ca5a4acfe23fecb51e0a00931a31529fe64cf3779ad275b5499c055eb747e04b73634850434a160149c2fcc3549e74d4d6cae68d40662c080b84
 DIST mate-settings-daemon-1.26.0.tar.xz 1096588 BLAKE2B 49bc951a404375132d90488f2939f587a2beb27f153de7e14d48529e572155925b5dea2e52e0babb01209d67832313011cfd496b060eec6c9250b101250247d9 SHA512 a044d60b2ee00ea99aa29f23990942a37849ddc8cf80e1b8cd6ba12ec92a27a4e602f19586b86a0a7af067e93f71971acd6850ab5f9bc7ce451cd07518fefb91
 EBUILD mate-settings-daemon-1.26.0-r1.ebuild 1642 BLAKE2B e4ffcf72eae80eeb31fc6616b76608bb1cb48b54225f241cdbe3ad383969751c34fe1614db8827d0ee93e4f6a661fee35a3a88aac9b6c8e264de52f556ea88aa SHA512 f309f7e8481d04c11e4a056732ce19bbf25c5a5085e4b03eae6ecc3c7f08b6315478284e1e4d8f21c2d6814228cde7095c062ec055da3393254e81a585227481
-MISC metadata.xml 419 BLAKE2B 64e15dee01ecb229ebeef5a823eb4ea4a88132299e2b5730a7c2bd60d0d447d9ec3a3d68a52e8c512f6105c84832b2637b56785d1fbb0b1d3fc37e5627b47ff4 SHA512 930b7a99c9eaea29ff5d6c687aea42e8312dc3c4f6464b86bcb608c70f8285caec73fc67692e18d3de7b38411e0d2f24b064942a923644ef58915377aadd1bc0
+EBUILD mate-settings-daemon-1.26.0-r2.ebuild 1713 BLAKE2B ba855c69f06672ca975874eb5ec541a9672b2a8b240166145d2af607b388241fce46023d654b4c3c4a690164d9f23ae7412036c3a5f2e329120b591bd159b68e SHA512 936c78346d5ee021d80be88df721e607d86725e1ab0eaaca5579dfbba3dd10166e8be62d6c11bbae2f239beaee66e1567932e8f1bdeef25efd14d2d9df1bb989
+MISC metadata.xml 335 BLAKE2B f0b5b8ceab5ca5f1eb9ba419d0e89c540528753619886f355aac30dd9d90378d6897bec3fad3044e4940641e987ca1c26185c07961f2c020f69d4754b71c999c SHA512 a6fc66c17067f511035e0dc7b3c40cae3a5c072be61e9e4226771a805adfc98d477f09ca0fbd6f9e8dd5ff15efec66b8949248a2d0fbd51374f1d38122cc3bcc
diff --git a/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.26.0-fix-buid-with-clang16.patch b/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.26.0-fix-buid-with-clang16.patch
new file mode 100644
index 000000000000..cf91dbc6412e
--- /dev/null
+++ b/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.26.0-fix-buid-with-clang16.patch
@@ -0,0 +1,45 @@
+https://github.com/mate-desktop/mate-settings-daemon/commit/42e91f2805c508317b4d26166cb3db332dd313e8.patch
+From: Colomban Wendling <cwendling@hypra.fr>
+Date: Tue, 27 Jun 2023 12:21:16 +0200
+Subject: [PATCH] a11y-keyboard-atspi: Fix memory leak
+
+Fix fairly large memory leak when beeping on keys while caps lock is
+enabled.  The libatspi2 docs and API were quite misleading, so I
+overlooked the fact the event parameter should be freed in the
+callback.
+
+This changes the constness of the callback argument, which is new in
+libatspi2 2.40 -- yet the actual behavior didn't change, only the
+qualifier was removed, see [1].
+This might however bring up a compiler warning when building against
+libatspi2 < 2.40;  but on the other hand it fixed build with
+clang >= 16, see #399.  As it is unlikely to build with clang >= 16
+and libatspi2 < 2.40, I think it's a good compromise.
+
+[1] https://gitlab.gnome.org/GNOME/at-spi2-core/-/commit/7dfb0b7fc2d1710ef7fad54f910fa4c6a5e3af17
+--- a/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.c
++++ b/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.c
+@@ -55,16 +55,16 @@ msd_a11y_keyboard_atspi_class_init (MsdA11yKeyboardAtspiClass *klass)
+ }
+ 
+ static gboolean
+-on_key_press_event (const AtspiDeviceEvent *event,
+-                    void                   *user_data G_GNUC_UNUSED)
++on_key_press_event (AtspiDeviceEvent *event,
++                    void             *user_data G_GNUC_UNUSED)
+ {
+         /* don't ring on capslock itself, that's taken care of by togglekeys
+          * if the user want it. */
+-        if (event->id == GDK_KEY_Caps_Lock)
+-                return FALSE;
+-
+-        gdk_display_beep (gdk_display_get_default ());
++        if (event->id != GDK_KEY_Caps_Lock)
++                gdk_display_beep (gdk_display_get_default ());
+ 
++        /* cast the possible erroneous const away with atspi < 2.40 */
++        g_boxed_free (ATSPI_TYPE_DEVICE_EVENT, (gpointer) event);
+         return FALSE;
+ }
+ 
+
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.26.0-r2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.26.0-r2.ebuild
new file mode 100644
index 000000000000..c80a74807cf3
--- /dev/null
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.26.0-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="MATE Settings Daemon"
+LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="X accessibility debug libnotify policykit pulseaudio rfkill smartcard +sound"
+
+REQUIRED_USE="pulseaudio? ( sound )"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/dconf-0.13.4
+	>=mate-base/libmatekbd-1.17.0
+	>=mate-base/mate-desktop-1.25.0
+	media-libs/fontconfig:1.0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXext
+	>=x11-libs/libxklavier-5.2
+	accessibility? ( >=app-accessibility/at-spi2-core-2.36.0 )
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	policykit? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-1.10.0
+		>=sys-auth/polkit-0.97
+	)
+	pulseaudio? (
+		>=media-libs/libmatemixer-1.10[pulseaudio]
+		media-libs/libpulse
+	)
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	sound? (
+		>=media-libs/libmatemixer-1.10
+		media-libs/libcanberra[gtk3]
+	virtual/libintl
+	)
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.0-fix-buid-with-clang16.patch
+)
+
+src_configure() {
+	mate_src_configure \
+		$(use_with X x) \
+		$(use_with libnotify) \
+		$(use_with sound libcanberra) \
+		$(use_with sound libmatemixer) \
+		$(use_enable debug) \
+		$(use_enable policykit polkit) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rfkill) \
+		$(use_enable smartcard smartcard-support)
+}
diff --git a/mate-base/mate-settings-daemon/metadata.xml b/mate-base/mate-settings-daemon/metadata.xml
index 9ff0273bc493..3bf2b53bc621 100644
--- a/mate-base/mate-settings-daemon/metadata.xml
+++ b/mate-base/mate-settings-daemon/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>mate@gentoo.org</email>
-		<name>Gentoo MATE Desktop</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-settings-daemon</remote-id>
 	</upstream>