[DRE-maint] Bug#1042132: ruby-gnome: FTBFS: rbglib_bookmarkfile.c:39:1: error: static declaration of ‘g_bookmark_file_get_type’ follows non-static declaration

[Bastian Germann]

I am uploading a NMU to fix this. The debdiff is attached.
-------------- next part --------------
diff -Nru ruby-gnome-3.4.3/debian/changelog ruby-gnome-3.4.3/debian/changelog
--- ruby-gnome-3.4.3/debian/changelog	2022-06-26 14:29:08.000000000 +0200
+++ ruby-gnome-3.4.3/debian/changelog	2023-08-14 19:15:42.000000000 +0200
@@ -1,3 +1,11 @@
+ruby-gnome (3.4.3-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop unused ruby-gtk2 (Closes: #967733).
+  * Include upstream patch for GLib >= 2.75 (Closes: #1042132).
+
+ -- Bastian Germann <bage at debian.org>  Mon, 14 Aug 2023 17:15:42 +0000
+
 ruby-gnome (3.4.3-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru ruby-gnome-3.4.3/debian/control ruby-gnome-3.4.3/debian/control
--- ruby-gnome-3.4.3/debian/control	2022-06-25 09:49:19.000000000 +0200
+++ ruby-gnome-3.4.3/debian/control	2023-08-14 19:15:42.000000000 +0200
@@ -14,7 +14,6 @@
                libgstreamer-plugins-base1.0-dev,
                libgstreamer1.0-dev,
                libgtksourceview-3.0-dev,
-               libgtk2.0-dev,
                libjpeg-dev,
                libpng-dev,
                librsvg2-dev (>= 2.8.0),
@@ -287,25 +286,6 @@
  This package contains libraries for using GStreamer with the Ruby programming
  language.
 
-Package: ruby-gtk2
-Architecture: any
-XB-Ruby-Versions: ${ruby:Versions}
-X-DhRuby-Root: gtk2
-Depends: ruby | ruby-interpreter,
-         ruby-atk (>= ${source:Version}),
-         ruby-gdk-pixbuf2 (>= ${source:Version}),
-         ruby-pango (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Multi-Arch: same
-Description: GTK+ 2 bindings for the Ruby language
- GTK+ is a multi-platform toolkit for creating graphical user interfaces.
- Offering a complete set of widgets, GTK+ is suitable for projects ranging
- from small one-off tools to complete application suites.
- .
- This package contains libraries for using GTK+ 2 with the Ruby programming
- language.
-
 Package: ruby-gtk3
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
diff -Nru ruby-gnome-3.4.3/debian/patches/dont-define-G_TYPE_BOOKMARK_FILE.patch ruby-gnome-3.4.3/debian/patches/dont-define-G_TYPE_BOOKMARK_FILE.patch
--- ruby-gnome-3.4.3/debian/patches/dont-define-G_TYPE_BOOKMARK_FILE.patch	1970-01-01 01:00:00.000000000 +0100
+++ ruby-gnome-3.4.3/debian/patches/dont-define-G_TYPE_BOOKMARK_FILE.patch	2023-08-14 19:15:42.000000000 +0200
@@ -0,0 +1,34 @@
+Origin: upstream, 396d2d377bd85d9bdd73b26210e323129deea1f4
+From: Sutou Kouhei <kou at clear-code.com>
+Date: Thu, 16 Feb 2023 17:03:57 +0900
+Subject: glib2: don't define G_TYPE_BOOKMARK_FILE() for GLib >= 2.75
+
+GitHub: fix GH-1547
+
+GLib >= 2.75 defines it.
+
+Reported by Mamoru TASAKA. Thanks!!!
+---
+ glib2/ext/glib2/rbglib_bookmarkfile.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/glib2/ext/glib2/rbglib_bookmarkfile.c b/glib2/ext/glib2/rbglib_bookmarkfile.c
+index 036f783961..a7ac83eff9 100644
+--- a/glib2/ext/glib2/rbglib_bookmarkfile.c
++++ b/glib2/ext/glib2/rbglib_bookmarkfile.c
+@@ -21,6 +21,7 @@
+ 
+ #include "rbgprivate.h"
+ 
++#ifndef G_TYPE_BOOKMARK_FILE
+ /************************************************/
+ static GBookmarkFile*
+ bookmarkfile_copy(const GBookmarkFile* file)
+@@ -48,6 +49,7 @@ g_bookmark_file_get_type(void)
+ /************************************************/
+ 
+ #define G_TYPE_BOOKMARK_FILE (g_bookmark_file_get_type())
++#endif
+ 
+ #define RG_TARGET_NAMESPACE cBookmarkFile
+ #define _SELF(self) ((GBookmarkFile*)(RVAL2BOXED(self, G_TYPE_BOOKMARK_FILE)))
diff -Nru ruby-gnome-3.4.3/debian/patches/series ruby-gnome-3.4.3/debian/patches/series
--- ruby-gnome-3.4.3/debian/patches/series	2021-09-12 07:45:24.000000000 +0200
+++ ruby-gnome-3.4.3/debian/patches/series	2023-08-14 19:15:42.000000000 +0200
@@ -7,3 +7,4 @@
 do-not-run-dependency-check.patch
 ruby-gnome2-gemspecs.patch
 do-not-depend-dependency-check.patch
+dont-define-G_TYPE_BOOKMARK_FILE.patch
diff -Nru ruby-gnome-3.4.3/debian/ruby-gtk2.examples ruby-gnome-3.4.3/debian/ruby-gtk2.examples
--- ruby-gnome-3.4.3/debian/ruby-gtk2.examples	2021-09-12 07:45:20.000000000 +0200
+++ ruby-gnome-3.4.3/debian/ruby-gtk2.examples	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-gtk2/sample/*
diff -Nru ruby-gnome-3.4.3/debian/ruby-gtk2.install ruby-gnome-3.4.3/debian/ruby-gtk2.install
--- ruby-gnome-3.4.3/debian/ruby-gtk2.install	2021-09-12 07:45:20.000000000 +0200
+++ ruby-gnome-3.4.3/debian/ruby-gtk2.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/lib/*/ruby/vendor_ruby/*/gtk2.so
-usr/lib/ruby/vendor_ruby/gtk2.rb
-usr/lib/ruby/vendor_ruby/gtk2/base.rb
-usr/share/rubygems-integration/*/specifications/gtk2-*.gemspec
diff -Nru ruby-gnome-3.4.3/debian/rules ruby-gnome-3.4.3/debian/rules
--- ruby-gnome-3.4.3/debian/rules	2021-09-12 07:45:24.000000000 +0200
+++ ruby-gnome-3.4.3/debian/rules	2023-08-14 19:15:42.000000000 +0200
@@ -19,7 +19,6 @@
 	dh_fixperms
 	# Remove executable flag from some examples that aren't actually executable.
 	chmod -x debian/ruby-glib2/usr/share/doc/ruby-glib2/examples/type-register*.rb
-	chmod -x debian/ruby-gtk2/usr/share/doc/ruby-gtk2/examples/misc/properties.rb
 	chmod -x debian/ruby-gtk3/usr/share/doc/ruby-gtk3/examples/misc/properties.rb
 
 override_dh_compress: