From 91f19a3f41e80c4ab434a07636edb90912ef7556 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 6 Apr 2023 23:28:41 +0100 Subject: gentoo auto-resync : 06:04:2023 - 23:28:41 --- xfce-base/xfce4-panel/Manifest | 3 +- .../files/xfce4-panel-4.19.1-no-wayland.patch | 51 ++++++++++++ xfce-base/xfce4-panel/xfce4-panel-4.19.1-r1.ebuild | 91 ++++++++++++++++++++++ xfce-base/xfce4-panel/xfce4-panel-4.19.1.ebuild | 86 -------------------- 4 files changed, 144 insertions(+), 87 deletions(-) create mode 100644 xfce-base/xfce4-panel/files/xfce4-panel-4.19.1-no-wayland.patch create mode 100644 xfce-base/xfce4-panel/xfce4-panel-4.19.1-r1.ebuild delete mode 100644 xfce-base/xfce4-panel/xfce4-panel-4.19.1.ebuild (limited to 'xfce-base/xfce4-panel') diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest index 848e5653deb2..a9a69c6a694b 100644 --- a/xfce-base/xfce4-panel/Manifest +++ b/xfce-base/xfce4-panel/Manifest @@ -1,3 +1,4 @@ +AUX xfce4-panel-4.19.1-no-wayland.patch 2141 BLAKE2B 3cd1fe02ba2287c1b5b043195463127f5239fbf0e700ee3ec7864e2a5e4e9b92350fd8b6c687f842dbb3209be869234eeb91b6d7ee687f63b3790b3c18f11437 SHA512 29c073a3b6e4eb77a78f2638b9a679c4c697abf19858201466d42ae4f3af007fc867401b958f6b882c5c7a182fc6c1debe5bfc1e30fa72b06fd643e9fbdc0dfb DIST xfce4-panel-4.18.2.tar.bz2 1448776 BLAKE2B 5c6f0f3eb85348c6181a94d19331a42ba02e36fd32c747c2dd1d8d762b795e5c8f7a21d4c54765fe498f1d0604ef7229c40f625cb3350dff41c7ec32caa49072 SHA512 8f8aa29a3dc1133477bc7075a2bbb7e7811ebd26f94e9771e4b6987e4aaa2733295e3260cf5b9052545181195ddac50e93c421e4518cdd1ccf18c39c4c972712 DIST xfce4-panel-4.18.3.tar.bz2 1452647 BLAKE2B 40545b13fa0b8d7178fc9753cb3b1b00b0729956155a1321ba7570f83d53eecc528ddaf47cb5653a25d9df1da45d9f586311426df75471c7a6c15f5b28dc6367 SHA512 d85a7540b11c4e9ed9c99b9660d12a14ae665c6c496dd0674dc4aa048d0f043dc3659a42af862ec9409d2181c3b0ae588750373530b4c9f42d4427e08e91de19 DIST xfce4-panel-4.19.0.tar.bz2 1485117 BLAKE2B a70654a1d8633f04310a1a9fb8554254de2f272f6fbbfede3c709a9bdc9b7d6138d5ab26ea83ccc75c9152ee0fb9d2ce7e7b174ace6369eb7d60e14db0828cec SHA512 a1c3c5f535581332c1b5e93bfecabae32cbe610d168f4452bed321466b73e4ca9ca09ca2e7c7f54cb82fe45a6102022bb30f77b57841a9bba03809b703bddf91 @@ -5,5 +6,5 @@ DIST xfce4-panel-4.19.1.tar.bz2 2087777 BLAKE2B 9be568832d6bc56fcecaf6eff2a907b6 EBUILD xfce4-panel-4.18.2.ebuild 1590 BLAKE2B cc1136060fcb7cfdfcf51523efee9c17af783e95ec410fe5818a22ec9a439e96afc5fabd0a54c9c26d875c5e4a0efd8bcdb26e97ef0f1f47de1b0a851ae61537 SHA512 123a616f309295e5a3a199d90c209bd22ecc7f33820bf8577976c719d872bd54a05aebb69952230784cb1270c90d3540a849e616e9e06ad7f1e4d037cfa426fb EBUILD xfce4-panel-4.18.3.ebuild 1596 BLAKE2B c3a1b270c82b55831e96da1a09ca5b7a4d0bc3f94968ec59619ba085bbc802bed69e1a7135d0f4dfefdb601390e90550cf67d9a56032eaf46ef18209140e4422 SHA512 66035ad611a7c795d5f362f30539bc8868b703775c9431297b37c89710f72f99fd918b15088092137e01dddafaed31599334b779f01208358f49d65b25f5a7fb EBUILD xfce4-panel-4.19.0.ebuild 1826 BLAKE2B 0a8407966507b07e8c34073d3c88e8d46f713b8e5bf24a14a007a3f51e108468b1eefe1aac65f7b45321480debfe371bd19bec2951f2a01cde3c59354a83a46b SHA512 f20c5910fc8c732e3db02ae9f57a5f58356bfec42767d9943f6deee803ebdaee414553f202fd3fb1f7f18c1100ef5a7350b040485de633dba73c92b68f7cdb88 -EBUILD xfce4-panel-4.19.1.ebuild 1836 BLAKE2B dfc8e8fb99692a5327c6197a400658d6ed4d77647ff06aff2adef1d538f9f523d3ad714b2f8ebd251b8ada19a3be127121ba1e1f390585016cdaf5e905344769 SHA512 0201729235263d4c10af53405c6db27fc9baa23515e806a8da72878fd26264234881204199487559bebfa07c08d92f5e21bc1396732a4bc47cdeda074667d2ee +EBUILD xfce4-panel-4.19.1-r1.ebuild 1943 BLAKE2B bf3055aba3ce74c0a00b002b6c2346ff111a397de31fbfd6779a38b98a3ea4f5d8899df0b4b39508329c2087c4b339892f301dc0beac971c77cc70a7a73efcb8 SHA512 1a04a997afb423f744044be5d1b4155ac41250d40c20d519ad7728b5bb3d6b1b8af753d0eed4fac4c7a508253d082df075db9e28e62d90a7b1c89f743f675e15 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8 diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.19.1-no-wayland.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.19.1-no-wayland.patch new file mode 100644 index 000000000000..2c7c93e502d4 --- /dev/null +++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.19.1-no-wayland.patch @@ -0,0 +1,51 @@ +From 7eea3cadc0140d6e252a9ed8e3fe3a30ca0d0e38 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= +Date: Thu, 6 Apr 2023 18:22:59 +0200 +Subject: [PATCH] build: Fix for Wayland backend disabled (Fixes #729) + +--- + panel/panel-application.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/panel/panel-application.c b/panel/panel-application.c +index 847352b44..0ade54c9c 100644 +--- a/panel/panel-application.c ++++ b/panel/panel-application.c +@@ -199,7 +199,6 @@ panel_application_class_init (PanelApplicationClass *klass) + static void + panel_application_init (PanelApplication *application) + { +- GdkDisplay *display; + GError *error = NULL; + gint configver; + +@@ -237,21 +236,23 @@ panel_application_init (PanelApplication *application) + application->autosave_timer_id = g_timeout_add_seconds (AUTOSAVE_INTERVAL, + panel_application_autosave_timer, application); + ++#ifdef GDK_WINDOWING_WAYLAND + /* warn the user about restricted features on Wayland */ +- display = gdk_display_get_default (); +- if (GDK_IS_WAYLAND_DISPLAY (display)) ++ if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) + { + if (! gtk_layer_is_supported ()) + g_warning ("Wayland detected without layer-shell support (either because of your" + " compositor or because Xfce4-panel was built without this support):" + " Xfce4-panel might not look like a panel and many of its features will" + " not be available"); +- if (! gdk_wayland_display_query_registry (display, "zwlr_foreign_toplevel_manager_v1")) ++ if (! gdk_wayland_display_query_registry (gdk_display_get_default (), ++ "zwlr_foreign_toplevel_manager_v1")) + g_warning ("Wayland detected without foreign-toplevel-management support (your" + " compositor does not seem to support it): Some Xfce4-panel features will" + " not work (e.g. intellihide), as well as some plugins (e.g. ShowDesktop," + " Tasklist, WindowMenu)"); + } ++#endif + } + + +-- +GitLab + diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.19.1-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.19.1-r1.ebuild new file mode 100644 index 000000000000..970ea40fe46d --- /dev/null +++ b/xfce-base/xfce4-panel/xfce4-panel-4.19.1-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit vala xdg-utils + +DESCRIPTION="Panel for the Xfce desktop environment" +HOMEPAGE=" + https://docs.xfce.org/xfce/xfce4-panel/start + https://gitlab.xfce.org/xfce/xfce4-panel/ +" +SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~riscv ~x86" +IUSE="+dbusmenu introspection vala wayland X" +REQUIRED_USE=" + || ( wayland X ) + vala? ( introspection ) +" + +DEPEND=" + >=dev-libs/glib-2.72.0 + >=x11-libs/cairo-1.16.0 + >=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?] + >=xfce-base/exo-0.11.2:= + >=xfce-base/garcon-4.17.0:= + >=xfce-base/libxfce4ui-4.17.1:= + >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] + >=xfce-base/libxfce4windowing-4.19.1:= + >=xfce-base/xfconf-4.13.2:= + dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) + introspection? ( >=dev-libs/gobject-introspection-1.66:= ) + wayland? ( + >=dev-libs/wayland-1.15 + >=gui-libs/gtk-layer-shell-0.7.0 + ) + X? ( + >=x11-libs/libX11-1.6.7 + x11-libs/libwnck:3 + ) +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + vala? ( $(vala_depend) ) + dev-lang/perl + dev-util/gdbus-codegen + dev-util/gtk-doc-am + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + # https://gitlab.xfce.org/xfce/xfce4-panel/-/issues/729 + "${FILESDIR}"/${P}-no-wayland.patch +) + +src_configure() { + local myconf=( + $(use_enable introspection) + $(use_enable dbusmenu dbusmenu-gtk3) + $(use_enable vala) + $(use_enable wayland wayland-client) + $(use_enable wayland gtk-layer-shell) + $(use_enable X gtk-x11) + $(use_enable X libwnck) + ) + + use vala && vala_setup + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.19.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.19.1.ebuild deleted file mode 100644 index b7665ab7ef89..000000000000 --- a/xfce-base/xfce4-panel/xfce4-panel-4.19.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit vala xdg-utils - -DESCRIPTION="Panel for the Xfce desktop environment" -HOMEPAGE=" - https://docs.xfce.org/xfce/xfce4-panel/start - https://gitlab.xfce.org/xfce/xfce4-panel/ -" -SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~riscv ~x86" -IUSE="+dbusmenu introspection vala wayland X" -REQUIRED_USE=" - || ( wayland X ) - vala? ( introspection ) -" - -DEPEND=" - >=dev-libs/glib-2.72.0 - >=x11-libs/cairo-1.16.0 - >=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?] - >=xfce-base/exo-0.11.2:= - >=xfce-base/garcon-4.17.0:= - >=xfce-base/libxfce4ui-4.17.1:= - >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] - >=xfce-base/libxfce4windowing-4.19.1:= - >=xfce-base/xfconf-4.13.2:= - dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) - introspection? ( >=dev-libs/gobject-introspection-1.66:= ) - wayland? ( - >=dev-libs/wayland-1.15 - >=gui-libs/gtk-layer-shell-0.7.0 - ) - X? ( - >=x11-libs/libX11-1.6.7 - x11-libs/libwnck:3 - ) -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - vala? ( $(vala_depend) ) - dev-lang/perl - dev-util/gdbus-codegen - dev-util/gtk-doc-am - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - local myconf=( - $(use_enable introspection) - $(use_enable dbusmenu dbusmenu-gtk3) - $(use_enable vala) - $(use_enable wayland wayland-client) - $(use_enable wayland gtk-layer-shell) - $(use_enable X gtk-x11) - $(use_enable X libwnck) - ) - - use vala && vala_setup - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} -- cgit v1.2.3