From d50cc3158d17be8ef74e071313ee5e70b61fac06 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Mon, 26 Feb 2024 15:42:18 +0100 Subject: xfce-base/xfdesktop: Backport a refresh patch for USE=-wayland MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/904054 Signed-off-by: Michał Górny --- .../files/xfdesktop-4.19.0-no-wayland.patch | 37 ++++++++++++ xfce-base/xfdesktop/xfdesktop-4.19.0-r1.ebuild | 70 ++++++++++++++++++++++ xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild | 64 -------------------- 3 files changed, 107 insertions(+), 64 deletions(-) create mode 100644 xfce-base/xfdesktop/files/xfdesktop-4.19.0-no-wayland.patch create mode 100644 xfce-base/xfdesktop/xfdesktop-4.19.0-r1.ebuild delete mode 100644 xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild (limited to 'xfce-base') 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 new file mode 100644 index 000000000000..016c1297a06e --- /dev/null +++ b/xfce-base/xfdesktop/files/xfdesktop-4.19.0-no-wayland.patch @@ -0,0 +1,37 @@ +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?= + +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-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.0-r1.ebuild new file mode 100644 index 000000000000..514c456fa93d --- /dev/null +++ b/xfce-base/xfdesktop/xfdesktop-4.19.0-r1.ebuild @@ -0,0 +1,70 @@ +# 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.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.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild deleted file mode 100644 index d0c36b0dab6d..000000000000 --- a/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild +++ /dev/null @@ -1,64 +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="~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.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 -" - -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-65-gdbad