parent
c7a8610c3f
commit
206dd73389
2 changed files with 43 additions and 1 deletions
38
srcpkgs/geis/patches/gcc-7.patch
Normal file
38
srcpkgs/geis/patches/gcc-7.patch
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
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 <raj.khem@gmail.com>
|
||||||
|
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);
|
||||||
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'geis'
|
# Template file for 'geis'
|
||||||
pkgname=geis
|
pkgname=geis
|
||||||
version=2.2.17
|
version=2.2.17
|
||||||
revision=3
|
revision=4
|
||||||
hostmakedepends="pkg-config python3-devel"
|
hostmakedepends="pkg-config python3-devel"
|
||||||
makedepends="dbus-devel grail-devel frame-devel libXi-devel python3-devel xorg-server-devel"
|
makedepends="dbus-devel grail-devel frame-devel libXi-devel python3-devel xorg-server-devel"
|
||||||
build_style="gnu-configure"
|
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"
|
distfiles="https://launchpad.net/geis/trunk/$version/+download/geis-$version.tar.xz"
|
||||||
checksum=8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb
|
checksum=8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb
|
||||||
|
|
||||||
|
if [ -n "$CROSS_BUILD" ]; then
|
||||||
|
configure_args+=" --enable-integration-tests=no"
|
||||||
|
fi
|
||||||
|
|
||||||
geis-devel_package() {
|
geis-devel_package() {
|
||||||
depends="${sourcepkg}>=${version}_${revision}"
|
depends="${sourcepkg}>=${version}_${revision}"
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue