From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- xfce-base/Manifest.gz | Bin 2377 -> 2381 bytes xfce-base/thunar/Manifest | 2 + xfce-base/thunar/thunar-4.17.7.ebuild | 76 +++++++++++++++++++++ xfce-base/xfwm4/Manifest | 3 +- .../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.16.1.ebuild | 70 ------------------- 7 files changed, 210 insertions(+), 71 deletions(-) create mode 100644 xfce-base/thunar/thunar-4.17.7.ebuild create mode 100644 xfce-base/xfwm4/files/xfwm4-4.16.1-gtk_frame_extents.patch create mode 100644 xfce-base/xfwm4/xfwm4-4.16.1-r1.ebuild delete mode 100644 xfce-base/xfwm4/xfwm4-4.16.1.ebuild (limited to 'xfce-base') diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz index 8fcf046fe9d0..79d3b438e475 100644 Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest index 488d7043d04c..6c5298a5a3d4 100644 --- a/xfce-base/thunar/Manifest +++ b/xfce-base/thunar/Manifest @@ -1,5 +1,7 @@ DIST thunar-4.16.10.tar.bz2 2324476 BLAKE2B a8305f234b6f69654d6559594f1228ebbb5009b337fbdee6d94dc2f3c309d67cbe2aa5c357fd5207d4e907b9d06875dd3164d501c84a22c9f73e71b705577fd7 SHA512 b6fbb27acaae85e7d5c711213c5c457d7eaf973dabafbeabbc00ef01491b54b05da00304503ed03a1ee0716c2558f435754666dd5358f36b2e155e4c8132ebce DIST thunar-4.17.6.tar.bz2 2474323 BLAKE2B add0ec83dfff7119df7b0c7dfde579cbd8ea5ae86f77e38f8d1777d47c85145a8f301b3008a278a5ab94efd8ab3fcd6467cf09671630335b2e06123432e8209f SHA512 8ee9508ef1384525991fa96c7b69a4722bbb5d8f7a16c065f47daae9e9eca6e06875c92ba4a15b9c420a8162b9bd547d5a15120cc2f08e0824d318f52fd14b44 +DIST thunar-4.17.7.tar.bz2 2507703 BLAKE2B 18393d33066059892e0a1bff68728d69aacc36604b48483789783aa3474ad3fa7c48c80a3af2380d61ac01bb027f092be63dc78fa40638b662348cb2c53bd4bf SHA512 79ccfd2baed6f956706dda52de9a0fe4dda6c59c10833fe9e699f6797abb092ba1640a97150413f890829d83fe78bb700f7a1fa912515866bc3ba7f53a350223 EBUILD thunar-4.16.10.ebuild 2071 BLAKE2B 37023177de84d24f6b4a441e2e860db59b1b8aabcfda38b0b665d20a3569b567604e4c9dacd019966639d346bd21cbc7e06c7aed4230b0626457c2edde4e5a4d SHA512 b4ebddc797e213f756f91f7f21b28be09d05fdfa93579bc162b95393dc0296c91cfd5e541dcbe98243145094cd768c3132b1e53de1b7ba84788eb7e2ff47876e EBUILD thunar-4.17.6.ebuild 2084 BLAKE2B 6f15d0d35c260c8e06bb4978944a7fff8a08771044affe31095b149fc2919e082e52da59ec47b9bf34d0c5c58395325c8c502c3d92cae984208bf561111edb7d SHA512 293e7373a7fb68bfd50f98e66871310220e7d0c81357c95ead70abc8d43f1da8580d58c1c86be7718351659dab197c6bbfb1f5892bc21cdb18bad791c9d4058d +EBUILD thunar-4.17.7.ebuild 2084 BLAKE2B 6f15d0d35c260c8e06bb4978944a7fff8a08771044affe31095b149fc2919e082e52da59ec47b9bf34d0c5c58395325c8c502c3d92cae984208bf561111edb7d SHA512 293e7373a7fb68bfd50f98e66871310220e7d0c81357c95ead70abc8d43f1da8580d58c1c86be7718351659dab197c6bbfb1f5892bc21cdb18bad791c9d4058d MISC metadata.xml 373 BLAKE2B 8565ee8f50389c9ecd482437d0081ce6c9ed0ade1fffd724c2485c03c708565c91bf89a974a37a3deb541e2e0cf35a19881c8b3ee39182f26d1c522088466ff1 SHA512 b73f53699dc6b936d1baa9bffde644a86481083b4ca333b2d5148bcd03c43e9ff9577c6b35a2e40d89071158c4b4deea4d6317e40959f4344b7f974ac3d22c71 diff --git a/xfce-base/thunar/thunar-4.17.7.ebuild b/xfce-base/thunar/thunar-4.17.7.ebuild new file mode 100644 index 000000000000..d13c7d3b9207 --- /dev/null +++ b/xfce-base/thunar/thunar-4.17.7.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit xdg-utils + +DESCRIPTION="File manager for the Xfce desktop environment" +HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start" +SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks" + +GVFS_DEPEND=">=gnome-base/gvfs-1.18.3" +DEPEND=">=dev-libs/glib-2.56 + >=x11-libs/gdk-pixbuf-2.14 + >=x11-libs/gtk+-3.22:3 + >=xfce-base/exo-4.17.0:= + >=xfce-base/libxfce4ui-4.17.0:= + >=xfce-base/libxfce4util-4.17.1:= + >=xfce-base/xfconf-4.12:= + exif? ( >=media-libs/libexif-0.6.19:= ) + introspection? ( dev-libs/gobject-introspection:= ) + libnotify? ( >=x11-libs/libnotify-0.7 ) + pcre? ( >=dev-libs/libpcre-6:= ) + trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) + udisks? ( dev-libs/libgudev:= )" +RDEPEND="${DEPEND} + >=dev-util/desktop-file-utils-0.20-r1 + x11-misc/shared-mime-info + trash-panel-plugin? ( ${GVFS_DEPEND} ) + udisks? ( + virtual/udev + ${GVFS_DEPEND}[udisks,udev] + )" +BDEPEND=" + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +src_configure() { + local myconf=( + $(use_enable introspection) + $(use_enable udisks gudev) + $(use_enable libnotify notifications) + $(use_enable exif) + $(use_enable pcre) + $(use_enable trash-panel-plugin tpa-plugin) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + elog "If you were using an older Xfce version and Thunar fails to start" + elog "with a message similar to:" + elog " Failed to register: Timeout was reached" + elog "you may need to reset your xfce4 session:" + elog " rm ~/.cache/sessions/xfce4-session-*" + elog "See https://bugs.gentoo.org/698914." + + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest index 11f6702362d9..5bc271b46a29 100644 --- a/xfce-base/xfwm4/Manifest +++ b/xfce-base/xfwm4/Manifest @@ -1,3 +1,4 @@ +AUX xfwm4-4.16.1-gtk_frame_extents.patch 1787 BLAKE2B 17863b299e58f4e9443084997af55f197cd40101b4d3e109a3cd6da5843b23791a448d1efb99a3995ccdd53e5123bb901509e89b6480a0e6aa97fa404046b565 SHA512 2ec542092ee86047280b4d5c46f09aad71434828bd9af2f8940a9ab208c861377ba619da0fdff4ac0f8e69fb17759c7b886732db7406a738e00b6323c25e1ea5 DIST xfwm4-4.16.1.tar.bz2 1201722 BLAKE2B 4aae9b97095b423964a2ece7fe09b46ecfcea6688af6ab3b38ee34611cd68a7427597cb963b91b209d161c85aed552df15d005268bd8585d365b0cf63adf36b3 SHA512 f0d5d00e58202457d0d7d5f9772e7b2aa3f3339850065609baab7d379248a628d147464cc605698970134b87d58b7867b8c09d0a3a45ab84b2f3aa95be26f0b9 -EBUILD xfwm4-4.16.1.ebuild 1633 BLAKE2B 8a85039c4fc72d10912186f192c7d5330cf2cd616510c9f98fc22d104ede073d19da1b4df67f26e9e7a0dbb0d5a04190a0cd4ba681b9623a9e48c743012c040f SHA512 8ae10bef80a8e96a8486cf79842ae30cde6f1be7a6a01a62ea57292751b2bc4527882ecafce39446863df3b30aecb198af89f48a41827b4fa65f546ec282f72d +EBUILD xfwm4-4.16.1-r1.ebuild 1703 BLAKE2B 597f70a6be5a8801ba7ea0404fb2e7afd6bd6e0184738e198ea96e2794bccbcd1f1d46fc4247ae1db79995990481670c3897dc46417b44c13c866dabde47d840 SHA512 30d949bd7ee402fbac1b180950a0a251b1fc87576742ef2b5abddb6b99885401ee9f86265818583caaf434783d51f84a335c31ccb8da2e685c0b439ecb7cf31f MISC metadata.xml 337 BLAKE2B e51dd05bbb1b2959c65a70a2d16fb8cf627045ab1abcae5838b013d7edb4d5bd5f79a70f3ae31ebd5c326c13ac2e48909621676af8b38e05df8e6f2e0e80e4fc SHA512 cd7a8c5cf84729ca130cee2f33b5358f8f7edd99ca321b7331f43a5e4e5016b2f664ba88230b7dbbddd2298b2ac846c144df87baa43b88426849d55a8f9a7dca 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 new file mode 100644 index 000000000000..bb170d836b7f --- /dev/null +++ b/xfce-base/xfwm4/files/xfwm4-4.16.1-gtk_frame_extents.patch @@ -0,0 +1,56 @@ +From 488288f6e35d5d3dc077e87fe2ed83129692f62e Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +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 +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 new file mode 100644 index 000000000000..874b0ee69112 --- /dev/null +++ b/xfce-base/xfwm4/xfwm4-4.16.1-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2021 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 ~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.16.1.ebuild b/xfce-base/xfwm4/xfwm4-4.16.1.ebuild deleted file mode 100644 index e32d02171cb1..000000000000 --- a/xfce-base/xfwm4/xfwm4-4.16.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 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 ~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" - -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 -} -- cgit v1.2.3