[arch-commits] Commit in xfce4-terminal/repos/extra-x86_64 (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Mar 15 14:38:51 UTC 2018
Date: Thursday, March 15, 2018 @ 14:38:51
Author: foutrelis
Revision: 319303
archrelease: copy trunk to extra-x86_64
Added:
xfce4-terminal/repos/extra-x86_64/PKGBUILD
(from rev 319302, xfce4-terminal/trunk/PKGBUILD)
xfce4-terminal/repos/extra-x86_64/fix-handling-of-tabs-reordering.patch
(from rev 319302, xfce4-terminal/trunk/fix-handling-of-tabs-reordering.patch)
xfce4-terminal/repos/extra-x86_64/update-window-actions-and-active-tab-indication.patch
(from rev 319302, xfce4-terminal/trunk/update-window-actions-and-active-tab-indication.patch)
Deleted:
xfce4-terminal/repos/extra-x86_64/PKGBUILD
-------------------------------------------------------+
PKGBUILD | 90 +++++++++-------
fix-handling-of-tabs-reordering.patch | 30 +++++
update-window-actions-and-active-tab-indication.patch | 42 +++++++
3 files changed, 123 insertions(+), 39 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-15 14:38:41 UTC (rev 319302)
+++ PKGBUILD 2018-03-15 14:38:51 UTC (rev 319303)
@@ -1,39 +0,0 @@
-# $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.8.7.1
-pkgrel=1
-pkgdesc="A modern terminal emulator primarily for the Xfce desktop environment"
-arch=('x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'vte3' 'hicolor-icon-theme')
-makedepends=('intltool')
-conflicts=('terminal')
-replaces=('terminal')
-source=(https://archive.xfce.org/src/apps/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('9ff21627e8d2a105e7133efc3e8eeeda376a2071fac737e37cf47a539a7b4351')
-
-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/extra-x86_64/PKGBUILD (from rev 319302, xfce4-terminal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-03-15 14:38:51 UTC (rev 319303)
@@ -0,0 +1,51 @@
+# $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.8.7.1
+pkgrel=2
+pkgdesc="A modern terminal emulator primarily for the Xfce desktop environment"
+arch=('x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'vte3' 'hicolor-icon-theme')
+makedepends=('intltool')
+conflicts=('terminal')
+replaces=('terminal')
+source=(https://archive.xfce.org/src/apps/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
+ fix-handling-of-tabs-reordering.patch
+ update-window-actions-and-active-tab-indication.patch)
+sha256sums=('9ff21627e8d2a105e7133efc3e8eeeda376a2071fac737e37cf47a539a7b4351'
+ '55d4204089e1da7f31e2ccf4180d4a002b35546f23311e2dfab89af93817c3a5'
+ '061334ea4a02e53e58719b88b295930fa117291e0dd5c1c55be7c9b89130f6e5')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=14278
+ patch -Np1 -i ../fix-handling-of-tabs-reordering.patch
+ patch -Np1 -i ../update-window-actions-and-active-tab-indication.patch
+}
+
+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/extra-x86_64/fix-handling-of-tabs-reordering.patch (from rev 319302, xfce4-terminal/trunk/fix-handling-of-tabs-reordering.patch)
===================================================================
--- fix-handling-of-tabs-reordering.patch (rev 0)
+++ fix-handling-of-tabs-reordering.patch 2018-03-15 14:38:51 UTC (rev 319303)
@@ -0,0 +1,30 @@
+From 61d9d0d58d53214bdedd2220fb3522c5440a6231 Mon Sep 17 00:00:00 2001
+From: Igor <f2404 at yandex.ru>
+Date: Thu, 15 Mar 2018 09:04:04 -0400
+Subject: Fix handling of tabs reordering
+
+Fix bug #14278
+---
+ terminal/terminal-window.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
+index eca35ba..68daa03 100644
+--- a/terminal/terminal-window.c
++++ b/terminal/terminal-window.c
+@@ -1105,10 +1105,8 @@ terminal_window_notebook_page_reordered (GtkNotebook *notebook,
+ guint page_num,
+ TerminalWindow *window)
+ {
+-
+- /* update actions in the window */
+- terminal_window_update_actions (window);
+-
++ /* Regenerate the "Go" menu */
++ terminal_window_rebuild_tabs_menu (window);
+ }
+
+
+--
+cgit v1.1
+
Copied: xfce4-terminal/repos/extra-x86_64/update-window-actions-and-active-tab-indication.patch (from rev 319302, xfce4-terminal/trunk/update-window-actions-and-active-tab-indication.patch)
===================================================================
--- update-window-actions-and-active-tab-indication.patch (rev 0)
+++ update-window-actions-and-active-tab-indication.patch 2018-03-15 14:38:51 UTC (rev 319303)
@@ -0,0 +1,42 @@
+From 9cfd52b8b5bd1321e2b6f497a41914c5bd06ded4 Mon Sep 17 00:00:00 2001
+From: Igor <f2404 at yandex.ru>
+Date: Thu, 15 Mar 2018 10:23:26 -0400
+Subject: Update window actions and active tab indication on reordering tabs
+
+See bug #14278
+---
+ terminal/terminal-window.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
+index 68daa03..9f30716 100644
+--- a/terminal/terminal-window.c
++++ b/terminal/terminal-window.c
+@@ -1062,12 +1062,9 @@ terminal_window_notebook_page_switched (GtkNotebook *notebook,
+ guint page_num,
+ TerminalWindow *window)
+ {
+- TerminalScreen *active;
++ TerminalScreen *active = TERMINAL_SCREEN (page);
+ const gchar *encoding;
+
+- /* get the new active page */
+- active = TERMINAL_SCREEN (page);
+-
+ terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
+ terminal_return_if_fail (active == NULL || TERMINAL_IS_SCREEN (active));
+
+@@ -1105,8 +1102,9 @@ terminal_window_notebook_page_reordered (GtkNotebook *notebook,
+ guint page_num,
+ TerminalWindow *window)
+ {
+- /* Regenerate the "Go" menu */
++ /* Regenerate the "Go" menu and update actions */
+ terminal_window_rebuild_tabs_menu (window);
++ terminal_window_update_actions (window);
+ }
+
+
+--
+cgit v1.1
+
More information about the arch-commits
mailing list