commit: 596b0066414e9478ce81ae67f175fbbe07a99108 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Mar 17 10:48:22 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Mar 17 10:50:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596b0066
xfce-base/xfwm4: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> xfce-base/xfwm4/Manifest | 2 - .../files/xfwm4-4.16.1-gtk_frame_extents.patch | 56 ---------------- xfce-base/xfwm4/xfwm4-4.16.1-r1.ebuild | 74 ---------------------- xfce-base/xfwm4/xfwm4-4.17.2.ebuild | 74 ---------------------- 4 files changed, 206 deletions(-) diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest index fbfc53c25f63..7f7af9425bf4 100644 --- a/xfce-base/xfwm4/Manifest +++ b/xfce-base/xfwm4/Manifest @@ -1,3 +1 @@ -DIST xfwm4-4.16.1.tar.bz2 1201722 BLAKE2B 4aae9b97095b423964a2ece7fe09b46ecfcea6688af6ab3b38ee34611cd68a7427597cb963b91b209d161c85aed552df15d005268bd8585d365b0cf63adf36b3 SHA512 f0d5d00e58202457d0d7d5f9772e7b2aa3f3339850065609baab7d379248a628d147464cc605698970134b87d58b7867b8c09d0a3a45ab84b2f3aa95be26f0b9 -DIST xfwm4-4.17.2.tar.bz2 1220699 BLAKE2B 4bc011f17ee7fb662e4bb0c656056c45bfb2a07c4964cf9e7791fde35f5b2a072ed7ad8066305228c2af061caee8bf44488ffec0f98a0aba95d3d95fd30123d3 SHA512 2b0c45a5960fca4168431d8efdcaa6d6f22ad26949e40cbe54fb4895f185bb1180386ee61447a0255b3b723657a89b38e6f704d44490ab466be8631fd5494f62 DIST xfwm4-4.18.0.tar.bz2 1220901 BLAKE2B 3a3db6368063b94fa46407fbf2173021a91efff04ed3d11c757d3e785de5e70289ae03e138e95979b3801a781c05d5f84b86b29727171796e1b80f874865bb36 SHA512 1003bb1ca5254221a5d56ffcb51c12cdef1b17b9d252622c6b18f3d3fbcf9d6e0e66b5f61e0f6eae6601ea3e50a70be98320e60d6738b04e44879e6f4e6da34d diff --git a/xfce-base/xfwm4/files/xfwm4-4.16.1-gtk_frame_extents.patch b/xfce-base/xfwm4/files/xfwm4-4.16.1-gtk_frame_extents.patch deleted file mode 100644 index bb170d836b7f..000000000000 --- a/xfce-base/xfwm4/files/xfwm4-4.16.1-gtk_frame_extents.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 488288f6e35d5d3dc077e87fe2ed83129692f62e Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan <[email protected]> -Date: Sun, 14 Nov 2021 11:00:55 +0100 -Subject: [PATCH] client: Handle removal of GTK_FRAME_EXTENTS - -Chromium and GOOGLE Chrome have now support for GTK_FRAME_EXTENTS. - -When maximizing a window, Chromium/Chrome simply removes the property -on its toplevel rather than setting all values to 0. - -xfwm4 would simply ignore the property change because it could not read -the values and therefore apply the old, wrong values. - -Fix xfwm4 to handle the property removal like an actual property change -to 0. - -Signed-off-by: Olivier Fourdan <[email protected]> -Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/603 ---- - src/client.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/client.c b/src/client.c -index 4e6affcfd..310cf90aa 100644 ---- a/src/client.c -+++ b/src/client.c -@@ -4200,6 +4200,7 @@ clientGetGtkFrameExtents (Client * c) - DisplayInfo *display_info; - gboolean value_changed = FALSE; - gulong *extents; -+ unsigned long old_value; - int nitems; - int i; - -@@ -4209,6 +4210,8 @@ clientGetGtkFrameExtents (Client * c) - screen_info = c->screen_info; - display_info = screen_info->display_info; - extents = NULL; -+ -+ old_value = FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS); - FLAG_UNSET (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS); - - if (getCardinalList (display_info, c->window, GTK_FRAME_EXTENTS, &extents, &nitems)) -@@ -4232,6 +4235,9 @@ clientGetGtkFrameExtents (Client * c) - XFree (extents); - } - -+ /* Adding or removing the property also counts as a change */ -+ value_changed |= (old_value ^ FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS)); -+ - return value_changed; - } - --- -2.32.0 - diff --git a/xfce-base/xfwm4/xfwm4-4.16.1-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.16.1-r1.ebuild deleted file mode 100644 index c39278ede9c4..000000000000 --- a/xfce-base/xfwm4/xfwm4-4.16.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils - -DESCRIPTION="Window manager for the Xfce desktop environment" -HOMEPAGE="https://www.xfce.org/projects/"; -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 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="opengl startup-notification +xcomposite +xpresent" - -RDEPEND=">=dev-libs/glib-2.20 - >=x11-libs/gtk+-3.22:3 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXres - x11-libs/pango - >=x11-libs/libwnck-3.14:3 - >=xfce-base/libxfce4util-4.10:= - >=xfce-base/libxfce4ui-4.12:= - >=xfce-base/xfconf-4.13:= - opengl? ( media-libs/libepoxy:=[X(+)] ) - startup-notification? ( x11-libs/startup-notification ) - xcomposite? ( - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXfixes - ) - xpresent? ( x11-libs/libXpresent )" -# libICE/libSM: not really used anywhere but checked by configure -# https://bugzilla.xfce.org/show_bug.cgi?id=11914 -DEPEND="${RDEPEND} - x11-libs/libICE - x11-libs/libSM" -BDEPEND=" - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-gtk_frame_extents.patch" # bug 819771 -) - -src_configure() { - local myconf=( - $(use_enable opengl epoxy) - $(use_enable startup-notification) - $(use_enable xcomposite compositor) - $(use_enable xpresent) - --enable-randr - --enable-render - --enable-xi2 - --enable-xsync - ) - - econf "${myconf[@]}" -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/xfce-base/xfwm4/xfwm4-4.17.2.ebuild b/xfce-base/xfwm4/xfwm4-4.17.2.ebuild deleted file mode 100644 index b42e4331c03c..000000000000 --- a/xfce-base/xfwm4/xfwm4-4.17.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit xdg-utils - -DESCRIPTION="Window manager for the Xfce desktop environment" -HOMEPAGE=" - https://docs.xfce.org/xfce/xfwm4/start - https://gitlab.xfce.org/xfce/xfwm4 -" -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 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="opengl startup-notification +xcomposite +xpresent" - -DEPEND=" - >=dev-libs/glib-2.20 - >=x11-libs/gtk+-3.22:3 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXres - x11-libs/pango - >=x11-libs/libwnck-3.14:3 - >=xfce-base/libxfce4util-4.10:= - >=xfce-base/libxfce4ui-4.12:= - >=xfce-base/xfconf-4.13:= - opengl? ( media-libs/libepoxy:=[X(+)] ) - startup-notification? ( x11-libs/startup-notification ) - xcomposite? ( - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXfixes - ) - xpresent? ( x11-libs/libXpresent ) -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - local myconf=( - $(use_enable opengl epoxy) - $(use_enable startup-notification) - $(use_enable xcomposite compositor) - $(use_enable xpresent) - --enable-randr - --enable-render - --enable-xi2 - --enable-xsync - ) - - econf "${myconf[@]}" -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -}
