* [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfwm4/, xfce-base/xfwm4/files/
@ 2017-08-30 7:12 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2017-08-30 7:12 UTC (permalink / raw
To: gentoo-commits
commit: 989b1e717891dbb106b9d9b70652581abe59886c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 06:35:36 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 07:12:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=989b1e71
xfce-base/xfwm4: Backport the patch for Ctrl-F1, #616644
xfce-base/xfwm4/Manifest | 1 -
xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch | 37 ++++++++++++
xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild | 72 ++++++++++++++++++++++++
3 files changed, 109 insertions(+), 1 deletion(-)
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 569fd0e9fcd..78ad5e1c1a3 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,4 +1,3 @@
DIST xfwm4-4.12.3.tar.bz2 1191929 SHA256 f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac SHA512 96fcc76fc640027883a7a3373836565987b1d3d4e61fb40aa7e2f990a8140d92cf66171fb4517368faba45c9083a3ad19f589d59b07a55c3417aaaca87e408d7 WHIRLPOOL 0fd8e058694cb2f6486bc59443e00d8ed42ebd9dabe39775451d94c14c7e2ea87a520edea26e3bc7033fa1d95aa0ca1a6b2045eca9a1c9d8ecfb67f1ef88b0a8
DIST xfwm4-4.12.4.tar.bz2 1208874 SHA256 fa74048a75649a6e92df763a3cfb706d3fed1e1a6adf567f6693325a5a6efb36 SHA512 a33530b08f094456c45ad7c627ba34d3772eaeacdc9f422a3a54a16194d494cb1d6798122398d917fb8bc970db7e1184d9dc8edefc365dacc86de22be397b43d WHIRLPOOL fa26fd4bf758b7c57964956809e9036320aaecc43fad2a0aa3fdca2bd83dda7edc1884fa86ed7f1ab12b94066f4bc729d5aa4e001121f813f128ebb4cc3c3018
DIST xfwm4-4.13.0.tar.bz2 1229878 SHA256 7f284c9734f565d8298cac9b67ede252a56c7d67c44531f8c2c07abe5ef0f365 SHA512 01c6cc31dc179ccb51f9881f64ee9e4e16320ab888381d0b203ca0b2a46097048c30eabe7083aaec869c80e8e358c287896d6a1965a36ed6f2f981c27cfb2dce WHIRLPOOL 80a283c10c8cd047edeb8aef79f83236b4793a2929c48f01bc72be422c6c0bd389f1b9830375247847ec4bda39f126b36e5e6eccbfd8d32dd72fb5a02f4c0c87
-DIST xfwm4-4.13.0git.2b80a066.tar.bz2 1243297 SHA256 b49769c69c53933ac8185fe6166e358b88dc0313b963af2346d00e5d5977e8b6 SHA512 6f8e34c0d5d5376e1b689aca19895621cd4e8b6b32efb7e665e7e30b556f218ba4f421aea74509eb4016af35570d1dc9cc79b959388f853c73303fa965d11ff3 WHIRLPOOL d32f6b9ca8cb01609687cf819c36143784a23316010edad7d1820c3217449709e5ed517346ab7f3a0bd8400ff18af8c4492a24c4c350b34376d7d55a5f42a0d3
diff --git a/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch b/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch
new file mode 100644
index 00000000000..28624ee754c
--- /dev/null
+++ b/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch
@@ -0,0 +1,37 @@
+From 012bdbfc826466d7ffae0c52387ae949aa17aabe Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan@xfce.org>
+Date: Thu, 23 Mar 2017 11:40:46 +0100
+Subject: [PATCH] Revert "Add PointerMotionHintMask"
+
+Bug: 12534
+
+This reverts commit 0dfb55407a830572f03297b3c118fac1f3c5b80d.
+---
+ src/client.c | 1 -
+ src/moveresize.c | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/client.c b/src/client.c
+index 668c11b0b..6a16971a3 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -73,7 +73,6 @@
+ #define FRAME_EVENT_MASK \
+ SubstructureNotifyMask|\
+ SubstructureRedirectMask|\
+- PointerMotionHintMask|\
+ PointerMotionMask|\
+ ButtonMotionMask|\
+ FocusChangeMask|\
+diff --git a/src/moveresize.c b/src/moveresize.c
+index 026cc0d9e..1c07e8ed7 100644
+--- a/src/moveresize.c
++++ b/src/moveresize.c
+@@ -53,7 +53,6 @@
+ #include "xsync.h"
+
+ #define MOVERESIZE_EVENT_MASK \
+- PointerMotionHintMask | \
+ PointerMotionMask | \
+ ButtonMotionMask | \
+ ButtonReleaseMask | \
diff --git a/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
new file mode 100644
index 00000000000..93ce8eda772
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite xpresent"
+
+RDEPEND="dev-libs/dbus-glib:=
+ >=dev-libs/glib-2.20:=
+ >=x11-libs/gtk+-2.24:2=
+ x11-libs/libX11:=
+ x11-libs/libXext:=
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/pango:=
+ >=x11-libs/libwnck-2.30:1=
+ >=xfce-base/libxfce4util-4.10:=
+ >=xfce-base/libxfce4ui-4.11:=
+ >=xfce-base/xfconf-4.10:=
+ opengl? ( media-libs/libepoxy:=[X(+)] )
+ startup-notification? ( x11-libs/startup-notification:= )
+ xpresent? ( x11-libs/libXpresent )
+ xcomposite? (
+ x11-libs/libXcomposite:=
+ x11-libs/libXdamage:=
+ x11-libs/libXfixes:=
+ )"
+# libICE/libSM: not really used anywhere but checked by configure
+# https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ x11-libs/libICE
+ x11-libs/libSM
+ xfce-base/exo
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+PATCHES=(
+ "${FILESDIR}"/xfwm4-4.13.0-ctrl-f1.patch
+)
+
+src_configure() {
+ local myconf=(
+ $(use_enable opengl epoxy)
+ $(use_enable startup-notification)
+ --enable-xsync
+ --enable-render
+ --enable-randr
+ $(use_enable xpresent)
+ $(use_enable xcomposite compositor)
+ )
+
+ econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfwm4/, xfce-base/xfwm4/files/
@ 2018-11-11 19:07 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2018-11-11 19:07 UTC (permalink / raw
To: gentoo-commits
commit: f840d93be37d3a6d629380c6cf11174d0cae2752
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 13:07:35 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 19:07:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f840d93b
xfce-base/xfwm4: Clean old up
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
xfce-base/xfwm4/Manifest | 1 -
xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch | 37 ------------
xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild | 72 ------------------------
xfce-base/xfwm4/xfwm4-4.13.1.ebuild | 70 -----------------------
4 files changed, 180 deletions(-)
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index f2256f0fe8f..a1bf75581e7 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,5 +1,4 @@
DIST xfwm4-4.12.4.tar.bz2 1208874 BLAKE2B 60b584d71bc4696bae83897d80cd90d9c13233d1971c823eea6417c8020a0440dc0d648df4e11b27947915ca57130ea3bc7b588e902dc7db74945349ff9ac514 SHA512 a33530b08f094456c45ad7c627ba34d3772eaeacdc9f422a3a54a16194d494cb1d6798122398d917fb8bc970db7e1184d9dc8edefc365dacc86de22be397b43d
DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c746121f68e4bd0c64e30b9b0c11abfe13c1fb77321249edd4e5c8d3051f62f135093fabfd8ba215573d330fd3745c2 SHA512 b723638b9cd858beb75232a251471cfb2d01ddb412b536c3f0b432e1f894014e1ad51c77d208d5439ae8a8d970344d0146d5f9475106c1b66d22715af7af42d9
-DIST xfwm4-4.13.0.tar.bz2 1229878 BLAKE2B 9d7f3d6121a1d1522294a659204d391e120b971cbca00f53f0a0d37f256f2ad65dc6ac1cfd5355d78fa5bd811ed8f7d4013081a10470f18e3edb9fcc0395e218 SHA512 01c6cc31dc179ccb51f9881f64ee9e4e16320ab888381d0b203ca0b2a46097048c30eabe7083aaec869c80e8e358c287896d6a1965a36ed6f2f981c27cfb2dce
DIST xfwm4-4.13.1-patchset.tar.bz2 2739 BLAKE2B 895ac4939c9f9ab75e7f9e5b237cc731dd619bc87ac7a4f6623dc30ef5f4b7e0a80c826881a430b9c1d42ae0172fb72af2d4ff7c5ad6b54890f6d9233c4ecf49 SHA512 aa918e8efb050b87afb90594cfeb69a4457117b6bd47142d16f3cdf3d1cd7a4d9d2670dbbb68d939f5d2e52a05b42cefb59325963aabad84fd82ddf1f6ffd6f5
DIST xfwm4-4.13.1.tar.bz2 1224120 BLAKE2B 983b12775ba8998598efb22a2a7ab6f539cb1c6074c3fbaa882b9627e5ad0ff3b96ed0d4352c31dd04451c37dd706404147b87bd899f6b6f1b38df0162b82a15 SHA512 2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320
diff --git a/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch b/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch
deleted file mode 100644
index 28624ee754c..00000000000
--- a/xfce-base/xfwm4/files/xfwm4-4.13.0-ctrl-f1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 012bdbfc826466d7ffae0c52387ae949aa17aabe Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Thu, 23 Mar 2017 11:40:46 +0100
-Subject: [PATCH] Revert "Add PointerMotionHintMask"
-
-Bug: 12534
-
-This reverts commit 0dfb55407a830572f03297b3c118fac1f3c5b80d.
----
- src/client.c | 1 -
- src/moveresize.c | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/src/client.c b/src/client.c
-index 668c11b0b..6a16971a3 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -73,7 +73,6 @@
- #define FRAME_EVENT_MASK \
- SubstructureNotifyMask|\
- SubstructureRedirectMask|\
-- PointerMotionHintMask|\
- PointerMotionMask|\
- ButtonMotionMask|\
- FocusChangeMask|\
-diff --git a/src/moveresize.c b/src/moveresize.c
-index 026cc0d9e..1c07e8ed7 100644
---- a/src/moveresize.c
-+++ b/src/moveresize.c
-@@ -53,7 +53,6 @@
- #include "xsync.h"
-
- #define MOVERESIZE_EVENT_MASK \
-- PointerMotionHintMask | \
- PointerMotionMask | \
- ButtonMotionMask | \
- ButtonReleaseMask | \
diff --git a/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
deleted file mode 100644
index 398cd2db17a..00000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite xpresent"
-
-RDEPEND="dev-libs/dbus-glib:=
- >=dev-libs/glib-2.20:=
- >=x11-libs/gtk+-2.24:2=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/pango:=
- >=x11-libs/libwnck-2.30:1=
- >=xfce-base/libxfce4util-4.10:=
- >=xfce-base/libxfce4ui-4.11:=
- >=xfce-base/xfconf-4.10:=
- opengl? ( media-libs/libepoxy:=[X(+)] )
- startup-notification? ( x11-libs/startup-notification:= )
- xpresent? ( x11-libs/libXpresent )
- xcomposite? (
- x11-libs/libXcomposite:=
- x11-libs/libXdamage:=
- x11-libs/libXfixes:=
- )"
-# libICE/libSM: not really used anywhere but checked by configure
-# https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- x11-libs/libICE
- x11-libs/libSM
- xfce-base/exo
- virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-PATCHES=(
- "${FILESDIR}"/xfwm4-4.13.0-ctrl-f1.patch
-)
-
-src_configure() {
- local myconf=(
- $(use_enable opengl epoxy)
- $(use_enable startup-notification)
- --enable-xsync
- --enable-render
- --enable-randr
- $(use_enable xpresent)
- $(use_enable xcomposite compositor)
- )
-
- econf "${myconf[@]}"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.13.1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1.ebuild
deleted file mode 100644
index 6c5cc896fae..00000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite xpresent"
-
-RDEPEND="dev-libs/dbus-glib:=
- >=dev-libs/glib-2.20:=
- >=x11-libs/gtk+-3.20:3=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXinerama:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- 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:= )
- xpresent? ( x11-libs/libXpresent )
- xcomposite? (
- x11-libs/libXcomposite:=
- x11-libs/libXdamage:=
- x11-libs/libXfixes:=
- )"
-# libICE/libSM: not really used anywhere but checked by configure
-# https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- x11-libs/libICE
- x11-libs/libSM
- xfce-base/exo
- virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-src_configure() {
- local myconf=(
- $(use_enable opengl epoxy)
- $(use_enable startup-notification)
- --enable-xsync
- --enable-render
- --enable-randr
- $(use_enable xpresent)
- $(use_enable xcomposite compositor)
- )
-
- econf "${myconf[@]}"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfwm4/, xfce-base/xfwm4/files/
@ 2021-11-18 17:06 Stephan Hartmann
0 siblings, 0 replies; 4+ messages in thread
From: Stephan Hartmann @ 2021-11-18 17:06 UTC (permalink / raw
To: gentoo-commits
commit: 6a48f9aa81348de4240df10eb44933acd5348412
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 17:05:34 2021 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 17:05:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a48f9aa
xfce-base/xfwm4: add patch for handling GTK_FRAME_EXTENTS
Bug: https://bugs.gentoo.org/819771
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
.../files/xfwm4-4.16.1-gtk_frame_extents.patch | 56 ++++++++++++++++
xfce-base/xfwm4/xfwm4-4.16.1-r1.ebuild | 74 ++++++++++++++++++++++
2 files changed, 130 insertions(+)
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 <fourdan@xfce.org>
+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 <fourdan@xfce.org>
+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..485538b1b413
--- /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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfwm4/, xfce-base/xfwm4/files/
@ 2023-03-17 10:50 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-03-17 10:50 UTC (permalink / raw
To: gentoo-commits
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 <fourdan@xfce.org>
-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 <fourdan@xfce.org>
-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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-17 10:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-18 17:06 [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfwm4/, xfce-base/xfwm4/files/ Stephan Hartmann
-- strict thread matches above, loose matches on Subject: below --
2023-03-17 10:50 Michał Górny
2018-11-11 19:07 Michał Górny
2017-08-30 7:12 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox