[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfwm4/, xfce-base/xfwm4/files/

[Michał Górny]

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@××××.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
+}