From fab95e98818bada1626a7723a1348f4e920d25e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Feb 2024 17:40:44 +0000 Subject: gentoo auto-resync : 26:02:2024 - 17:40:44 --- xfce-base/Manifest.gz | Bin 3055 -> 3057 bytes xfce-base/xfdesktop/Manifest | 3 +- .../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 ------------------- 5 files changed, 109 insertions(+), 65 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/Manifest.gz b/xfce-base/Manifest.gz index 551c01cc614c..94edd5fde2a7 100644 Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest index 95a542213ee2..b4f356323ae2 100644 --- a/xfce-base/xfdesktop/Manifest +++ b/xfce-base/xfdesktop/Manifest @@ -1,7 +1,8 @@ +AUX xfdesktop-4.19.0-no-wayland.patch 1151 BLAKE2B 5b1ef713034e11c79eaf78b78ebac124ae67b53f5ca66340c978678578e51ee3f4a263e263ebad9cdcff7baddba8be1427da41eca7be37284741273402eae903 SHA512 d284148b998d47b347d747ee88d913d7fe199faf4b58af4a2be3660f7989a31884b767c6690bafbbf4170ab67941f64beaf603ecafdb69b7af2c97c6e18b43dd 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 EBUILD xfdesktop-4.18.1.ebuild 1229 BLAKE2B 691a6a3de2235466ef91f577852e84aa7d3504130f5eebc6e2ff2b73ef4c5a009fcea17f3c17a98b4c72592de2823618798c7693d509200be2bd54056db59804 SHA512 e99a10ce8659b2db3841d7cec656900351ec6b5750b015e0060c64bdf2c0c96a76053c41ef0c8e55253540727b2682da081f57a10f92972adb9f43a75449ce51 -EBUILD xfdesktop-4.19.0.ebuild 1412 BLAKE2B 084468eca5eb68c01102aa151eeb7a777dbfed160a9d3b42d7ee568ea057a0ca18f4823794b072267141cb6ef30f9a4ecc9078890be7175a6e527a97c60fdda0 SHA512 5c7bd33994776d6834c7df889d770aba2f8eeae3296bcc31fcccd3eb58eafdf88c25e2e5be86cf6a1eceb47e5919215410fd691a8a3cc38383c685ef35b832d5 +EBUILD xfdesktop-4.19.0-r1.ebuild 1588 BLAKE2B 9776ff63ab62a9517e46f094e243b1b61bd307937b6e3414b8724afa566cd482b511136a524b7a2631547c6d55a119586616b452ba75dc23b8a3ee690b3dd5d4 SHA512 76a681f21ac5288408ee871a6dfe0d63844a9bb6021a0992831b34bc367d9e4d5e122c0ce63a5c914138417493acee9fa3dc5e0dea472e543caf317fd34d0979 EBUILD xfdesktop-4.19.1.ebuild 1417 BLAKE2B 7b5b9340edd0754f4a9108e58cd72d8e2632abe1b6eae728ead7d45c7967d2f453f03ef18402864574305435b2c6711f983769a24d352ccde00ba1614842afea SHA512 85600731b7668f2979375911e69848824cea6b172bf33c168979ea5590200db585cece7451aec4efd5450bb61f9a12be15292162928c6865f95e68dd0a6c1927 MISC metadata.xml 365 BLAKE2B 3cd0b2d7af4ed8e4fd437c2943ca6324fe0b3ba74f92ef24adf0d2891cd650ca7007827b55d4a0d2ce9684219c417933055db293aa79c8834ca1cefe2a9bcccb SHA512 90ca4f491f2281bdee066d39066cc99e738a7fba87fc4d7ea435462ca7f7dd7bf451f4f6658b0f5d46690058de94ad98c2c6074baa94398d6d26d2950decd574 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