r52564 - in /desktop/unstable/gnome-chess/debian: changelog patches/ patches/Drop-use-of-G_MODULE_EXPORT.patch patches/series

ah at users.alioth.debian.org ah at users.alioth.debian.org
Mon Jul 3 08:39:45 UTC 2017


Author: ah
Date: Mon Jul  3 08:39:45 2017
New Revision: 52564

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52564
Log:
* Add patch cherry-picked from upstream to fix FTBFS:
  - debian/patches/Drop-use-of-G_MODULE_EXPORT.patch
  (Closes: #865936, thanks to Jason Crain for investigating)

Added:
    desktop/unstable/gnome-chess/debian/patches/
    desktop/unstable/gnome-chess/debian/patches/Drop-use-of-G_MODULE_EXPORT.patch
    desktop/unstable/gnome-chess/debian/patches/series
Modified:
    desktop/unstable/gnome-chess/debian/changelog

Modified: desktop/unstable/gnome-chess/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-chess/debian/changelog?rev=52564&op=diff
==============================================================================
--- desktop/unstable/gnome-chess/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-chess/debian/changelog	[utf-8] Mon Jul  3 08:39:45 2017
@@ -1,3 +1,11 @@
+gnome-chess (1:3.22.2-2) unstable; urgency=medium
+
+  * Add patch cherry-picked from upstream to fix FTBFS:
+    - debian/patches/Drop-use-of-G_MODULE_EXPORT.patch
+    (Closes: #865936, thanks to Jason Crain for investigating)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Mon, 03 Jul 2017 10:35:09 +0200
+
 gnome-chess (1:3.22.2-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/gnome-chess/debian/patches/Drop-use-of-G_MODULE_EXPORT.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-chess/debian/patches/Drop-use-of-G_MODULE_EXPORT.patch?rev=52564&op=file
==============================================================================
--- desktop/unstable/gnome-chess/debian/patches/Drop-use-of-G_MODULE_EXPORT.patch	(added)
+++ desktop/unstable/gnome-chess/debian/patches/Drop-use-of-G_MODULE_EXPORT.patch	[utf-8] Mon Jul  3 08:39:45 2017
@@ -0,0 +1,202 @@
+From 21b0df604c56114eb721765d203f965b504403d7 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <withnall at endlessm.com>
+Date: Thu, 23 Mar 2017 15:28:45 +0000
+Subject: gnome-chess: Drop use of G_MODULE_EXPORT
+
+The usage was incorrect: it resulted in G_MODULE_EXPORT being added to
+all function *calls* to these functions, as well as the function
+declarations and definitions. Now that G_MODULE_EXPORT is defined as
+non-empty on Linux, the build fails.
+
+Signed-off-by: Philip Withnall <withnall at endlessm.com>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=780452
+---
+ src/gnome-chess.vala | 42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/src/gnome-chess.vala b/src/gnome-chess.vala
+index 35d0c3f..7c31291 100644
+--- a/src/gnome-chess.vala
++++ b/src/gnome-chess.vala
+@@ -1382,7 +1382,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+         black_time_label.queue_draw ();
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT gnome_chess_app_delete_event_cb", instance_pos = -1)]
++    [CCode (cname = "gnome_chess_app_delete_event_cb", instance_pos = -1)]
+     public bool gnome_chess_app_delete_event_cb (Gtk.Widget widget, Gdk.Event event)
+     {
+         quit_game ();
+@@ -1551,7 +1551,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+         quit_game ();
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT white_time_draw_cb", instance_pos = -1)]
++    [CCode (cname = "white_time_draw_cb", instance_pos = -1)]
+     public bool white_time_draw_cb (Gtk.Widget widget, Cairo.Context c)
+     {
+         double fg[3] = { 0.0, 0.0, 0.0 };
+@@ -1561,7 +1561,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+         return false;
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT black_time_draw_cb", instance_pos = -1)]
++    [CCode (cname = "black_time_draw_cb", instance_pos = -1)]
+     public bool black_time_draw_cb (Gtk.Widget widget, Cairo.Context c)
+     {
+         double fg[3] = { 1.0, 1.0, 1.0 };
+@@ -1648,7 +1648,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+             widget.set_size_request (compute_time_label_width_request (c), -1);
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT history_combo_changed_cb", instance_pos = -1)]
++    [CCode (cname = "history_combo_changed_cb", instance_pos = -1)]
+     public void history_combo_changed_cb (Gtk.ComboBox combo)
+     {
+         Gtk.TreeIter iter;
+@@ -1661,13 +1661,13 @@ Copyright © 2015–2016 Sahil Sareen""";
+         scene.move_number = move_number;
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT history_latest_clicked_cb", instance_pos = -1)]
++    [CCode (cname = "history_latest_clicked_cb", instance_pos = -1)]
+     public void history_latest_clicked_cb (Gtk.Widget widget)
+     {
+         scene.move_number = -1;
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT history_next_clicked_cb", instance_pos = -1)]
++    [CCode (cname = "history_next_clicked_cb", instance_pos = -1)]
+     public void history_next_clicked_cb (Gtk.Widget widget)
+     {
+         if (scene.move_number == -1)
+@@ -1680,7 +1680,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+             scene.move_number = move_number;
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT history_previous_clicked_cb", instance_pos = -1)]
++    [CCode (cname = "history_previous_clicked_cb", instance_pos = -1)]
+     public void history_previous_clicked_cb (Gtk.Widget widget)
+     {
+         if (scene.move_number == 0)
+@@ -1692,7 +1692,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+             scene.move_number = scene.move_number - 1;
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT history_start_clicked_cb", instance_pos = -1)]
++    [CCode (cname = "history_start_clicked_cb", instance_pos = -1)]
+     public void history_start_clicked_cb (Gtk.Widget widget)
+     {
+         scene.move_number = 0;
+@@ -1811,7 +1811,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+         return value;
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT side_combo_changed_cb", instance_pos = -1)]
++    [CCode (cname = "side_combo_changed_cb", instance_pos = -1)]
+     public void side_combo_changed_cb (Gtk.ComboBox combo)
+     {
+         Gtk.TreeIter iter;
+@@ -1823,7 +1823,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+         settings.set_enum ("play-as", player);
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT opponent_combo_changed_cb", instance_pos = -1)]
++    [CCode (cname = "opponent_combo_changed_cb", instance_pos = -1)]
+     public void opponent_combo_changed_cb (Gtk.ComboBox combo)
+     {
+         Gtk.TreeIter iter;
+@@ -1837,7 +1837,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+         difficulty_combo.sensitive = !vs_human;
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT difficulty_combo_changed_cb", instance_pos = -1)]
++    [CCode (cname = "difficulty_combo_changed_cb", instance_pos = -1)]
+     public void difficulty_combo_changed_cb (Gtk.ComboBox combo)
+     {
+         Gtk.TreeIter iter;
+@@ -2000,7 +2000,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+         return Source.REMOVE;
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT duration_changed_cb", instance_pos = -1)]
++    [CCode (cname = "duration_changed_cb", instance_pos = -1)]
+     public void duration_changed_cb (Gtk.Adjustment adjustment)
+     {
+         var model = (Gtk.ListStore) custom_duration_units_combo.model;
+@@ -2031,13 +2031,13 @@ Copyright © 2015–2016 Sahil Sareen""";
+         save_duration ();
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT duration_units_changed_cb", instance_pos = -1)]
++    [CCode (cname = "duration_units_changed_cb", instance_pos = -1)]
+     public void duration_units_changed_cb (Gtk.Widget widget)
+     {
+         save_duration ();
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT timer_increment_units_changed_cb", instance_pos = -1)]
++    [CCode (cname = "timer_increment_units_changed_cb", instance_pos = -1)]
+     public void timer_increment_units_changed_cb (Gtk.Widget widget)
+     {
+         var model = (Gtk.ListStore) timer_increment_units_combo.model;
+@@ -2096,7 +2096,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+         save_duration_timeout = Timeout.add (100, save_duration_cb);
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT duration_combo_changed_cb", instance_pos = -1)]
++    [CCode (cname = "duration_combo_changed_cb", instance_pos = -1)]
+     public void duration_combo_changed_cb (Gtk.ComboBox combo)
+     {
+         Gtk.TreeIter iter;
+@@ -2119,7 +2119,7 @@ Copyright © 2015–2016 Sahil Sareen""";
+         save_duration ();
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT clock_type_changed_cb", instance_pos = -1)]
++    [CCode (cname = "clock_type_changed_cb", instance_pos = -1)]
+     public void clock_type_changed_cb (Gtk.ComboBox combo)
+     {
+         Gtk.TreeIter iter;
+@@ -2133,32 +2133,32 @@ Copyright © 2015–2016 Sahil Sareen""";
+         settings.set_string ("clock-type", clock_type.to_string ());
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT preferences_response_cb", instance_pos = -1)]
++    [CCode (cname = "preferences_response_cb", instance_pos = -1)]
+     public void preferences_response_cb (Gtk.Widget widget, int response_id)
+     {
+         preferences_dialog.hide ();
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT preferences_delete_event_cb", instance_pos = -1)]
++    [CCode (cname = "preferences_delete_event_cb", instance_pos = -1)]
+     public bool preferences_delete_event_cb (Gtk.Widget widget, Gdk.Event event)
+     {
+         preferences_response_cb (widget, Gtk.ResponseType.CANCEL);
+         return true;
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT piece_style_combo_changed_cb", instance_pos = -1)]
++    [CCode (cname = "piece_style_combo_changed_cb", instance_pos = -1)]
+     public void piece_style_combo_changed_cb (Gtk.ComboBox combo)
+     {
+         settings.set_string ("piece-theme", get_combo (combo, 1));
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT move_format_combo_changed_cb", instance_pos = -1)]
++    [CCode (cname = "move_format_combo_changed_cb", instance_pos = -1)]
+     public void move_format_combo_changed_cb (Gtk.ComboBox combo)
+     {
+         settings.set_string ("move-format", get_combo (combo, 1));
+     }
+ 
+-    [CCode (cname = "G_MODULE_EXPORT orientation_combo_changed_cb", instance_pos = -1)]
++    [CCode (cname = "orientation_combo_changed_cb", instance_pos = -1)]
+     public void orientation_combo_changed_cb (Gtk.ComboBox combo)
+     {
+         settings.set_string ("board-side", get_combo (combo, 1));
+-- 
+cgit v0.12
+

Added: desktop/unstable/gnome-chess/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-chess/debian/patches/series?rev=52564&op=file
==============================================================================
--- desktop/unstable/gnome-chess/debian/patches/series	(added)
+++ desktop/unstable/gnome-chess/debian/patches/series	[utf-8] Mon Jul  3 08:39:45 2017
@@ -0,0 +1 @@
+Drop-use-of-G_MODULE_EXPORT.patch




More information about the pkg-gnome-commits mailing list