Bug#957286: gnomekiss: diff for NMU version 2.0-6.1

[Sudip Mukherjee]

Control: tags 957286 + patch
Control: tags 957286 + pending

Dear maintainer,

I've prepared an NMU for gnomekiss (versioned as 2.0-6.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should cancel it.

--
Regards
Sudip

diff -Nru gnomekiss-2.0/debian/changelog gnomekiss-2.0/debian/changelog
--- gnomekiss-2.0/debian/changelog	2018-08-21 22:51:15.000000000 +0100
+++ gnomekiss-2.0/debian/changelog	2020-08-07 19:52:28.000000000 +0100
@@ -1,3 +1,10 @@
+gnomekiss (2.0-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ftbfs with GCC-10. (Closes: #957286)
+
+ -- Sudip Mukherjee <sudipm.mukherjee at gmail.com>  Fri, 07 Aug 2020 19:52:28 +0100
+
 gnomekiss (2.0-6) unstable; urgency=low
 
   * Team upload.
diff -Nru gnomekiss-2.0/debian/patches/fix_ftbfs.patch gnomekiss-2.0/debian/patches/fix_ftbfs.patch
--- gnomekiss-2.0/debian/patches/fix_ftbfs.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnomekiss-2.0/debian/patches/fix_ftbfs.patch	2020-08-07 19:52:03.000000000 +0100
@@ -0,0 +1,42 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
+Bug-Debian: https://bugs.debian.org/957286
+Forwarded: no
+
+---
+
+--- gnomekiss-2.0.orig/src/callbacks.c
++++ gnomekiss-2.0/src/callbacks.c
+@@ -33,6 +33,7 @@ static int x1, y1, dragged;
+ static int ox, oy;
+ 
+ int mouse_x, mouse_y;
++GtkListStore *error_store;
+ 
+ void
+ on_exit_activate                      (GtkMenuItem     *menuitem,
+--- gnomekiss-2.0.orig/src/interface.c
++++ gnomekiss-2.0/src/interface.c
+@@ -26,7 +26,7 @@
+ #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
+   g_object_set_data (G_OBJECT (component), name, widget)
+ 
+-extern GSettings *settings;
++GSettings *settings;
+ 
+ GtkWidget*
+ create_application (void)
+--- gnomekiss-2.0.orig/src/kiss.h
++++ gnomekiss-2.0/src/kiss.h
+@@ -26,8 +26,8 @@ extern GtkWidget *about, *error_list;
+ extern GtkWidget *buttons[SETS], *items[SETS];
+ 
+ static gboolean clear_area = FALSE;
+-GSettings *settings;
+-GtkListStore *error_store;
++extern GSettings *settings;
++extern GtkListStore *error_store;
+ 
+ enum {
+   FILE_COLUMN,
diff -Nru gnomekiss-2.0/debian/patches/series gnomekiss-2.0/debian/patches/series
--- gnomekiss-2.0/debian/patches/series	2018-08-21 22:51:15.000000000 +0100
+++ gnomekiss-2.0/debian/patches/series	2020-08-07 19:43:46.000000000 +0100
@@ -2,3 +2,4 @@
 020_gtkspinbutton.patch
 fix-close-button-of-about-dialog.patch
 gtk3-port.patch
+fix_ftbfs.patch