diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-14 00:07:43 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-14 00:07:43 -0300 |
commit | 6d90f2496f41209ab84d8b61d20b4d79d632ec7d (patch) | |
tree | 91a141bc21b17ccd6187b5c6a8b9f53367d9c93e /extra/terminal | |
parent | 26841be26f283b971f431eb735f748cef7a5250d (diff) | |
parent | 2c4629f613c001fd29740d0f4c0e497c771a2182 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/frogatto/PKGBUILD
community/python-psycopg2/PKGBUILD
core/libtirpc/PKGBUILD
extra/cd-discid/PKGBUILD
extra/cups/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnugo/PKGBUILD
extra/gperf/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdegames/PKGBUILD
extra/kismet/PKGBUILD
extra/lzo/PKGBUILD
extra/mutt/PKGBUILD
extra/obconf/PKGBUILD
extra/opensp/PKGBUILD
extra/qt3/PKGBUILD
extra/re2c/PKGBUILD
extra/samba/PKGBUILD
extra/sharutils/PKGBUILD
extra/wireshark/PKGBUILD
Diffstat (limited to 'extra/terminal')
-rw-r--r-- | extra/terminal/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch | 22 |
2 files changed, 33 insertions, 4 deletions
diff --git a/extra/terminal/PKGBUILD b/extra/terminal/PKGBUILD index 4a96ed776..29b1f2aac 100644 --- a/extra/terminal/PKGBUILD +++ b/extra/terminal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 118239 2011-04-06 07:52:59Z andyrtr $ +# $Id: PKGBUILD 123714 2011-05-12 17:42:28Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=terminal pkgver=0.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" arch=(i686 x86_64 'mips64el') license=('GPL2') @@ -16,11 +16,18 @@ depends=('exo>=0.5.4' "vte" 'dbus-glib' makedepends=('pkgconfig' 'intltool') options=('!libtool') install=terminal.install -source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2) -md5sums=('34daa0090e1bc9014a5b9849103a129f') +source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2 + bug-7595-go-menu-single-tab-sensitivity.patch) +md5sums=('34daa0090e1bc9014a5b9849103a129f' + '043774c11e2f8c1c424510847dc82fae') build() { cd ${srcdir}/Terminal-${pkgver} + + # Add upstream patch for Xfce bug #7595 + # (Only make go menu action sensitive if tabs) + patch -Np1 -i ${srcdir}/bug-7595-go-menu-single-tab-sensitivity.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ diff --git a/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch b/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch new file mode 100644 index 000000000..9d8eff6bd --- /dev/null +++ b/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch @@ -0,0 +1,22 @@ +From be9fca9ea8cedcf879c8e0c8cea96dd256a3591c Mon Sep 17 00:00:00 2001 +From: Nick Schermer <nick@xfce.org> +Date: Thu, 12 May 2011 16:08:20 +0000 +Subject: Only make go menu action sensitive if tabs > 1 (bug #7595). + +This way the (default) Alt+1 keybinding is usable when +only a single tab is opened in the terminal window. +--- +diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c +index f580a39..0d461a4 100644 +--- a/terminal/terminal-window.c ++++ b/terminal/terminal-window.c +@@ -748,6 +748,7 @@ terminal_window_rebuild_gomenu (TerminalWindow *window) + + /* create action */ + radio_action = gtk_radio_action_new (name, NULL, NULL, NULL, n); ++ gtk_action_set_sensitive (GTK_ACTION (radio_action), npages > 1); + exo_binding_new (G_OBJECT (page), "title", G_OBJECT (radio_action), "label"); + gtk_radio_action_set_group (radio_action, group); + group = gtk_radio_action_get_group (radio_action); +-- +cgit |