[arch-commits] Commit in xfce4-terminal/trunk (2 files)

[Evangelos Foutras]

    Date: Monday, December 9, 2013 @ 20:48:18
  Author: foutrelis
Revision: 201371

upgpkg: xfce4-terminal 0.6.2-2

Fix crash when opening the encoding submenu (FS#37403).

Added:
  xfce4-terminal/trunk/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
Modified:
  xfce4-terminal/trunk/PKGBUILD

--------------------------------------------------------------+
 PKGBUILD                                                     |   15 ++-
 xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch |   50 ++++++++++
 2 files changed, 62 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-09 18:57:47 UTC (rev 201370)
+++ PKGBUILD	2013-12-09 19:48:18 UTC (rev 201371)
@@ -5,7 +5,7 @@
 
 pkgname=xfce4-terminal
 pkgver=0.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -16,9 +16,18 @@
 conflicts=('terminal')
 replaces=('terminal')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2
+        xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch)
+sha256sums=('3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35'
+            '4708b6f223fe8ecc34f8f2c8f9b9d18c2ff8f7ff13300715f7a23e49cfb539fe')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=10395
+  patch -Np1 -i "$srcdir/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch"
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
===================================================================
--- xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch	                        (rev 0)
+++ xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch	2013-12-09 19:48:18 UTC (rev 201371)
@@ -0,0 +1,50 @@
+From 71bd87a532f250d6bc98d52a5d546d43056bbd99 Mon Sep 17 00:00:00 2001
+From: Alistair Buxton <a.j.buxton at gmail.com>
+Date: Sun, 13 Oct 2013 23:41:45 +0000
+Subject: Fix up the encoding menu creation.
+
+Don't add non-radio items to the radio item group.
+Don't leak list nodes by prepending twice to the same list.
+Fixes BUG #10395.
+---
+diff --git a/terminal/terminal-encoding-action.c b/terminal/terminal-encoding-action.c
+index 83242e9..77c916c 100644
+--- a/terminal/terminal-encoding-action.c
++++ b/terminal/terminal-encoding-action.c
+@@ -253,7 +253,7 @@ terminal_encoding_action_menu_shown (GtkWidget              *menu,
+   /* action to reset to the default */
+   default_label = g_strdup_printf (_("Default (%s)"), default_charset);
+   item = gtk_radio_menu_item_new_with_label (groups, default_label);
+-  groups = g_slist_prepend (groups, item);
++  groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), found);
+   g_signal_connect (G_OBJECT (item), "activate",
+@@ -267,7 +267,6 @@ terminal_encoding_action_menu_shown (GtkWidget              *menu,
+       /* category item */
+       item = gtk_menu_item_new_with_label (_(terminal_encodings_names[n]));
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+-      groups = g_slist_prepend (groups, item);
+       gtk_widget_show (item);
+ 
+       submenu = gtk_menu_new ();
+@@ -281,7 +280,7 @@ terminal_encoding_action_menu_shown (GtkWidget              *menu,
+             break;
+ 
+           item2 = gtk_radio_menu_item_new_with_label (groups, charset);
+-          groups = g_slist_prepend (groups, item2);
++          groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2));
+           gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2);
+           g_object_set_qdata (G_OBJECT (item2), encoding_action_quark, (gchar *) charset);
+           gtk_widget_show (item2);
+@@ -304,7 +303,7 @@ terminal_encoding_action_menu_shown (GtkWidget              *menu,
+     {
+       /* add an action with the unknown charset */
+       item2 = gtk_radio_menu_item_new_with_label (groups, action->current);
+-      groups = g_slist_prepend (groups, item2);
++      groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2));
+       g_object_set_qdata_full (G_OBJECT (item2), encoding_action_quark,
+                                g_strdup (action->current), g_free);
+       gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2);
+--
+cgit v0.9.2