* [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfwm4/files/, xfce-base/xfwm4/
@ 2019-04-10 8:19 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2019-04-10 8:19 UTC (permalink / raw
To: gentoo-commits
commit: dc6a5562a06951cb3fbfab4595463c73af3e2d0d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 07:59:50 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 08:19:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc6a5562
xfce-base/xfwm4: Backport upstream fix for event mask length
Closes: https://bugs.gentoo.org/664710
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch | 31 +++++++++
xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild | 79 ++++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch b/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
new file mode 100644
index 00000000000..640e297ce92
--- /dev/null
+++ b/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
@@ -0,0 +1,31 @@
+From 2080fa3c81b3810228ae5a8abbb494c78dd1d566 Mon Sep 17 00:00:00 2001
+From: Timo <timo.teras@iki.fi>
+Date: Thu, 13 Sep 2018 20:25:33 +0200
+Subject: device: Fix wrong mask len
+
+Bug: 14695
+
+The `mask_len` field is setup incorrectly in
+`xfwm_device_fill_xi2_event_mask()`.
+
+The size is the pointer length, not the bitmask data area length.
+---
+ src/device.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/device.c b/src/device.c
+index b1e33ae2..01c0c81d 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -301,7 +301,7 @@ xfwm_device_fill_xi2_event_mask (XIEventMask *xievent_mask, gulong core_mask)
+ guint i;
+
+ xievent_mask->deviceid = XIAllMasterDevices;
+- xievent_mask->mask_len = sizeof (mask);
++ xievent_mask->mask_len = len;
+ xievent_mask->mask = mask;
+
+ for (i = 0; i < G_N_ELEMENTS (core_to_xi2); i++)
+--
+cgit v1.2.1
+
diff --git a/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
new file mode 100644
index 00000000000..b929ce60b99
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
@@ -0,0 +1,79 @@
+# 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
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.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 )
+
+PATCHES=(
+ # set of patches to fix refresh issues
+ # https://bugs.gentoo.org/614564
+ "${WORKDIR}/${P}-patchset"
+
+ "${FILESDIR}"/xfwm4-4.13.1-fix-mask-len.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] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfwm4/files/, xfce-base/xfwm4/
@ 2019-05-24 22:20 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2019-05-24 22:20 UTC (permalink / raw
To: gentoo-commits
commit: bf7c797bd2a23cf6806752e4f14fd19cbe7abfaa
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 22:02:03 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 24 22:20:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7c797b
xfce-base/xfwm4: Drop old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
xfce-base/xfwm4/Manifest | 2 -
.../xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch | 31 ---------
xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild | 79 ----------------------
3 files changed, 112 deletions(-)
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 5f2bcbed353..fce1ae9d719 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,4 +1,2 @@
DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c746121f68e4bd0c64e30b9b0c11abfe13c1fb77321249edd4e5c8d3051f62f135093fabfd8ba215573d330fd3745c2 SHA512 b723638b9cd858beb75232a251471cfb2d01ddb412b536c3f0b432e1f894014e1ad51c77d208d5439ae8a8d970344d0146d5f9475106c1b66d22715af7af42d9
-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
DIST xfwm4-4.13.2.tar.bz2 1139976 BLAKE2B 724cb6562f89048f3f94740ff6984f2780274240800646050c62d0b19e303fcdfb1022227262953c09bb42a9a5a176dca8e1e69252d953df15660dd22f906ecb SHA512 85440a377cd7034e986b317e35c25ac6d4723bd4c1ce1e6951d8545a44f3c47340952fd0211f55cf19411539be6d86f4c34fca7b2219b0873654a6d311c95055
diff --git a/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch b/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
deleted file mode 100644
index 640e297ce92..00000000000
--- a/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2080fa3c81b3810228ae5a8abbb494c78dd1d566 Mon Sep 17 00:00:00 2001
-From: Timo <timo.teras@iki.fi>
-Date: Thu, 13 Sep 2018 20:25:33 +0200
-Subject: device: Fix wrong mask len
-
-Bug: 14695
-
-The `mask_len` field is setup incorrectly in
-`xfwm_device_fill_xi2_event_mask()`.
-
-The size is the pointer length, not the bitmask data area length.
----
- src/device.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/device.c b/src/device.c
-index b1e33ae2..01c0c81d 100644
---- a/src/device.c
-+++ b/src/device.c
-@@ -301,7 +301,7 @@ xfwm_device_fill_xi2_event_mask (XIEventMask *xievent_mask, gulong core_mask)
- guint i;
-
- xievent_mask->deviceid = XIAllMasterDevices;
-- xievent_mask->mask_len = sizeof (mask);
-+ xievent_mask->mask_len = len;
- xievent_mask->mask = mask;
-
- for (i = 0; i < G_N_ELEMENTS (core_to_xi2); i++)
---
-cgit v1.2.1
-
diff --git a/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
deleted file mode 100644
index b929ce60b99..00000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
+++ /dev/null
@@ -1,79 +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
- https://dev.gentoo.org/~mgorny/dist/${P}-patchset.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 )
-
-PATCHES=(
- # set of patches to fix refresh issues
- # https://bugs.gentoo.org/614564
- "${WORKDIR}/${P}-patchset"
-
- "${FILESDIR}"/xfwm4-4.13.1-fix-mask-len.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] 2+ messages in thread
end of thread, other threads:[~2019-05-24 22:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-10 8:19 [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfwm4/files/, xfce-base/xfwm4/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2019-05-24 22:20 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