[arch-commits] Commit in xfce4-terminal/repos (8 files)

Evangelos Foutras foutrelis at archlinux.org
Sun Mar 1 11:24:40 UTC 2015


    Date: Sunday, March 1, 2015 @ 12:24:39
  Author: foutrelis
Revision: 232283

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xfce4-terminal/repos/staging-i686/
  xfce4-terminal/repos/staging-i686/PKGBUILD
    (from rev 232282, xfce4-terminal/trunk/PKGBUILD)
  xfce4-terminal/repos/staging-i686/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
    (from rev 232282, xfce4-terminal/trunk/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch)
  xfce4-terminal/repos/staging-i686/xfce4-terminal.install
    (from rev 232282, xfce4-terminal/trunk/xfce4-terminal.install)
  xfce4-terminal/repos/staging-x86_64/
  xfce4-terminal/repos/staging-x86_64/PKGBUILD
    (from rev 232282, xfce4-terminal/trunk/PKGBUILD)
  xfce4-terminal/repos/staging-x86_64/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
    (from rev 232282, xfce4-terminal/trunk/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch)
  xfce4-terminal/repos/staging-x86_64/xfce4-terminal.install
    (from rev 232282, xfce4-terminal/trunk/xfce4-terminal.install)

-----------------------------------------------------------------------------+
 staging-i686/PKGBUILD                                                       |   40 ++++++++
 staging-i686/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch   |   50 ++++++++++
 staging-i686/xfce4-terminal.install                                         |   13 ++
 staging-x86_64/PKGBUILD                                                     |   40 ++++++++
 staging-x86_64/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch |   50 ++++++++++
 staging-x86_64/xfce4-terminal.install                                       |   13 ++
 6 files changed, 206 insertions(+)

Copied: xfce4-terminal/repos/staging-i686/PKGBUILD (from rev 232282, xfce4-terminal/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-03-01 11:24:39 UTC (rev 232283)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Aurelien Foret <orelien at chez.com>
+
+pkgname=xfce4-terminal
+pkgver=0.6.3
+pkgrel=2
+pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'vte' 'hicolor-icon-theme')
+makedepends=('intltool')
+conflicts=('terminal')
+replaces=('terminal')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2)
+sha256sums=('912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfce4-terminal/repos/staging-i686/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch (from rev 232282, xfce4-terminal/trunk/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch)
===================================================================
--- staging-i686/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch	                        (rev 0)
+++ staging-i686/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch	2015-03-01 11:24:39 UTC (rev 232283)
@@ -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

Copied: xfce4-terminal/repos/staging-i686/xfce4-terminal.install (from rev 232282, xfce4-terminal/trunk/xfce4-terminal.install)
===================================================================
--- staging-i686/xfce4-terminal.install	                        (rev 0)
+++ staging-i686/xfce4-terminal.install	2015-03-01 11:24:39 UTC (rev 232283)
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfce4-terminal/repos/staging-x86_64/PKGBUILD (from rev 232282, xfce4-terminal/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-03-01 11:24:39 UTC (rev 232283)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Aurelien Foret <orelien at chez.com>
+
+pkgname=xfce4-terminal
+pkgver=0.6.3
+pkgrel=2
+pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'vte' 'hicolor-icon-theme')
+makedepends=('intltool')
+conflicts=('terminal')
+replaces=('terminal')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2)
+sha256sums=('912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfce4-terminal/repos/staging-x86_64/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch (from rev 232282, xfce4-terminal/trunk/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch)
===================================================================
--- staging-x86_64/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch	                        (rev 0)
+++ staging-x86_64/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch	2015-03-01 11:24:39 UTC (rev 232283)
@@ -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

Copied: xfce4-terminal/repos/staging-x86_64/xfce4-terminal.install (from rev 232282, xfce4-terminal/trunk/xfce4-terminal.install)
===================================================================
--- staging-x86_64/xfce4-terminal.install	                        (rev 0)
+++ staging-x86_64/xfce4-terminal.install	2015-03-01 11:24:39 UTC (rev 232283)
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list