gentoo auto-resync : 26:04:2024 - 23:59:36

5 files changed, 32 insertions, 68 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 05af6283f87f..5ad66ef36918 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 6eabfe1e0788..d1f78c24c53c 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,10 +1,9 @@
 AUX xfdesktop-4.19.0-no-wayland.patch 1151 BLAKE2B 5b1ef713034e11c79eaf78b78ebac124ae67b53f5ca66340c978678578e51ee3f4a263e263ebad9cdcff7baddba8be1427da41eca7be37284741273402eae903 SHA512 d284148b998d47b347d747ee88d913d7fe199faf4b58af4a2be3660f7989a31884b767c6690bafbbf4170ab67941f64beaf603ecafdb69b7af2c97c6e18b43dd
+AUX xfdesktop-4.19.2-settings.patch 869 BLAKE2B 4e31a408185ab34964da110cc07ef5662c2265557992a7ed6ba252be380ca52459e88dfe04d46053734a4fec22cc7cfb1898620af4f605993a8ecae2fe651c12 SHA512 0ed47cb59854823e01fad5f558ddfead7636c84c4e3c701ef852e619a8789a63b8b876dc56f15b19dd79a01be4fca3bb3db99c64ecf5e606f7195482610d3cc5
 DIST xfdesktop-4.18.1.tar.bz2 2133258 BLAKE2B 3d4f54b64a6adc5f52bf6b48862b1fbf9b9608113035fdce89a2cb08a674f773f42edc0e1d05a27e89de7df71f7d53f400b794a2a79888cf51570c3ab060db8b SHA512 cafb1e274bbabf1704a6452532fc79657af26eaf92a58374f87a70f31c35fbf213319c6658b3d18bfca2d555b69e07e46949407d1f80e5a37f48e76bbde9dc3e
 DIST xfdesktop-4.19.0.tar.bz2 2145725 BLAKE2B 18ed97b8bb9ee769de29490383fd089eb884081c95e662350c9e0c05aa9812a4f44e8911c5bb74e026aa1fea22840245a68e1514dd6e439af8dd553c82da562c SHA512 dd8d479b7a43733dc49f692bd88ad5a290d5fa4cdbddf42be293921c750d3017e9c6671cc56ba8888a0df8d3951b0993dffa88418032ad7c68f85d8756081e40
-DIST xfdesktop-4.19.1.tar.bz2 2523196 BLAKE2B fb499192d1c5fbbc78d3e5d9c38aa5a7bc5f19058946be21aafbd5ffe2dc31bb197a4822d92094d914ab01a416409612c39a2478bacfd12e6f2bf98a5ad262c3 SHA512 f07cdcedf8eb47bf14688a88251075ac84a876294f95cf49845f206374f15355d0b641099f402a3a0295c6b737a3d865315c00bb1fec6b0558027faa31f6e19f
 DIST xfdesktop-4.19.2.tar.bz2 2530207 BLAKE2B 42816c6afe81204adfcd6b45e294d8f7ae1b1e9d1986dd12c2bd10742331638b68113d3bbde5873994004967f7efd461466b337648ba12c3f626a0ca50e13cb2 SHA512 101b82e026e026239305ce58f12863b08d47733073f92a22f68b50eb9e6c62525adc0a2482641464ef70f743fe14fabf8eeb66cf03e3cb18907a601f9a527ef6
 EBUILD xfdesktop-4.18.1.ebuild 1229 BLAKE2B 691a6a3de2235466ef91f577852e84aa7d3504130f5eebc6e2ff2b73ef4c5a009fcea17f3c17a98b4c72592de2823618798c7693d509200be2bd54056db59804 SHA512 e99a10ce8659b2db3841d7cec656900351ec6b5750b015e0060c64bdf2c0c96a76053c41ef0c8e55253540727b2682da081f57a10f92972adb9f43a75449ce51
 EBUILD xfdesktop-4.19.0-r2.ebuild 1625 BLAKE2B 093ce4333270808485e16946af365171e5c2292dc0fe8c0ff440abf9cf82ae46f741603d8e2fd16e3f94e6dbae01bd062b4111c0c6ccec19edf451a3d203ceb1 SHA512 e53b0b02efd6e72e1147267b1392748ec8e9998b13faee4ba7100a336a66cb7f0f1270c6f2390177e861e55d4d44fb169a7f60c7906439211ad6baf6c610942f
-EBUILD xfdesktop-4.19.1.ebuild 1417 BLAKE2B 7b5b9340edd0754f4a9108e58cd72d8e2632abe1b6eae728ead7d45c7967d2f453f03ef18402864574305435b2c6711f983769a24d352ccde00ba1614842afea SHA512 85600731b7668f2979375911e69848824cea6b172bf33c168979ea5590200db585cece7451aec4efd5450bb61f9a12be15292162928c6865f95e68dd0a6c1927
-EBUILD xfdesktop-4.19.2.ebuild 1421 BLAKE2B 06d7d972a2d612a1ec544583582a6b3bdbf5436bf3c15980612edf7da4683163ca2c0cad52de2a193ae2698f3e8d08ef1ab8102a3894771b2733f3f9c3742b5e SHA512 8284a22f5eeef2dfe26ddfe1a5e7f7328e744c0c268fcf24f1688deedb4d5a43386e30467c8516b7fc065c4006b77ac864b21ae63347a613d590e91fa0c8c83b
+EBUILD xfdesktop-4.19.2-r1.ebuild 1524 BLAKE2B 579390e64d1302403f60ce3f1f52fe8b734a53a1cd8e023691481ba54f8e94cc8e107fb3669acd4fbcebba830eacee947869ce2c07354353ebc3ad0634f3a574 SHA512 51fd3b778a940a2ed0534b0e8968b3e5ec2cc8d1d6f2738a6ef22d1262173d8e0b6e6d6c7f536e26da5e5488f63adbd0964937c92fb92350216a6210981860ab
 MISC metadata.xml 365 BLAKE2B 3cd0b2d7af4ed8e4fd437c2943ca6324fe0b3ba74f92ef24adf0d2891cd650ca7007827b55d4a0d2ce9684219c417933055db293aa79c8834ca1cefe2a9bcccb SHA512 90ca4f491f2281bdee066d39066cc99e738a7fba87fc4d7ea435462ca7f7dd7bf451f4f6658b0f5d46690058de94ad98c2c6074baa94398d6d26d2950decd574
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.19.2-settings.patch b/xfce-base/xfdesktop/files/xfdesktop-4.19.2-settings.patch
new file mode 100644
index 000000000000..e384ef578a1d
--- /dev/null
+++ b/xfce-base/xfdesktop/files/xfdesktop-4.19.2-settings.patch
@@ -0,0 +1,25 @@
+From 439bf8a8cd36796c33ae0b413641338417c9a911 Mon Sep 17 00:00:00 2001
+From: "Brian J. Tarricone" <brian@tarricone.org>
+Date: Thu, 25 Apr 2024 23:28:24 -0700
+Subject: [PATCH] Fix some default settings not being applied on startup
+
+Closes #242.
+---
+ src/xfce-desktop.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
+index e79e83305..b4f837ef5 100644
+--- a/src/xfce-desktop.c
++++ b/src/xfce-desktop.c
+@@ -731,6 +731,7 @@ xfce_desktop_class_init(XfceDesktopClass *klass)
+     widget_class->style_updated = xfce_desktop_style_updated;
+ 
+ #define XFDESKTOP_PARAM_FLAGS  (G_PARAM_READWRITE \
++                                | G_PARAM_CONSTRUCT \
+                                 | G_PARAM_STATIC_NAME \
+                                 | G_PARAM_STATIC_NICK \
+                                 | G_PARAM_STATIC_BLURB)
+-- 
+GitLab
+
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.1.ebuild
deleted file mode 100644
index 34e4a0e990c2..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.19.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfdesktop/start
-	https://gitlab.xfce.org/xfce/xfdesktop/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="libnotify +thunar wayland X"
-REQUIRED_USE="|| ( wayland X )"
-
-DEPEND="
-	>=x11-libs/cairo-1.16
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3[wayland?,X?]
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=
-	>=xfce-base/libxfce4windowing-4.19.1:=
-	>=xfce-base/xfconf-4.18.0:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? ( >=xfce-base/thunar-4.17.10:= )
-	wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
-	X? ( >=x11-libs/libX11-1.6.7 )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-libs/glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.2-r1.ebuild
index eba432b23304..c5ec981ee642 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.19.2.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.19.2-r1.ebuild
@@ -44,6 +44,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# https://gitlab.xfce.org/xfce/xfdesktop/-/issues/242
+	"${FILESDIR}/${P}-settings.patch"
+)
+
 src_configure() {
 	local myconf=(
 		$(use_enable wayland)