unity-base/geis: Add gcc-7.patch

This fixes a compilation issue when using GCC 7.2.
shiznix · Jan 21, 2018 · 01ef86c · 01ef86c
1 parent e90cc0d
commit 01ef86c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/unity-base/geis/Manifest b/unity-base/geis/Manifest
@@ -1,3 +1,4 @@
+AUX gcc-7.patch 695 SHA256 37a61adcf2ef5a8313c3883d6e552810223bcbd9391698b315c7507eaa2b413a SHA512 4b5a0fe1c2589ee7809ff99765002efefa348332ed420b5c8fc6c8d9724eb018c5567028827e09a0f7bcfa39251ced867883f28ff616801662888df9eed664ec WHIRLPOOL a8b597b32b4a1bf31ee5972259de6cfa26ce42bb49f91535a2d9a903ce2f2c2fb3520e1496bb0c0c417865728daab72e5d8aac3fe1833050635b3d4bfaef6d4d
 DIST geis_2.2.17+16.04.20160126.orig.tar.gz 325184 SHA256 d88309cb4039e66c63ed95864b6cac8612c3b7138c26fab81440d694759c6df4 SHA512 5d50405e0b4520f163239a8d65adc6e71844eaf95d96c3c9683db4de995c8af960991ff29450c1d9ce7bfceb74acd97623274a978e509bf09ac9ba1d3983c0cc WHIRLPOOL 074daa6756c9fdec4f0113c2d2db469811febb0ce6f6ace79dd5ecc4357aa8ab10bfd0e433068d9dd4d3ee130dff80fe75b2609228fa206dd73d3cd92a2ea6cd
-EBUILD geis-2.2.17_p20160126_p0_p01.ebuild 1100 SHA256 9b0e898c6246cbb2bb5cf24120c23384c03aa85afb03a25eb5ccff2c0a9d09c6 SHA512 76e419e9e89710d45cf28564d445382b61155812e91f4427e516dced2d0d0196728773ce67788de45fe20450d404e79bcd97bfb3a714b58b863f31ff423ce427 WHIRLPOOL 86719986e6c06d37e9203d4e3c7e053484dc1c807e6791b8de6ed07ddaeba0e644ef69b2e5fb1efc5eb55be5167227a71b2d459652e9f9a9d9345fce0492e0b0
+EBUILD geis-2.2.17_p20160126_p0_p01-r1.ebuild 1127 SHA256 731102aafa6d9b6419793476a565ed5a7e9b60e2c0dc254b19d429dd66d6a871 SHA512 1fcd5e047463e452d10658c1dc9d1f45101fa5eafa2392f450e5c4b712a27d3f62c5887664005c372bc7224e1700954af3a83b5266d6e291509586687802245b WHIRLPOOL f19eb54316ff845765b7f18c32fb314be78ed7a1eeec1a1e38654b832c519afd4effb8936d0fc3c487d735492a545f5082360f9c553907ff0f088de776b4fd0f
 MISC metadata.xml 362 SHA256 81909e6f96cd35fc7a97a5c9f1669292ff98d12690a7274920e7b8ed31ed02b7 SHA512 74e11b5a19cfe8aa9ed40021a7661aee3abec911b321ea75630d2e6799a4420e4251faef690d3296f689b17a03dc9aad89df56cfd064d84e824d712d3232efe8 WHIRLPOOL 0e8df343ad1219a4269fe1ba0cba1edf07c331e7e83800236294f4d1e7c9d88dfc0073674068f591d80e464389caa50099260f132b52f2b4d4168aa8fbeb4215
diff --git a/unity-base/geis/files/gcc-7.patch b/unity-base/geis/files/gcc-7.patch
@@ -0,0 +1,19 @@
+--- libgeis/geis_v1.c.orig      2018-01-20 18:25:29.259261626 -0500
++++ libgeis/geis_v1.c   2018-01-20 18:27:02.495736917 -0500
+@@ -610,7 +610,7 @@
+                      const char **gesture_list)
+ {
+   GeisStatus result = GEIS_UNKNOWN_ERROR;
+-  if (gesture_list == GEIS_ALL_GESTURES)
++  if (gesture_list[0][0] == GEIS_ALL_GESTURES)
+   {
+     geis_debug("subscribing device %d for all gestures", device_id);
+   }
+@@ -757,7 +757,7 @@
+                  GeisGestureType *gesture_list)
+ {
+   GeisStatus status = GEIS_STATUS_NOT_SUPPORTED;
+-  if (gesture_list == GEIS_ALL_GESTURES)
++  if (gesture_list[0] == GEIS_ALL_GESTURES)
+   {
+     status = geis_subscription_deactivate(instance->subscription);
diff --git a/.../geis/geis-2.2.17_p20160126_p0_p01.ebuild → ...is/geis-2.2.17_p20160126_p0_p01-r1.ebuild b/.../geis/geis-2.2.17_p20160126_p0_p01.ebuild → ...is/geis-2.2.17_p20160126_p0_p01-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 PYTHON_COMPAT=( python{3_4,3_5} )
@@ -28,6 +27,7 @@ S="${WORKDIR}/${PN}-${PV}${UVER_PREFIX}"
 
 src_prepare() {
 	ubuntu-versionator_src_prepare
+	epatch "${FILESDIR}/gcc-7.patch"
 	eautoreconf
 }