gtk and friends: gcc 10 compatibility

6 files changed, 262 insertions, 19 deletions

diff --git a/src/gtk2-1-fixes.patch b/src/gtk2-1-fixes.patch
index 616ca85..b738020 100644
--- a/src/gtk2-1-fixes.patch
+++ b/src/gtk2-1-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 24 Sep 2010 14:43:43 +0200
-Subject: [PATCH 01/10] s,DllMain,static _disabled_DllMain,
+Subject: [PATCH 01/12] s,DllMain,static _disabled_DllMain,
 
 
 diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
@@ -38,7 +38,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 24 Sep 2010 14:46:20 +0200
-Subject: [PATCH 02/10] s,__declspec(dllimport),,
+Subject: [PATCH 02/12] s,__declspec(dllimport),,
 
 
 diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
@@ -97,7 +97,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 24 Sep 2010 15:03:28 +0200
-Subject: [PATCH 03/10] s,__declspec(dllexport),,
+Subject: [PATCH 03/12] s,__declspec(dllexport),,
 
 
 diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
@@ -156,7 +156,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 24 Sep 2010 14:17:22 +0200
-Subject: [PATCH 04/10] fix gtk+-2.0.pc.in
+Subject: [PATCH 04/12] fix gtk+-2.0.pc.in
 
 
 diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
@@ -174,7 +174,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 24 Sep 2010 14:48:31 +0200
-Subject: [PATCH 05/10] disable gtkbuiltincache
+Subject: [PATCH 05/12] disable gtkbuiltincache
 
 
 diff --git a/gtk/Makefile.in b/gtk/Makefile.in
@@ -194,7 +194,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 24 Sep 2010 14:49:50 +0200
-Subject: [PATCH 06/10] disable test-inline-pixbufs.h
+Subject: [PATCH 06/12] disable test-inline-pixbufs.h
 
 
 diff --git a/demos/Makefile.in b/demos/Makefile.in
@@ -214,7 +214,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 24 Sep 2010 14:51:04 +0200
-Subject: [PATCH 07/10] permit static building
+Subject: [PATCH 07/12] permit static building
 
 
 diff --git a/configure b/configure
@@ -312,7 +312,7 @@ index 1111111..2222222 100755
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 24 Sep 2010 14:53:18 +0200
-Subject: [PATCH 08/10] no -Wl
+Subject: [PATCH 08/12] no -Wl
 
 
 diff --git a/configure b/configure
@@ -332,7 +332,7 @@ index 1111111..2222222 100755
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 24 Sep 2010 14:54:15 +0200
-Subject: [PATCH 09/10] gio not gio-unix
+Subject: [PATCH 09/12] gio not gio-unix
 
 
 diff --git a/configure b/configure
@@ -355,7 +355,7 @@ index 1111111..2222222 100755
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 24 Sep 2010 15:30:49 +0200
-Subject: [PATCH 10/10] removed duplicate _gtk_marshal_OBJECT__VOID()
+Subject: [PATCH 10/12] removed duplicate _gtk_marshal_OBJECT__VOID()
 
 
 diff --git a/perf/marshalers.c b/perf/marshalers.c
@@ -406,3 +406,164 @@ index 1111111..2222222 100644
  /* VOID:ENUM,OBJECT,DOUBLE (./marshalers.list:2) */
  void
  _gtk_marshal_VOID__ENUM_OBJECT_DOUBLE (GClosure     *closure,
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 28 May 2020 18:22:19 +0200
+Subject: [PATCH 11/12] gcc 10 compatibility: add missing "extern"
+
+Related to:
+    Default to -fno-common
+    https://gcc.gnu.org/gcc-10/porting_to.html
+
+diff --git a/gdk/gdk.h b/gdk/gdk.h
+index 1111111..2222222 100644
+--- a/gdk/gdk.h
++++ b/gdk/gdk.h
+@@ -186,11 +186,11 @@ void gdk_notify_startup_complete_with_id (const gchar* startup_id);
+  */
+ 
+ #if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
+-GDKVAR GMutex *gdk_threads_mutex; /* private */
++extern GMutex *gdk_threads_mutex; /* private */
+ #endif
+ 
+-GDKVAR GCallback gdk_threads_lock;
+-GDKVAR GCallback gdk_threads_unlock;
++extern GCallback gdk_threads_lock;
++extern GCallback gdk_threads_unlock;
+ 
+ void     gdk_threads_enter                    (void);
+ void     gdk_threads_leave                    (void);
+diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
+index 1111111..2222222 100644
+--- a/gtk/gtkdebug.h
++++ b/gtk/gtkdebug.h
+@@ -62,17 +62,7 @@ typedef enum {
+ 
+ #endif /* G_ENABLE_DEBUG */
+ 
+-#ifdef G_OS_WIN32
+-#  ifdef GTK_COMPILATION
+-#    define GTKVAR 
+-#  else
+-#    define GTKVAR extern 
+-#  endif
+-#else
+-#  define GTKVAR extern
+-#endif
+-
+-GTKVAR guint gtk_debug_flags;
++extern guint gtk_debug_flags;
+ 
+ G_END_DECLS
+ 
+diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
+index 1111111..2222222 100644
+--- a/gtk/gtkmain.h
++++ b/gtk/gtkmain.h
+@@ -65,21 +65,12 @@ typedef gint	(*GtkKeySnoopFunc)	    (GtkWidget	  *grab_widget,
+ 
+ /* Gtk version.
+  */
+-#ifdef G_PLATFORM_WIN32
+-#ifdef GTK_COMPILATION
+-#define GTKMAIN_C_VAR 
+-#else
+-#define GTKMAIN_C_VAR extern 
+-#endif
+-#else
+-#define GTKMAIN_C_VAR extern
+-#endif
+ 
+-GTKMAIN_C_VAR const guint gtk_major_version;
+-GTKMAIN_C_VAR const guint gtk_minor_version;
+-GTKMAIN_C_VAR const guint gtk_micro_version;
+-GTKMAIN_C_VAR const guint gtk_binary_age;
+-GTKMAIN_C_VAR const guint gtk_interface_age;
++extern const guint gtk_major_version;
++extern const guint gtk_minor_version;
++extern const guint gtk_micro_version;
++extern const guint gtk_binary_age;
++extern const guint gtk_interface_age;
+ const gchar* gtk_check_version (guint	required_major,
+ 			        guint	required_minor,
+ 			        guint	required_micro);
+diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
+index 1111111..2222222 100644
+--- a/gtk/gtktexttypes.h
++++ b/gtk/gtktexttypes.h
+@@ -42,16 +42,6 @@ typedef struct _GtkTextMarkBody GtkTextMarkBody;
+  * Declarations for variables shared among the text-related files:
+  */
+ 
+-#ifdef G_OS_WIN32
+-#ifdef GTK_COMPILATION
+-#define VARIABLE 
+-#else
+-#define VARIABLE extern 
+-#endif
+-#else
+-#define VARIABLE extern
+-#endif
+-
+ /* In gtktextbtree.c */
+ extern const GtkTextLineSegmentClass gtk_text_char_type;
+ extern const GtkTextLineSegmentClass gtk_text_toggle_on_type;
+@@ -70,7 +60,7 @@ extern const GtkTextLineSegmentClass gtk_text_child_type;
+  */
+ 
+ #define GTK_TEXT_UNKNOWN_CHAR 0xFFFC
+-VARIABLE const gchar gtk_text_unknown_char_utf8[];
++extern const gchar gtk_text_unknown_char_utf8[];
+ 
+ gboolean gtk_text_byte_begins_utf8_char (const gchar *byte);
+ 
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 28 May 2020 19:45:12 +0200
+Subject: [PATCH 12/12] remove unnecessary parentheses
+
+..which break build of gtkmm2 using gcc 10.
+
+diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
+index 1111111..2222222 100644
+--- a/gtk/gtkfilechooserbutton.h
++++ b/gtk/gtkfilechooserbutton.h
+@@ -56,13 +56,13 @@ struct _GtkFileChooserButtonClass
+ 
+   void (* file_set) (GtkFileChooserButton *fc);
+ 
+-  void (*__gtk_reserved1);
+-  void (*__gtk_reserved2);
+-  void (*__gtk_reserved3);
+-  void (*__gtk_reserved4);
+-  void (*__gtk_reserved5);
+-  void (*__gtk_reserved6);
+-  void (*__gtk_reserved7);
++  void *__gtk_reserved1;
++  void *__gtk_reserved2;
++  void *__gtk_reserved3;
++  void *__gtk_reserved4;
++  void *__gtk_reserved5;
++  void *__gtk_reserved6;
++  void *__gtk_reserved7;
+ };
+ 
+ 
+diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
+index 1111111..2222222 100644
+--- a/gtk/gtkstatusicon.h
++++ b/gtk/gtkstatusicon.h
+@@ -73,8 +73,8 @@ struct _GtkStatusIconClass
+                                      gboolean        keyboard_mode,
+                                      GtkTooltip     *tooltip);
+ 
+-  void (*__gtk_reserved1);
+-  void (*__gtk_reserved2);
++  void *__gtk_reserved1;
++  void *__gtk_reserved2;
+ };
+ 
+ GType                 gtk_status_icon_get_type           (void) G_GNUC_CONST;
diff --git a/src/gtk3-1-fixes.patch b/src/gtk3-1-fixes.patch
index 4e4aa57..f417431 100644
--- a/src/gtk3-1-fixes.patch
+++ b/src/gtk3-1-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Boris Nagaev <bnagaev@gmail.com>
 Date: Sun, 29 Jan 2017 21:47:39 +0100
-Subject: [PATCH 1/4] These were adapted from the gtk2 patchset.
+Subject: [PATCH 1/5] These were adapted from the gtk2 patchset.
 
 
 diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
@@ -49,7 +49,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Boris Nagaev <bnagaev@gmail.com>
 Date: Sun, 29 Jan 2017 21:50:48 +0100
-Subject: [PATCH 2/4] Not sure what happens when this line is commented out
+Subject: [PATCH 2/5] Not sure what happens when this line is commented out
 
 
 diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c
@@ -67,7 +67,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Boris Nagaev <bnagaev@gmail.com>
 Date: Sun, 29 Jan 2017 22:50:45 +0100
-Subject: [PATCH 3/4] disable gtk-update-icon-cache
+Subject: [PATCH 3/5] disable gtk-update-icon-cache
 
 The error: https://gist.github.com/b3030a43a325ee7646a2bda2864465b5
 
@@ -99,7 +99,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Gerardo Ballabio <gerardo.ballabio@gmail.com>
 Date: Fri, 10 Nov 2017 08:22:39 +1100
-Subject: [PATCH 4/4] restore built-in icons from 3.12
+Subject: [PATCH 4/5] restore built-in icons from 3.12
 
 https://lists.nongnu.org/archive/html/mingw-cross-env-list/2017-11/msg00000.html
 
@@ -107,7 +107,7 @@ See https://github.com/mxe/mxe/pull/1972#issuecomment-343415791
 
 diff --git a/gtk/gtkbuiltincache.h b/gtk/gtkbuiltincache.h
 new file mode 100644
-index 1111111..2222222
+index 0000000..48d2492
 --- /dev/null
 +++ b/gtk/gtkbuiltincache.h
 @@ -0,0 +1,35868 @@
@@ -36129,3 +36129,49 @@ index 1111111..2222222 100644
      }
  
    if (min_dir)
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 28 May 2020 20:29:53 +0200
+Subject: [PATCH 5/5] remove unnecessary parentheses
+
+..which break build of gtkmm using gcc 10.
+
+diff --git a/gtk/deprecated/gtkstatusicon.h b/gtk/deprecated/gtkstatusicon.h
+index 1111111..2222222 100644
+--- a/gtk/deprecated/gtkstatusicon.h
++++ b/gtk/deprecated/gtkstatusicon.h
+@@ -71,10 +71,10 @@ struct _GtkStatusIconClass
+                                      gboolean        keyboard_mode,
+                                      GtkTooltip     *tooltip);
+ 
+-  void (*__gtk_reserved1);
+-  void (*__gtk_reserved2);
+-  void (*__gtk_reserved3);
+-  void (*__gtk_reserved4);
++  void *__gtk_reserved1;
++  void *__gtk_reserved2;
++  void *__gtk_reserved3;
++  void *__gtk_reserved4;
+ };
+ 
+ GDK_AVAILABLE_IN_ALL
+diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
+index 1111111..2222222 100644
+--- a/gtk/gtkfilechooserbutton.h
++++ b/gtk/gtkfilechooserbutton.h
+@@ -63,10 +63,10 @@ struct _GtkFileChooserButtonClass
+   /*< private >*/
+ 
+   /* Padding for future expansion */
+-  void (*__gtk_reserved1);
+-  void (*__gtk_reserved2);
+-  void (*__gtk_reserved3);
+-  void (*__gtk_reserved4);
++  void *__gtk_reserved1;
++  void *__gtk_reserved2;
++  void *__gtk_reserved3;
++  void *__gtk_reserved4;
+ };
+ 
+ 
diff --git a/src/gtkglext-1-fixes.patch b/src/gtkglext-1-fixes.patch
index 0b756ca..661cad0 100644
--- a/src/gtkglext-1-fixes.patch
+++ b/src/gtkglext-1-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 1 Oct 2010 14:43:15 +0200
-Subject: [PATCH 1/4] remove pangox dependency
+Subject: [PATCH 1/5] remove pangox dependency
 
 
 diff --git a/configure.in b/configure.in
@@ -33,7 +33,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 1 Oct 2010 14:44:37 +0200
-Subject: [PATCH 2/4] use correct glib mkenums patch
+Subject: [PATCH 2/5] use correct glib mkenums patch
 
 This patch has been taken from:
 https://bugzilla.gnome.org/show_bug.cgi?id=618599
@@ -86,7 +86,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 1 Oct 2010 14:47:30 +0200
-Subject: [PATCH 3/4] don't use deprecated functions
+Subject: [PATCH 3/5] don't use deprecated functions
 
 This patch has been taken from:
 https://bugzilla.gnome.org/show_bug.cgi?id=618601
@@ -173,7 +173,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "fix@me" <fix@me>
 Date: Fri, 1 Oct 2010 14:50:25 +0200
-Subject: [PATCH 4/4] removed import declarations
+Subject: [PATCH 4/5] removed import declarations
 
 
 diff --git a/gdk/gdkgldefs.h b/gdk/gdkgldefs.h
@@ -208,3 +208,36 @@ index 1111111..2222222 100644
  #  endif
  #else
  #  define GTK_GL_VAR extern
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 28 May 2020 19:31:55 +0200
+Subject: [PATCH 5/5] fix missing extern for gcc 10
+
+
+diff --git a/gdk/gdkgldebug.h b/gdk/gdkgldebug.h
+index 1111111..2222222 100644
+--- a/gdk/gdkgldebug.h
++++ b/gdk/gdkgldebug.h
+@@ -66,7 +66,7 @@ typedef enum {
+ 
+ #endif /* G_ENABLE_DEBUG */
+ 
+-GDK_GL_VAR guint gdk_gl_debug_flags;
++extern guint gdk_gl_debug_flags;
+ 
+ G_END_DECLS
+ 
+diff --git a/gtk/gtkgldebug.h b/gtk/gtkgldebug.h
+index 1111111..2222222 100644
+--- a/gtk/gtkgldebug.h
++++ b/gtk/gtkgldebug.h
+@@ -60,7 +60,7 @@ typedef enum {
+ 
+ #endif /* G_ENABLE_DEBUG */
+ 
+-GTK_GL_VAR guint gtk_gl_debug_flags;
++extern guint gtk_gl_debug_flags;
+ 
+ G_END_DECLS
+ 
diff --git a/src/gtkglextmm.mk b/src/gtkglextmm.mk
index f1cc390..03b68a5 100644
--- a/src/gtkglextmm.mk
+++ b/src/gtkglextmm.mk
@@ -33,6 +33,7 @@ define $(PKG)_BUILD
     '$(TARGET)-g++' \
         -W -Wall -Werror -Wno-error=deprecated-declarations -pedantic -std=c++0x \
         -Wno-error=deprecated \
+        -Wno-error=cast-function-type \
         '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gtkglextmm.exe' \
         `'$(TARGET)-pkg-config' gtkglextmm-1.2 --cflags --libs`
 endef
diff --git a/src/gtkmm2.mk b/src/gtkmm2.mk
index 209a69c..59907bd 100644
--- a/src/gtkmm2.mk
+++ b/src/gtkmm2.mk
@@ -32,6 +32,7 @@ define $(PKG)_BUILD
     '$(TARGET)-g++' \
         -W -Wall -Wno-deprecated-declarations -Werror -pedantic -std=c++11 \
         -Wno-error=deprecated \
+        -Wno-error=cast-function-type \
         '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gtkmm2.exe' \
         `'$(TARGET)-pkg-config' gtkmm-2.4 --cflags --libs`
 endef
diff --git a/src/gtkmm3.mk b/src/gtkmm3.mk
index cfbf3c8..25f5dd3 100644
--- a/src/gtkmm3.mk
+++ b/src/gtkmm3.mk
@@ -29,6 +29,7 @@ define $(PKG)_BUILD
     '$(TARGET)-g++' \
         -W -Wall -Wno-deprecated-declarations -Werror -pedantic -std=c++11 \
         -Wno-error=deprecated \
+        -Wno-error=cast-function-type \
         '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gtkmm3.exe' \
         `'$(TARGET)-pkg-config' gtkmm-3.0 --cflags --libs`
 endef