build.patch

   1 Description: Fix misleading indentation to fix build with gcc-6
   2 Author: Sean Whitton <spwhitton@spwhitton.name>
   3 Bug-Debian: https://bugs.debian.org/811933
   4 Forwarded: https://bugs.launchpad.net/geis/+bug/1608086
   5 ---
   6 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
   7 --- a/libgeis/geis_subscription.c
   8 +++ b/libgeis/geis_subscription.c
   9 @@ -238,8 +238,10 @@ geis_subscription_bag_empty(GeisSubBag b
  10    for (i = 0; i < bag->sub_store_size; ++i)
  11    {
  12      if (bag->sub_store[i])
  13 +    {
  14        _subscription_unref(bag->sub_store[i]);
  15        bag->sub_store[i] = NULL;
  16 +    }
  17    }
  18  }
  19
  20 From: Khem Raj <raj.khem@gmail.com>
  21 Date: Mon, 24 Apr 2017 12:34:55 -0700
  22 X-Dgit-Generated: 2.2.17-1.2 32cf7d865222f63ba5da5f79d340acf895ff9379
  23 Subject: libgeis: Compare the first character of string to null
  24
  25 gcc7 wants to be specific when it comes to comparing characters
  26 and strings
  27
  28 fixes
  29
  30 | ../../../../../../../workspace/sources/geis/libgeis/geis_v1.c: In function '_v1_subscribe_device':
  31 | ../../../../../../../workspace/sources/geis/libgeis/geis_v1.c:613:20: error: comparison between pointer and zero character constant [-Werror=pointer-compare]
  32
  33 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  34 Bug-Debian: https://bugs.debian.org/853415
  35
  36 ---
  37
  38 --- geis-2.2.17.orig/libgeis/geis_v1.c
  39 +++ geis-2.2.17/libgeis/geis_v1.c
  40 @@ -610,7 +610,7 @@ _v1_subscribe_device(GeisInstance instan
  41                       const char **gesture_list)
  42  {
  43    GeisStatus result = GEIS_UNKNOWN_ERROR;
  44 -  if (gesture_list == GEIS_ALL_GESTURES)
  45 +  if (gesture_list[0][0] == GEIS_ALL_GESTURES)
  46    {
  47      geis_debug("subscribing device %d for all gestures", device_id);
  48    }
  49 @@ -757,7 +757,7 @@ geis_unsubscribe(GeisInstance     instan
  50                   GeisGestureType *gesture_list)
  51  {
  52    GeisStatus status = GEIS_STATUS_NOT_SUPPORTED;
  53 -  if (gesture_list == GEIS_ALL_GESTURES)
  54 +  if (gesture_list[0] == GEIS_ALL_GESTURES)
  55    {
  56      status = geis_subscription_deactivate(instance->subscription);
  57    }