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

2018-02-25 Thread Evangelos Foutras via arch-commits 
Date: Monday, February 26, 2018 @ 07:39:13
  Author: foutrelis
Revision: 317542

upgpkg: xfce4-terminal 0.8.7.1-1

New upstream release.

Modified:
  xfce4-terminal/trunk/PKGBUILD
Deleted:
  
xfce4-terminal/trunk/0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch

-+
 0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch |   58 
--
 PKGBUILD|   17 --
 2 files changed, 4 insertions(+), 71 deletions(-)

Deleted: 0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch
===
--- 0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch 
2018-02-26 03:12:23 UTC (rev 317541)
+++ 0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch 
2018-02-26 07:39:13 UTC (rev 317542)
@@ -1,58 +0,0 @@
-From 609c53f974caee6b75c6ffa259cf6fcda671e39b Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras 
-Date: Sun, 25 Feb 2018 22:25:17 +0200
-Subject: [PATCH] Revert "Allow underscores that are part of tab titles to be
- shown in the tabs menu"
-
-This reverts commit 300d136e1c9ab2c2a687c11a8ccd7b470816ee36.

- terminal/terminal-window.c | 14 +-
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
-index e678c8f7..4af3bc64 100644
 a/terminal/terminal-window.c
-+++ b/terminal/terminal-window.c
-@@ -2956,7 +2956,7 @@ terminal_window_rebuild_tabs_menu (TerminalWindow 
*window)
-   GtkWidget  *page;
-   GSList *group = NULL;
-   GtkRadioAction *radio_action;
--  gchar   name[50], menu_item_name[100];
-+  gchar   name[50];
-   GSList *lp;
-   GtkAccelKey key = {0};
- 
-@@ -3011,26 +3011,22 @@ G_GNUC_END_IGNORE_DEPRECATIONS
-   g_object_set_qdata_full (G_OBJECT (page), tabs_menu_action_quark,
-radio_action, g_object_unref);
- 
--G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-   /* add action in the menu */
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-   gtk_ui_manager_add_ui (window->priv->ui_manager, 
window->priv->tabs_menu_merge_id,
-  "/main-menu/tabs-menu/placeholder-tab-items",
-  name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
--  /* allow underscore to be shown */
--  g_snprintf (menu_item_name, sizeof (menu_item_name), 
"/main-menu/tabs-menu/placeholder-tab-items/%s", name);
--  gtk_menu_item_set_use_underline (GTK_MENU_ITEM 
(gtk_ui_manager_get_widget (window->priv->ui_manager, menu_item_name)), FALSE);
-+G_GNUC_END_IGNORE_DEPRECATIONS
- 
-   if (npages > 1)
- {
-   /* add to right-click tab menu */
-+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-   gtk_ui_manager_add_ui (window->priv->ui_manager, 
window->priv->tabs_menu_merge_id,
-  "/tab-menu/tabs-menu/placeholder-tab-items",
-  name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
--  /* allow underscore to be shown */
--  g_snprintf (menu_item_name, sizeof (menu_item_name), 
"/tab-menu/tabs-menu/placeholder-tab-items/%s", name);
--  gtk_menu_item_set_use_underline (GTK_MENU_ITEM 
(gtk_ui_manager_get_widget (window->priv->ui_manager, menu_item_name)), FALSE);
--}
- G_GNUC_END_IGNORE_DEPRECATIONS
-+}
- 
-   /* set an accelerator path */
-   g_snprintf (name, sizeof (name), 
"/terminal-window/goto-tab-%d", n + 1);
--- 
-2.16.2
-

Modified: PKGBUILD
===
--- PKGBUILD2018-02-26 03:12:23 UTC (rev 317541)
+++ PKGBUILD2018-02-26 07:39:13 UTC (rev 317542)
@@ -4,8 +4,8 @@
 # Contributor: Aurelien Foret 
 
 pkgname=xfce4-terminal
-pkgver=0.8.7
-pkgrel=2
+pkgver=0.8.7.1
+pkgrel=1
 pkgdesc="A modern terminal emulator primarily for the Xfce desktop environment"
 arch=('x86_64')
 url="http://www.xfce.org/;
@@ -15,18 +15,9 @@
 makedepends=('intltool')
 conflicts=('terminal')
 replaces=('terminal')
-source=(https://archive.xfce.org/src/apps/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
-0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch)
-sha256sums=('0ced5ff686f839acb6a89a9fd48af7ab04d17a56346e31d1a5063cfa36734540'
-'174d569305310c321387d73c0b55cbafc589cc4db1618c3771ee98c158589c20')
+source=(https://archive.xfce.org/src/apps/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('9ff21627e8d2a105e7133efc3e8eeeda376a2071fac737e37cf47a539a7b4351')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=14247
-  patch -Np1 -i 
../0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"

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

2018-02-25 Thread Evangelos Foutras via arch-commits 
Date: Sunday, February 25, 2018 @ 20:33:50
  Author: foutrelis
Revision: 317511

upgpkg: xfce4-terminal 0.8.7-2

Revert upstream commit that breaks tab switching using Alt+.

https://bugzilla.xfce.org/show_bug.cgi?id=14247

Added:
  
xfce4-terminal/trunk/0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch
Modified:
  xfce4-terminal/trunk/PKGBUILD

-+
 0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch |   58 
++
 PKGBUILD|   15 ++
 2 files changed, 70 insertions(+), 3 deletions(-)

Added: 0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch
===
--- 0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch 
(rev 0)
+++ 0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch 
2018-02-25 20:33:50 UTC (rev 317511)
@@ -0,0 +1,58 @@
+From 609c53f974caee6b75c6ffa259cf6fcda671e39b Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras 
+Date: Sun, 25 Feb 2018 22:25:17 +0200
+Subject: [PATCH] Revert "Allow underscores that are part of tab titles to be
+ shown in the tabs menu"
+
+This reverts commit 300d136e1c9ab2c2a687c11a8ccd7b470816ee36.
+---
+ terminal/terminal-window.c | 14 +-
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
+index e678c8f7..4af3bc64 100644
+--- a/terminal/terminal-window.c
 b/terminal/terminal-window.c
+@@ -2956,7 +2956,7 @@ terminal_window_rebuild_tabs_menu (TerminalWindow 
*window)
+   GtkWidget  *page;
+   GSList *group = NULL;
+   GtkRadioAction *radio_action;
+-  gchar   name[50], menu_item_name[100];
++  gchar   name[50];
+   GSList *lp;
+   GtkAccelKey key = {0};
+ 
+@@ -3011,26 +3011,22 @@ G_GNUC_END_IGNORE_DEPRECATIONS
+   g_object_set_qdata_full (G_OBJECT (page), tabs_menu_action_quark,
+radio_action, g_object_unref);
+ 
+-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+   /* add action in the menu */
++G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+   gtk_ui_manager_add_ui (window->priv->ui_manager, 
window->priv->tabs_menu_merge_id,
+  "/main-menu/tabs-menu/placeholder-tab-items",
+  name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
+-  /* allow underscore to be shown */
+-  g_snprintf (menu_item_name, sizeof (menu_item_name), 
"/main-menu/tabs-menu/placeholder-tab-items/%s", name);
+-  gtk_menu_item_set_use_underline (GTK_MENU_ITEM 
(gtk_ui_manager_get_widget (window->priv->ui_manager, menu_item_name)), FALSE);
++G_GNUC_END_IGNORE_DEPRECATIONS
+ 
+   if (npages > 1)
+ {
+   /* add to right-click tab menu */
++G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+   gtk_ui_manager_add_ui (window->priv->ui_manager, 
window->priv->tabs_menu_merge_id,
+  "/tab-menu/tabs-menu/placeholder-tab-items",
+  name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
+-  /* allow underscore to be shown */
+-  g_snprintf (menu_item_name, sizeof (menu_item_name), 
"/tab-menu/tabs-menu/placeholder-tab-items/%s", name);
+-  gtk_menu_item_set_use_underline (GTK_MENU_ITEM 
(gtk_ui_manager_get_widget (window->priv->ui_manager, menu_item_name)), FALSE);
+-}
+ G_GNUC_END_IGNORE_DEPRECATIONS
++}
+ 
+   /* set an accelerator path */
+   g_snprintf (name, sizeof (name), 
"/terminal-window/goto-tab-%d", n + 1);
+-- 
+2.16.2
+

Modified: PKGBUILD
===
--- PKGBUILD2018-02-25 20:01:11 UTC (rev 317510)
+++ PKGBUILD2018-02-25 20:33:50 UTC (rev 317511)
@@ -5,7 +5,7 @@
 
 pkgname=xfce4-terminal
 pkgver=0.8.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern terminal emulator primarily for the Xfce desktop environment"
 arch=('x86_64')
 url="http://www.xfce.org/;
@@ -15,9 +15,18 @@
 makedepends=('intltool')
 conflicts=('terminal')
 replaces=('terminal')
-source=(https://archive.xfce.org/src/apps/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('0ced5ff686f839acb6a89a9fd48af7ab04d17a56346e31d1a5063cfa36734540')
+source=(https://archive.xfce.org/src/apps/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
+0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch)
+sha256sums=('0ced5ff686f839acb6a89a9fd48af7ab04d17a56346e31d1a5063cfa36734540'
+'174d569305310c321387d73c0b55cbafc589cc4db1618c3771ee98c158589c20')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=14247
+  patch -Np1 -i 
../0001-Revert-Allow-underscores-that-are-part-of-tab-titles.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"

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

2016-12-31 Thread Evangelos Foutras 
Date: Saturday, December 31, 2016 @ 15:17:17
  Author: foutrelis
Revision: 284989

upgpkg: xfce4-terminal 0.8.2-1

New upstream release.

Modified:
  xfce4-terminal/trunk/PKGBUILD
Deleted:
  
xfce4-terminal/trunk/0001-Set-window-hints-properly-showes-columns-rows-when-r.patch

-+
 0001-Set-window-hints-properly-showes-columns-rows-when-r.patch |   77 
--
 PKGBUILD|4 
 2 files changed, 2 insertions(+), 79 deletions(-)

Deleted: 0001-Set-window-hints-properly-showes-columns-rows-when-r.patch
===
--- 0001-Set-window-hints-properly-showes-columns-rows-when-r.patch 
2016-12-31 15:03:35 UTC (rev 284988)
+++ 0001-Set-window-hints-properly-showes-columns-rows-when-r.patch 
2016-12-31 15:17:17 UTC (rev 284989)
@@ -1,77 +0,0 @@
-From 980003baf92afed64c7958dbaf1a92c3aca402cb Mon Sep 17 00:00:00 2001
-From: Igor 
-Date: Tue, 18 Oct 2016 14:56:47 +0300
-Subject: [PATCH] Set window hints properly; showes columns/rows when resizing
-
-Fixes https://bugzilla.xfce.org/show_bug.cgi?id=12793

- terminal/terminal-screen.c | 36 
- 1 file changed, 24 insertions(+), 12 deletions(-)
-
-diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
-index 0351437..311f02f 100644
 a/terminal/terminal-screen.c
-+++ b/terminal/terminal-screen.c
-@@ -1673,35 +1673,47 @@ terminal_screen_get_geometry (TerminalScreen *screen,
-  *
-  * I don't like this way, but its required to work-around a Gtk+
-  * bug (maybe also caused by a Vte bug, not sure).
-+ *
-+ * Code borrowed from gnome-terminal (terminal_window_update_geometry).
-  **/
- void
- terminal_screen_set_window_geometry_hints (TerminalScreen *screen,
-GtkWindow  *window)
- {
--  GdkGeometry  hints;
--  gint xpad;
--  gint ypad;
--  glongchar_width;
--  glongchar_height;
-+  GdkGeometryhints;
-+  GtkRequisition vbox_request;
-+  GtkAllocation  toplevel_allocation, vbox_allocation;
-+  glong  char_width, char_height;
-+  glong  grid_width, grid_height;
-+  glong  chrome_width, chrome_height;
-+  gint   csd_width, csd_height;
- 
-   terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-   terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal));
-   terminal_return_if_fail (gtk_widget_get_realized (screen));
-   terminal_return_if_fail (gtk_widget_get_realized (window));
- 
--  terminal_screen_get_geometry (screen,
--_width, _height,
--, );
-+  terminal_screen_get_geometry (screen, _width, _height, NULL, 
NULL);
-+  terminal_screen_get_size (screen, _width, _height);
-+
-+  gtk_widget_get_preferred_size (TERMINAL_WINDOW (window)->vbox, NULL, 
_request);
-+  chrome_width = vbox_request.width - (char_width * grid_width);
-+  chrome_height = vbox_request.height - (char_height * grid_height);
-+
-+  gtk_widget_get_allocation (TERMINAL_WINDOW (window)->vbox, 
_allocation);
-+  gtk_widget_get_allocation (GTK_WIDGET (window), _allocation);
-+  csd_width = toplevel_allocation.width - vbox_allocation.width;
-+  csd_height = toplevel_allocation.height - vbox_allocation.height;
- 
--  hints.base_width = xpad;
--  hints.base_height = ypad;
-+  hints.base_width = chrome_width + csd_width;
-+  hints.base_height = chrome_height + csd_height;
-   hints.width_inc = char_width;
-   hints.height_inc = char_height;
-   hints.min_width = hints.base_width + hints.width_inc * 4;
-   hints.min_height = hints.base_height + hints.height_inc * 2;
- 
--  gtk_window_set_geometry_hints (GTK_WINDOW (window),
-- screen->terminal,
-+  gtk_window_set_geometry_hints (window,
-+ NULL,
-  ,
-  GDK_HINT_RESIZE_INC
-  | GDK_HINT_MIN_SIZE
--- 
-2.10.0
-

Modified: PKGBUILD
===
--- PKGBUILD2016-12-31 15:03:35 UTC (rev 284988)
+++ PKGBUILD2016-12-31 15:17:17 UTC (rev 284989)
@@ -4,7 +4,7 @@
 # Contributor: Aurelien Foret 
 
 pkgname=xfce4-terminal
-pkgver=0.8.1
+pkgver=0.8.2
 pkgrel=1
 pkgdesc="A modern terminal emulator primarily for the Xfce desktop environment"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 conflicts=('terminal')
 replaces=('terminal')
 
source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('ddfe53a89d315a4a9170ca6d2cee2d33145bd63630062b2e867fb3a5fcde5fdf')
+sha256sums=('92aad3e14f3ef8d4c6c1409463e989bd8f5eefb686234f3cdbfe574729401681')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"

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

2016-10-18 Thread Evangelos Foutras 
Date: Tuesday, October 18, 2016 @ 13:51:50
  Author: foutrelis
Revision: 278919

upgpkg: xfce4-terminal 0.8.0-2

Pull upstream patch that sets window hints correctly.

Added:
  
xfce4-terminal/trunk/0001-Set-window-hints-properly-showes-columns-rows-when-r.patch
Modified:
  xfce4-terminal/trunk/PKGBUILD

-+
 0001-Set-window-hints-properly-showes-columns-rows-when-r.patch |   77 
++
 PKGBUILD|   15 +
 2 files changed, 89 insertions(+), 3 deletions(-)

Added: 0001-Set-window-hints-properly-showes-columns-rows-when-r.patch
===
--- 0001-Set-window-hints-properly-showes-columns-rows-when-r.patch 
(rev 0)
+++ 0001-Set-window-hints-properly-showes-columns-rows-when-r.patch 
2016-10-18 13:51:50 UTC (rev 278919)
@@ -0,0 +1,77 @@
+From 980003baf92afed64c7958dbaf1a92c3aca402cb Mon Sep 17 00:00:00 2001
+From: Igor 
+Date: Tue, 18 Oct 2016 14:56:47 +0300
+Subject: [PATCH] Set window hints properly; showes columns/rows when resizing
+
+Fixes https://bugzilla.xfce.org/show_bug.cgi?id=12793
+---
+ terminal/terminal-screen.c | 36 
+ 1 file changed, 24 insertions(+), 12 deletions(-)
+
+diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
+index 0351437..311f02f 100644
+--- a/terminal/terminal-screen.c
 b/terminal/terminal-screen.c
+@@ -1673,35 +1673,47 @@ terminal_screen_get_geometry (TerminalScreen *screen,
+  *
+  * I don't like this way, but its required to work-around a Gtk+
+  * bug (maybe also caused by a Vte bug, not sure).
++ *
++ * Code borrowed from gnome-terminal (terminal_window_update_geometry).
+  **/
+ void
+ terminal_screen_set_window_geometry_hints (TerminalScreen *screen,
+GtkWindow  *window)
+ {
+-  GdkGeometry  hints;
+-  gint xpad;
+-  gint ypad;
+-  glongchar_width;
+-  glongchar_height;
++  GdkGeometryhints;
++  GtkRequisition vbox_request;
++  GtkAllocation  toplevel_allocation, vbox_allocation;
++  glong  char_width, char_height;
++  glong  grid_width, grid_height;
++  glong  chrome_width, chrome_height;
++  gint   csd_width, csd_height;
+ 
+   terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+   terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal));
+   terminal_return_if_fail (gtk_widget_get_realized (screen));
+   terminal_return_if_fail (gtk_widget_get_realized (window));
+ 
+-  terminal_screen_get_geometry (screen,
+-_width, _height,
+-, );
++  terminal_screen_get_geometry (screen, _width, _height, NULL, 
NULL);
++  terminal_screen_get_size (screen, _width, _height);
++
++  gtk_widget_get_preferred_size (TERMINAL_WINDOW (window)->vbox, NULL, 
_request);
++  chrome_width = vbox_request.width - (char_width * grid_width);
++  chrome_height = vbox_request.height - (char_height * grid_height);
++
++  gtk_widget_get_allocation (TERMINAL_WINDOW (window)->vbox, 
_allocation);
++  gtk_widget_get_allocation (GTK_WIDGET (window), _allocation);
++  csd_width = toplevel_allocation.width - vbox_allocation.width;
++  csd_height = toplevel_allocation.height - vbox_allocation.height;
+ 
+-  hints.base_width = xpad;
+-  hints.base_height = ypad;
++  hints.base_width = chrome_width + csd_width;
++  hints.base_height = chrome_height + csd_height;
+   hints.width_inc = char_width;
+   hints.height_inc = char_height;
+   hints.min_width = hints.base_width + hints.width_inc * 4;
+   hints.min_height = hints.base_height + hints.height_inc * 2;
+ 
+-  gtk_window_set_geometry_hints (GTK_WINDOW (window),
+- screen->terminal,
++  gtk_window_set_geometry_hints (window,
++ NULL,
+  ,
+  GDK_HINT_RESIZE_INC
+  | GDK_HINT_MIN_SIZE
+-- 
+2.10.0
+

Modified: PKGBUILD
===
--- PKGBUILD2016-10-18 13:51:48 UTC (rev 278918)
+++ PKGBUILD2016-10-18 13:51:50 UTC (rev 278919)
@@ -5,7 +5,7 @@
 
 pkgname=xfce4-terminal
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/;
@@ -15,9 +15,18 @@
 makedepends=('intltool')
 conflicts=('terminal')
 replaces=('terminal')
-source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('e915c05a3d07b66d153e1ba8614f904f9c12b2dd8372b27d24c0d339743d5b0a')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+0001-Set-window-hints-properly-showes-columns-rows-when-r.patch)

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

2016-10-17 Thread Evangelos Foutras 
Date: Monday, October 17, 2016 @ 13:32:56
  Author: foutrelis
Revision: 278886

upgpkg: xfce4-terminal 0.8.0-1

New upstream release.

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

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

Modified: PKGBUILD
===
--- PKGBUILD2016-10-17 12:24:24 UTC (rev 278885)
+++ PKGBUILD2016-10-17 13:32:56 UTC (rev 278886)
@@ -4,19 +4,19 @@
 # Contributor: Aurelien Foret 
 
 pkgname=xfce4-terminal
-pkgver=0.6.3
-pkgrel=3
+pkgver=0.8.0
+pkgrel=1
 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')
+depends=('libxfce4ui' 'vte3' 'hicolor-icon-theme')
 makedepends=('intltool')
 conflicts=('terminal')
 replaces=('terminal')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2)
-sha256sums=('912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('e915c05a3d07b66d153e1ba8614f904f9c12b2dd8372b27d24c0d339743d5b0a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"

Deleted: xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
===
--- xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
2016-10-17 12:24:24 UTC (rev 278885)
+++ xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
2016-10-17 13:32:56 UTC (rev 278886)
@@ -1,50 +0,0 @@
-From 71bd87a532f250d6bc98d52a5d546d43056bbd99 Mon Sep 17 00:00:00 2001
-From: Alistair Buxton 
-Date: Sun, 13 Oct 2013 23:41:45 +
-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

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

2013-12-09 Thread 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
===
--- PKGBUILD2013-12-09 18:57:47 UTC (rev 201370)
+++ PKGBUILD2013-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.bux...@gmail.com
+Date: Sun, 13 Oct 2013 23:41:45 +
+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