Control: tags 849604 + patch
Control: tags 849604 + pending
Control: tags 853415 + pending

Dear maintainer,

I've prepared an NMU for geis (versioned as 2.2.17-1.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for geis-2.2.17 geis-2.2.17

 changelog           |    8 ++++++++
 control             |    1 +
 patches/gcc-7.patch |   38 ++++++++++++++++++++++++++++++++++++++
 patches/series      |    1 +
 4 files changed, 48 insertions(+)

diff -Nru geis-2.2.17/debian/changelog geis-2.2.17/debian/changelog
--- geis-2.2.17/debian/changelog	2016-07-30 18:22:34.000000000 +0200
+++ geis-2.2.17/debian/changelog	2017-12-11 14:41:39.000000000 +0100
@@ -1,3 +1,11 @@
+geis (2.2.17-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * d/control: Suggests libgeis-doc from libgeis-dev.  Closes: #849604
+  * Add patch to fix build with GCC 7.  Closes: #853415
+
+ -- Mattia Rizzolo <mat...@debian.org>  Mon, 11 Dec 2017 14:41:39 +0100
+
 geis (2.2.17-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru geis-2.2.17/debian/control geis-2.2.17/debian/control
--- geis-2.2.17/debian/control	2016-07-28 02:56:48.000000000 +0200
+++ geis-2.2.17/debian/control	2017-12-11 14:40:38.000000000 +0100
@@ -42,6 +42,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libgeis1 (= ${binary:Version}),
          ${misc:Depends}
+Suggests: libgeis-doc
 Description: Gesture engine interface support - dev files
  A common API for clients of a systemwide gesture recognition and propagation
  engine.
diff -Nru geis-2.2.17/debian/patches/gcc-7.patch geis-2.2.17/debian/patches/gcc-7.patch
--- geis-2.2.17/debian/patches/gcc-7.patch	1970-01-01 01:00:00.000000000 +0100
+++ geis-2.2.17/debian/patches/gcc-7.patch	2017-12-11 14:41:39.000000000 +0100
@@ -0,0 +1,38 @@
+From: Khem Raj <raj.k...@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.k...@gmail.com>
+Bug-Debian: https://bugs.debian.org/853415
+
+---
+
+--- geis-2.2.17.orig/libgeis/geis_v1.c
++++ geis-2.2.17/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 -Nru geis-2.2.17/debian/patches/series geis-2.2.17/debian/patches/series
--- geis-2.2.17/debian/patches/series	2016-07-30 18:10:36.000000000 +0200
+++ geis-2.2.17/debian/patches/series	2017-12-11 14:41:39.000000000 +0100
@@ -1 +1,2 @@
 gcc-6-build.patch
+gcc-7.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to