From 206dd733895aa23950d28a27e5dadbe6c5dbf1f0 Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 10 Jan 2018 01:21:45 +0100 Subject: [PATCH] geis: fix cross compilation Closes: #10621 [via git-merge-pr] --- srcpkgs/geis/patches/gcc-7.patch | 38 ++++++++++++++++++++++++++++++++ srcpkgs/geis/template | 6 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/geis/patches/gcc-7.patch diff --git a/srcpkgs/geis/patches/gcc-7.patch b/srcpkgs/geis/patches/gcc-7.patch new file mode 100644 index 0000000000..f206f79dc9 --- /dev/null +++ b/srcpkgs/geis/patches/gcc-7.patch @@ -0,0 +1,38 @@ +From: Khem Raj +Date: Mon, 24 Apr 2017 12:34:55 -0700 +X-Dgit-Generated: 2.2.17-1.2 32cf7d865222f63ba5da5f79d340acf895ff9379 +Subject: libgeis: Compare the first character of string to null + +gcc7 wants to be specific when it comes to comparing characters +and strings + +fixes + +| ../../../../../../../workspace/sources/geis/libgeis/geis_v1.c: In function '_v1_subscribe_device': +| ../../../../../../../workspace/sources/geis/libgeis/geis_v1.c:613:20: error: comparison between pointer and zero character constant [-Werror=pointer-compare] + +Signed-off-by: Khem Raj +Bug-Debian: https://bugs.debian.org/853415 + +--- + +--- libgeis/geis_v1.c ++++ libgeis/geis_v1.c +@@ -610,7 +610,7 @@ _v1_subscribe_device(GeisInstance instan + 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 @@ geis_unsubscribe(GeisInstance instan + 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/srcpkgs/geis/template b/srcpkgs/geis/template index 67c568f731..eba81707f5 100644 --- a/srcpkgs/geis/template +++ b/srcpkgs/geis/template @@ -1,7 +1,7 @@ # Template file for 'geis' pkgname=geis version=2.2.17 -revision=3 +revision=4 hostmakedepends="pkg-config python3-devel" makedepends="dbus-devel grail-devel frame-devel libXi-devel python3-devel xorg-server-devel" build_style="gnu-configure" @@ -13,6 +13,10 @@ short_desc="Gesture Engine Interface and Support" distfiles="https://launchpad.net/geis/trunk/$version/+download/geis-$version.tar.xz" checksum=8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb +if [ -n "$CROSS_BUILD" ]; then + configure_args+=" --enable-integration-tests=no" +fi + geis-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"