[arch-commits] Commit in lxterminal/trunk (3 files)

Balló György bgyorgy at archlinux.org
Wed Oct 22 22:21:49 UTC 2014


    Date: Thursday, October 23, 2014 @ 00:21:49
  Author: bgyorgy
Revision: 121257

upgpkg: lxterminal 0.2.0-1

Update to version 0.2.0

Added:
  lxterminal/trunk/lxterminal.install
Modified:
  lxterminal/trunk/PKGBUILD
Deleted:
  lxterminal/trunk/fix-keybinds.patch

--------------------+
 PKGBUILD           |   19 +----
 fix-keybinds.patch |  183 ---------------------------------------------------
 lxterminal.install |   11 +++
 3 files changed, 16 insertions(+), 197 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-22 22:20:54 UTC (rev 121256)
+++ PKGBUILD	2014-10-22 22:21:49 UTC (rev 121257)
@@ -5,8 +5,8 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
 
 pkgname=lxterminal
-pkgver=0.1.11
-pkgrel=3
+pkgver=0.2.0
+pkgrel=1
 pkgdesc="VTE-based terminal emulator (part of LXDE)"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,18 +14,10 @@
 groups=('lxde')
 depends=('vte')
 makedepends=('intltool')
-source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz
-        fix-keybinds.patch)
-md5sums=('fd9140b45c0f28d021253c4aeb8c4aea'
-         '1919977c8c745e65129dbe468b8dcbeb')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz)
+md5sums=('e80ad1b6e26212f3d43908c2ad87ba4d')
 
-prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  # Filter out key events of terminal keybinds
-  patch -Np1 -i ../fix-keybinds.patch
-}
-
 build() {
   cd "$srcdir"/$pkgname-$pkgver
   ./configure --sysconfdir=/etc --prefix=/usr
@@ -36,4 +28,3 @@
   cd "$srcdir"/$pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
-

Deleted: fix-keybinds.patch
===================================================================
--- fix-keybinds.patch	2014-10-22 22:20:54 UTC (rev 121256)
+++ fix-keybinds.patch	2014-10-22 22:21:49 UTC (rev 121257)
@@ -1,183 +0,0 @@
-diff -Naur lxterminal-0.1.11.orig/src/lxterminal.c lxterminal-0.1.11/src/lxterminal.c
---- lxterminal-0.1.11.orig/src/lxterminal.c	2011-07-27 23:07:54.000000000 +0200
-+++ lxterminal-0.1.11/src/lxterminal.c	2014-05-12 05:13:32.264123691 +0200
-@@ -69,29 +70,29 @@
- /* Menu and accelerator event handlers. */
- static void terminal_initialize_switch_tab_accelerator(Term * term);
- static void terminal_set_disable_alt(Term *term, gboolean disable_alt);
--static void terminal_switch_tab_accelerator(Term * term);
-+static gboolean terminal_switch_tab_accelerator(Term * term);
- static void terminal_new_window_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_new_tab_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal);
- static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_previous_tab_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_next_tab_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_move_tab_execute(LXTerminal * terminal, gint direction);
- static void terminal_move_tab_left_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_move_tab_right_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_about_activate_event(GtkAction * action, LXTerminal * terminal);
- 
- /* Window creation, destruction, and control. */
-@@ -327,11 +328,14 @@
- 
- /* Handler for accelerator <ALT> n, where n is a digit.
-  * Switch to the tab selected by the digit, if it exists. */
--static void terminal_switch_tab_accelerator(Term * term)
-+static gboolean terminal_switch_tab_accelerator(Term * term)
- {
-     LXTerminal * terminal = term->parent;
--    if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook)))
-+    if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook))) {
-         gtk_notebook_set_current_page(GTK_NOTEBOOK(terminal->notebook), term->index);
-+    	return TRUE;
-+    }
-+    return FALSE;
- }
- 
- /* Handler for "activate" signal on File/New Window menu item.
-@@ -344,9 +348,10 @@
- }
- 
- /* Handler for accelerator <SHIFT><CTRL> N.  Open a new window. */
--static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
-     terminal_new_window_activate_event(NULL, terminal);
-+    return TRUE;
- }
- 
- /* Handler for "activate" signal on File/New Tab menu item.
-@@ -405,9 +410,10 @@
- }
- 
- /* Handler for accelerator <SHIFT><CTRL> T.  Open a new tab. */
--static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
-     terminal_new_tab_activate_event(NULL, terminal);
-+    return TRUE;
- }
- 
- /* Handler for "activate" signal on File/Close Tab menu item.
-@@ -419,9 +425,10 @@
- }
- 
- /* Handler for accelerator <SHIFT><CTRL> W.  Close the current tab. */
--static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
-     terminal_close_tab_activate_event(NULL, terminal);
-+    return TRUE;
- }
- 
- /* Handler for "activate" signal on Edit/Copy menu item.
-@@ -433,9 +440,10 @@
- }
- 
- /* Handler for accelerator <CTRL><SHIFT> C.  Copy to the clipboard. */
--static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
-     terminal_copy_activate_event(NULL, terminal);
-+    return TRUE;
- }
- 
- /* Handler for "activate" signal on Edit/Paste menu item.
-@@ -447,9 +455,10 @@
- }
- 
- /* Handler for accelerator <CTRL><SHIFT> V.  Paste from the clipboard. */
--static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
-     terminal_paste_activate_event(NULL, terminal);
-+    return TRUE;
- }
- 
- /* Handler for "response" signal on Name Tab dialog. */
-@@ -521,9 +530,10 @@
- }
- 
- /* Handler for accelerator <CTRL><SHIFT> R.  Name the tab. */
--static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
-     terminal_name_tab_activate_event(NULL, terminal);
-+    return TRUE;
- }
- 
- /* Handler for "activate" signal on Tabs/Previous Tab menu item.
-@@ -538,10 +548,11 @@
- }
- 
- /* Handler for accelerator <CTRL><PAGE UP>.  Cycle through tabs in the reverse direction. */
--static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
-     GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_PreviousTab");
-     gtk_action_activate(_action);
-+    return TRUE;
- }
- 
- /* Handler for "activate" signal on Tabs/Next Tab menu item.
-@@ -556,10 +567,11 @@
- }
- 
- /* Handler for accelerator <CTRL><PAGE DOWN>.  Cycle through tabs in the forward direction. */
--static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
-     GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_NextTab");
-     gtk_action_activate(_action);
-+    return TRUE;
- }
- 
- /* Helper for move tab left and right. */
-@@ -594,9 +606,10 @@
- }
- 
- /* Handler for accelerator <SHIFT><CTRL><PAGE UP>.  Move the tab one position in the reverse direction. */
--static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
-     terminal_move_tab_execute(terminal, -1);
-+    return TRUE;
- }
- 
- /* Handler for "activate" signal on Tabs/Move Tab Right menu item.
-@@ -607,9 +620,10 @@
- }
- 
- /* Handler for accelerator <SHIFT><CTRL><PAGE DOWN>.  Move the tab one position in the forward direction. */
--static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
-     terminal_move_tab_execute(terminal, 1);
-+    return TRUE;
- }
- 
- /* Handler for "activate" signal on Help/About menu item. */ 

Added: lxterminal.install
===================================================================
--- lxterminal.install	                        (rev 0)
+++ lxterminal.install	2014-10-22 22:21:49 UTC (rev 121257)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}



More information about the arch-commits mailing list