gentoo resync : 28.04.2019

3 files changed, 66 insertions, 14 deletions

diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index c1df1aa4515d..b44b44dcb362 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,8 +1,8 @@
-DIST xfwm4-4.12.4.tar.bz2 1208874 BLAKE2B 60b584d71bc4696bae83897d80cd90d9c13233d1971c823eea6417c8020a0440dc0d648df4e11b27947915ca57130ea3bc7b588e902dc7db74945349ff9ac514 SHA512 a33530b08f094456c45ad7c627ba34d3772eaeacdc9f422a3a54a16194d494cb1d6798122398d917fb8bc970db7e1184d9dc8edefc365dacc86de22be397b43d
+AUX xfwm4-4.13.1-fix-mask-len.patch 871 BLAKE2B 048bbabfa59671a5e0dba77e353a8daed8677839b82de6e4a9b0419217bc3d91baac8ccd7c8129aa907de4396014503947501a3cb0c12f44ed96795337ff548d SHA512 beb34642c63f1dc1734261039a00ea6e845c0b544c655633096027ad627b003fac221b74345150aac92854416bae054c3bb4efcce195026432061610480500ad
 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
-EBUILD xfwm4-4.12.4.ebuild 1526 BLAKE2B fb44b379be5c8e5420d2b58b8754f7accbe518442c48b707a36e10ce62220212ea5c6b005d5c3abe3082d24108689adbaac03cb412138983de73c308dcd2da78 SHA512 87d67c9e6ff47c4b785fcbc8e71007ed5af134552fec9616b41bc26a81b72428314999d9969ab261ddd88c1bef4184f78d17a4a9f06970c1ec4565089de1a390
 EBUILD xfwm4-4.12.5.ebuild 1548 BLAKE2B bcad70f5676a341ada91eb817f59a5dfe1cf1f071ee2f767ba9e499e107c9c57f89ff138b6cdc05a579e28101d183557c9ae922cb8f94468589cfa9885ca91ee SHA512 5b38b1c8492b8c8a261ef0e89eddc531210dfcaf9158a32bae18ff1721f88ea91646a05a600fa5931bf53acedacebb26320a1ef136445c4b99ea011141222245
 EBUILD xfwm4-4.13.1-r1.ebuild 1897 BLAKE2B 28113547afdd5fc3671ba6414a05560a29050a1fdd21edcad7976b94dbd045dc2ec502d62db0fcefa960ad94603f0cf94716da0644fe8a936339f24ce0b074d2 SHA512 e9be0515a5cfcd81ce74cac2640f10b1bb34b57af7f709f5390e073d6e3b744de8664a0ae2ed58ef601d9ca3a2adab5985a7618dcd426a5f3d40ed83a7c94c2f
+EBUILD xfwm4-4.13.1-r2.ebuild 1945 BLAKE2B 0f035f0041217d7d3eae637a723872b65deb77ca015166bab9f03c4d7dc4e37896153ea4bb7358679335084bfe69365c2c41fd77343cd6397e9e68ca517f7568 SHA512 7f6889976c91d99710bbd5a3b0af1226d9dd7967114e32e0e5d53b589b3322821d3c939b890f13db1b2a561b99e9dec4cdc4f683a94746645d6a59d5e6dc4f19
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
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 000000000000..640e297ce92e
--- /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.12.4.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
index 53af72fbcb4e..b929ce60b99d 100644
--- a/xfce-base/xfwm4/xfwm4-4.12.4.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
@@ -3,35 +3,40 @@
 
 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"
+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="dri startup-notification +xcomposite"
+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/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-2.30:1=
+	>=x11-libs/libwnck-3.14:3=
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/xfconf-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:=
 		)"
-# libdrm: only headers are used
-# libICE/liBSM: not really used anywhere but checked by configure
+# libICE/libSM: not really used anywhere but checked by configure
 #   https://bugzilla.xfce.org/show_bug.cgi?id=11914
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -39,20 +44,36 @@ DEPEND="${RDEPEND}
 	x11-libs/libICE
 	x11-libs/libSM
 	xfce-base/exo
-	virtual/pkgconfig
-	dri? ( >=x11-libs/libdrm-2.4 )"
+	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 dri libdrm)
+		$(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
+}