From 0cb086ce5d15c269a12de4a7f20a22c244c5d6ca Mon Sep 17 00:00:00 2001
From: Marcin Deranek <marcin.deranek@slonko.net>
Date: Mon, 26 Feb 2024 22:16:10 +0100
Subject: xfce-base/xfdesktop Drop as already upstream

---
 xfce-base/xfdesktop/Manifest                |  3 --
 xfce-base/xfdesktop/files/non-wayland.patch | 37 ----------------
 xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild | 67 -----------------------------
 3 files changed, 107 deletions(-)
 delete mode 100644 xfce-base/xfdesktop/Manifest
 delete mode 100644 xfce-base/xfdesktop/files/non-wayland.patch
 delete mode 100644 xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild

diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
deleted file mode 100644
index 2cd7409..0000000
--- a/xfce-base/xfdesktop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX non-wayland.patch 1151 BLAKE2B 5b1ef713034e11c79eaf78b78ebac124ae67b53f5ca66340c978678578e51ee3f4a263e263ebad9cdcff7baddba8be1427da41eca7be37284741273402eae903 SHA512 d284148b998d47b347d747ee88d913d7fe199faf4b58af4a2be3660f7989a31884b767c6690bafbbf4170ab67941f64beaf603ecafdb69b7af2c97c6e18b43dd
-DIST xfdesktop-4.19.0.tar.bz2 2145725 BLAKE2B 18ed97b8bb9ee769de29490383fd089eb884081c95e662350c9e0c05aa9812a4f44e8911c5bb74e026aa1fea22840245a68e1514dd6e439af8dd553c82da562c SHA512 dd8d479b7a43733dc49f692bd88ad5a290d5fa4cdbddf42be293921c750d3017e9c6671cc56ba8888a0df8d3951b0993dffa88418032ad7c68f85d8756081e40
-EBUILD xfdesktop-4.19.0.ebuild 1437 BLAKE2B b9a80cf63795386d9db37b2f55c53eb5879df45b56c6e31807db1b930ffec6b523d2bb1d56d67442b95f0af777633fcec440fc909e123b857e9d5a184e321d0a SHA512 b55f5078e6be399e83b6787994687e415fe4a106f8992d6743bb8eff4e75186194edb31ba30fce7cc2c8791d5688d814b4267e3edba3b15350e1df1fc3442d2c
diff --git a/xfce-base/xfdesktop/files/non-wayland.patch b/xfce-base/xfdesktop/files/non-wayland.patch
deleted file mode 100644
index 016c129..0000000
--- a/xfce-base/xfdesktop/files/non-wayland.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 84e087b6f36a06d4db503d6aec4bef415b4b5df2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Fri, 17 Feb 2023 19:48:52 +0700
-Subject: [PATCH] main: Fix control (always) reach end of non void function
-
-When configured with --disable-wayland, the ENABLE_WAYLAND will be
-dropped, the "return matches" clause will be considered the else
-statement of the "if (xfw_windowing_get() == _X11)", which is always
-false in this scenario.  Thus, this function always reach end of
-function without any return values.
-
-While we're at it, fix the comment for the ENABLE_WAYLAND leg.
----
- settings/main.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/settings/main.c b/settings/main.c
-index 3a1ce17b..410a2d23 100644
---- a/settings/main.c
-+++ b/settings/main.c
-@@ -1740,8 +1740,11 @@ is_our_window(AppearancePanel *panel,
-             matches = TRUE;
-         }
-         // TODO: check window geometry?
-+    } else
-+#endif  /* ENABLE_WAYLAND */
-+    {
-+        g_assert_not_reached();
-     }
--#endif  /* GTK_WINDOWING_WAYLAND */
- 
-     return matches;
- }
--- 
-GitLab
-
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
deleted file mode 100644
index 143793c..0000000
--- a/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
+++ /dev/null
@@ -1,67 +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?]
-	x11-libs/libX11
-	>=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.12.1:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? ( >=xfce-base/thunar-4.17.10:= )
-	wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/non-wayland.patch"
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable wayland)
-		$(use_enable wayland gtk-layer-shell)
-		$(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
-}
-- 
cgit v1.2.3