summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2024-08-28 17:07:27 +0200
committerMichał Górny <mgorny@gentoo.org>2024-08-28 17:09:29 +0200
commite17d3046751948a070e808bf14ebff19703e1b2b (patch)
treec6a56087b3128ae168b1d8897fc1b8755e4755a4 /xfce-base
parentapp-emulation/virtualbox-kvm: add 7.0.20_pre20240828 (diff)
downloadgentoo-e17d3046751948a070e808bf14ebff19703e1b2b.tar.gz
gentoo-e17d3046751948a070e808bf14ebff19703e1b2b.tar.bz2
gentoo-e17d3046751948a070e808bf14ebff19703e1b2b.zip
xfce-base/xfdesktop: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfdesktop/Manifest3
-rw-r--r--xfce-base/xfdesktop/files/xfdesktop-4.19.0-no-wayland.patch37
-rw-r--r--xfce-base/xfdesktop/files/xfdesktop-4.19.2-settings.patch79
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.19.0-r2.ebuild71
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.19.2-r2.ebuild70
-rw-r--r--xfce-base/xfdesktop/xfdesktop-4.19.2_p20240509.ebuild76
6 files changed, 0 insertions, 336 deletions
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index dc63fa009018..9835281e4fcd 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,5 +1,2 @@
-DIST xfdesktop-0a2a99eb0d0f4efdb47ccc732ca5bde537a94c8d.tar.bz2 1518912 BLAKE2B 662f6a53dbe042697935f85300e3053feb9c63687bf4c9465c6cc9f77b4ba45afe8e3c442909f6a83661bf303e1bc5607d0ab1d3b6b98432bf74d343454bec4f SHA512 8e84263d0cb76527adc485a5b1b8fcdb306e71ff7778be85eb55b7fb5fd505329ddd5525d95b34df47e8fc87a6d5912ee7d597e34854f4ad9af317ffb2056342
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.2.tar.bz2 2530207 BLAKE2B 42816c6afe81204adfcd6b45e294d8f7ae1b1e9d1986dd12c2bd10742331638b68113d3bbde5873994004967f7efd461466b337648ba12c3f626a0ca50e13cb2 SHA512 101b82e026e026239305ce58f12863b08d47733073f92a22f68b50eb9e6c62525adc0a2482641464ef70f743fe14fabf8eeb66cf03e3cb18907a601f9a527ef6
DIST xfdesktop-4.19.3.tar.bz2 2532496 BLAKE2B 8269bdd216a25a69ffa7c3200454403209d9b3409ce506a79b7cfdaccfbc3d64c0b5576767f21d1afb6f69f271f186209c940350332876b022bb5433ea047b01 SHA512 e14ec75215bd1f2ec276f9d15836f3a73072f07972191e77631e99150cc61ad87fd1291fcdcd9069f4656f9a20175d25b9d43a381d459a27b0c28b481a9739c9
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.19.0-no-wayland.patch b/xfce-base/xfdesktop/files/xfdesktop-4.19.0-no-wayland.patch
deleted file mode 100644
index 016c1297a06e..000000000000
--- a/xfce-base/xfdesktop/files/xfdesktop-4.19.0-no-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/files/xfdesktop-4.19.2-settings.patch b/xfce-base/xfdesktop/files/xfdesktop-4.19.2-settings.patch
deleted file mode 100644
index 4c31dbd777e2..000000000000
--- a/xfce-base/xfdesktop/files/xfdesktop-4.19.2-settings.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From e3807249480b48ad403f94d62c39afca9251b149 Mon Sep 17 00:00:00 2001
-From: "Brian J. Tarricone" <brian@tarricone.org>
-Date: Fri, 26 Apr 2024 01:20:14 -0700
-Subject: [PATCH] Fix invalid param flags
-
----
- src/xfce-desktop.c | 20 ++++++--------------
- 1 file changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
-index b4f837ef..37b4b277 100644
---- a/src/xfce-desktop.c
-+++ b/src/xfce-desktop.c
-@@ -730,31 +730,26 @@ xfce_desktop_class_init(XfceDesktopClass *klass)
- widget_class->popup_menu = xfce_desktop_popup_menu;
- widget_class->style_updated = xfce_desktop_style_updated;
-
--#define XFDESKTOP_PARAM_FLAGS (G_PARAM_READWRITE \
-- | G_PARAM_STATIC_NAME \
-- | G_PARAM_STATIC_NICK \
-- | G_PARAM_STATIC_BLURB)
--
- g_object_class_install_property(gobject_class, PROP_SCREEN,
- g_param_spec_object("screen",
- "gdk screen",
- "gdk screen",
- GDK_TYPE_SCREEN,
-- XFDESKTOP_PARAM_FLAGS | G_PARAM_CONSTRUCT_ONLY));
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(gobject_class, PROP_CHANNEL,
- g_param_spec_object("channel",
- "xfconf channel",
- "xfconf channel",
- XFCONF_TYPE_CHANNEL,
-- XFDESKTOP_PARAM_FLAGS | G_PARAM_CONSTRUCT_ONLY));
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(gobject_class, PROP_PROPERTY_PREFIX,
- g_param_spec_string("property-prefix",
- "xfconf property prefix",
- "xfconf property prefix",
- "",
-- XFDESKTOP_PARAM_FLAGS | G_PARAM_CONSTRUCT_ONLY));
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
-
- #ifdef ENABLE_DESKTOP_ICONS
- g_object_class_install_property(gobject_class, PROP_ICON_STYLE,
-@@ -768,7 +762,7 @@ xfce_desktop_class_init(XfceDesktopClass *klass)
- #else
- XFCE_DESKTOP_ICON_STYLE_WINDOWS,
- #endif /* ENABLE_FILE_ICONS */
-- XFDESKTOP_PARAM_FLAGS));
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
- #endif /* ENABLE_DESKTOP_ICONS */
-
- g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_MODE,
-@@ -776,16 +770,14 @@ xfce_desktop_class_init(XfceDesktopClass *klass)
- "single-workspace-mode",
- "single-workspace-mode",
- TRUE,
-- XFDESKTOP_PARAM_FLAGS));
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_NUMBER,
- g_param_spec_int("single-workspace-number",
- "single-workspace-number",
- "single-workspace-number",
- 0, G_MAXINT16, 0,
-- XFDESKTOP_PARAM_FLAGS));
--
--#undef XFDESKTOP_PARAM_FLAGS
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
-
- xfce_desktop_settings_bindings_init();
- }
---
-GitLab
-
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.0-r2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.0-r2.ebuild
deleted file mode 100644
index 47ab7ab247cc..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.19.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~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.3:=
- >=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=(
- # https://bugs.gentoo.org/904054
- # https://gitlab.xfce.org/xfce/xfdesktop/-/commit/84e087b6f36a06d4db503d6aec4bef415b4b5df2
- "${FILESDIR}/${P}-no-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
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.2-r2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.2-r2.ebuild
deleted file mode 100644
index c5ec981ee642..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.19.2-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 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.3:=[X?]
- >=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
-"
-
-PATCHES=(
- # https://gitlab.xfce.org/xfce/xfdesktop/-/issues/242
- "${FILESDIR}/${P}-settings.patch"
-)
-
-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_p20240509.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.2_p20240509.ebuild
deleted file mode 100644
index 354e52fda373..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.19.2_p20240509.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools xdg-utils
-
-EGIT_COMMIT=0a2a99eb0d0f4efdb47ccc732ca5bde537a94c8d
-MY_P=xfdesktop-${EGIT_COMMIT}
-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://gitlab.xfce.org/xfce/xfdesktop/-/archive/${EGIT_COMMIT}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-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.3:=[X?]
- >=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-build/xfce4-dev-tools
- dev-libs/glib
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-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
-}