Bug#764706: freeciv-client-gtk: Please fix empty governments menu bug (bug #22599, svn patch 26427)

[Rogier]

Package: freeciv-client-gtk
Version: 2.4.3
Severity: normal
Tags: patch

Dear Maintainer,

The freeciv gtk clients have a bug which can cause the governments
menu to be empty, effectively disabling choosing new governments.

See http://gna.org/bugs/?22599

This bug was patched in freeciv svn (15 sept 2014):

http://svn.gna.org/viewcvs/freeciv?view=revision&revision=26427

Please consider including this patch in the current debian version.
I have attached a debian patch (quilt) file. You'll probably
want to edit the details, but AFAICT it is OK (i.e. for me,
it applies and compiles using dpkg-buildpackage)

Kind regards,

Rogier.

------------------------------------------------------
Description: Fix empty government list in menu (backport of svn 26427)
 Ensure the menus are really created before performing any operations on them.
 It was sometimes resulting an empty available governement list in the menus.
 .
 Reported by uwehgeissler _AT_ gmx.de and Christian Knoke <chrisk>
 .
 See gna bug #18764 & bug #22599

Origin: upstream http://svn.gna.org/viewcvs/freeciv?view=revision&revision=26427
Bug: http://gna.org/bugs/?22599
Forwarded: not-needed    

Index: freeciv-2.4.3/client/gui-gtk-2.0/gui_main.c
===================================================================
--- freeciv-2.4.3.orig/client/gui-gtk-2.0/gui_main.c
+++ freeciv-2.4.3/client/gui-gtk-2.0/gui_main.c
@@ -944,6 +944,11 @@ void enable_menus(bool enable)
 {
   if (enable) {
     main_menubar = setup_menus(toplevel);
+    /* Ensure the menus are really created before performing any operations
+     * on them. */
+    while (gtk_events_pending()) {
+      gtk_main_iteration();
+    }
     gtk_box_pack_start(GTK_BOX(top_vbox), main_menubar, FALSE, FALSE, 0);
     menus_init();
     gtk_widget_show_all(main_menubar);
Index: freeciv-2.4.3/client/gui-gtk-3.0/gui_main.c
===================================================================
--- freeciv-2.4.3.orig/client/gui-gtk-3.0/gui_main.c
+++ freeciv-2.4.3/client/gui-gtk-3.0/gui_main.c
@@ -941,6 +941,11 @@ void enable_menus(bool enable)
 {
   if (enable) {
     main_menubar = setup_menus(toplevel);
+    /* Ensure the menus are really created before performing any operations
+     * on them. */
+    while (gtk_events_pending()) {
+      gtk_main_iteration();
+    }
     gtk_grid_attach_next_to(GTK_GRID(top_vbox), main_menubar, NULL, GTK_POS_TOP, 1, 1);
     menus_init();
     gtk_widget_show_all(main_menubar);
------------------------------------------------------


-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (x86_64)

Kernel: Linux 3.16-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages freeciv-client-gtk depends on:
ii  freeciv-data         2.4.3-1
ii  libbz2-1.0           1.0.6-7
ii  libc6                2.19-11
ii  libcairo2            1.12.16-5
ii  libgdk-pixbuf2.0-0   2.30.8-1+b1
ii  libglib2.0-0         2.42.0-2
ii  libgtk-3-0           3.14.1-1
ii  libgtk2.0-0          2.24.24-1
ii  liblua5.1-0          5.1.5-7
ii  liblzma5             5.1.1alpha+20120614-2
ii  libpango-1.0-0       1.36.8-2
ii  libpangocairo-1.0-0  1.36.8-2
ii  libsdl-mixer1.2      1.2.12-11+b1
ii  libsdl1.2debian      1.2.15-10
ii  zlib1g               1:1.2.8.dfsg-2

Versions of packages freeciv-client-gtk recommends:
ii  freeciv-server       2.4.3-1
ii  gtk2-engines-pixbuf  2.24.24-1

Versions of packages freeciv-client-gtk suggests:
pn  freeciv-client-extras  <none>
pn  freeciv-sound          <none>

-- no debconf information