pool/lxterminal
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added lxterminal-0.1.11_fix_ctrl_c_break.patch to fix bnc#891851

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=62
This commit is contained in:
andrea florio 2014-08-17 18:53:03 +00:00 committed by Git OBS Bridge
parent b03b5e15af
commit 55fcb9dcce
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lxterminal-0.1.8_fix_ctrl_c_break.patch → lxterminal-0.1.11_fix_ctrl_c_break.patch
View File

@ -1,20 +1,10 @@
From ac4f84c88ab6526d78efa2b9639cca614a67bc3a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Yao=20Wei=20(=E9=AD=8F=E9=8A=98=E5=BB=B7)?= <mwei@lxde.org>
Date: Thu, 16 Aug 2012 15:33:39 +0800
Subject: [PATCH] fix passing ctrl-c when pressing ctrl-shift-c. drop dirty hack.
---
src/lxterminal.c | 107 ++++++++++++++++++------------------------------------
1 files changed, 36 insertions(+), 71 deletions(-)
Index: lxterminal-0.1.11/src/lxterminal.c
===================================================================
--- lxterminal-0.1.11.orig/src/lxterminal.c 2012-10-30 09:50:01.811232668 +0100
+++ lxterminal-0.1.11/src/lxterminal.c 2012-10-31 16:12:37.094372192 +0100
@@ -69,29 +69,28 @@
diff -uNr lxterminal-0.1.11/src/lxterminal.c lxterminal-0.1.11-new/src/lxterminal.c
--- lxterminal-0.1.11/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200
+++ lxterminal-0.1.11-new/src/lxterminal.c 2014-08-17 20:49:58.543192398 +0200
@@ -69,29 +69,29 @@
/* Menu and accelerator event handlers. */
static void terminal_initialize_switch_tab_accelerator(Term * term);
static void terminal_update_alt(LXTerminal *terminal);
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);
@ -22,9 +12,10 @@ Index: lxterminal-0.1.11/src/lxterminal.c
+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_new_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);
@ -51,7 +42,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
static void terminal_about_activate_event(GtkAction * action, LXTerminal * terminal);
/* Window creation, destruction, and control. */
@@ -349,11 +348,14 @@
@@ -327,11 +327,14 @@
/* Handler for accelerator <ALT> n, where n is a digit.
* Switch to the tab selected by the digit, if it exists. */
@ -68,7 +59,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
}
/* Handler for "activate" signal on File/New Window menu item.
@@ -366,9 +368,10 @@
@@ -344,9 +347,10 @@
}
/* Handler for accelerator <SHIFT><CTRL> N. Open a new window. */
@ -80,7 +71,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
}
/* Handler for "activate" signal on File/New Tab menu item.
@@ -427,9 +430,10 @@
@@ -405,9 +409,10 @@
}
/* Handler for accelerator <SHIFT><CTRL> T. Open a new tab. */
@ -92,7 +83,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
}
/* Handler for "activate" signal on File/Close Tab menu item.
@@ -441,9 +445,10 @@
@@ -419,9 +424,10 @@
}
/* Handler for accelerator <SHIFT><CTRL> W. Close the current tab. */
@ -104,7 +95,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
}
/* Handler for "activate" signal on Edit/Copy menu item.
@@ -455,9 +460,10 @@
@@ -433,9 +439,10 @@
}
/* Handler for accelerator <CTRL><SHIFT> C. Copy to the clipboard. */
@ -116,7 +107,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
}
/* Handler for "activate" signal on Edit/Paste menu item.
@@ -469,9 +475,10 @@
@@ -447,9 +454,10 @@
}
/* Handler for accelerator <CTRL><SHIFT> V. Paste from the clipboard. */
@ -128,7 +119,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
}
/* Handler for "response" signal on Name Tab dialog. */
@@ -550,9 +557,10 @@
@@ -521,9 +529,10 @@
}
/* Handler for accelerator <CTRL><SHIFT> R. Name the tab. */
@ -140,7 +131,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
}
/* Handler for "activate" signal on Tabs/Previous Tab menu item.
@@ -567,10 +575,11 @@
@@ -538,10 +547,11 @@
}
/* Handler for accelerator <CTRL><PAGE UP>. Cycle through tabs in the reverse direction. */
@ -153,7 +144,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
}
/* Handler for "activate" signal on Tabs/Next Tab menu item.
@@ -585,10 +594,11 @@
@@ -556,10 +566,11 @@
}
/* Handler for accelerator <CTRL><PAGE DOWN>. Cycle through tabs in the forward direction. */
@ -166,7 +157,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
}
/* Helper for move tab left and right. */
@@ -626,9 +636,10 @@
@@ -594,9 +605,10 @@
}
/* Handler for accelerator <SHIFT><CTRL><PAGE UP>. Move the tab one position in the reverse direction. */
@ -178,7 +169,7 @@ Index: lxterminal-0.1.11/src/lxterminal.c
}
/* Handler for "activate" signal on Tabs/Move Tab Right menu item.
@@ -639,9 +650,10 @@
@@ -607,9 +619,10 @@
}
/* Handler for accelerator <SHIFT><CTRL><PAGE DOWN>. Move the tab one position in the forward direction. */

5
lxterminal.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Aug 17 18:51:29 UTC 2014 - andrea@opensuse.org
- added lxterminal-0.1.11_fix_ctrl_c_break.patch to fix bnc#891851
-------------------------------------------------------------------
Thu Sep 22 08:30:41 UTC 2011 - andrea.turrini@gmail.com

20
lxterminal.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package lxterminal
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,24 +15,28 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: lxterminal
Version: 0.1.11
Release: 11
Release: 0
Summary: Lightweight LXDE Terminal
Group: System/GUI/LXDE
License: GPL-2.0
Group: System/GUI/LXDE
Url: http://www.lxde.org/
Source0: %name-%version.tar.bz2
# PATCH-FEATURE-OPENSUSE lxterminal-0.1.8-disable-f10.patch andrea@opensuse.org
# disable f10 shortcut because yast use it
Patch0: %name-0.1.8-disable-f10.patch
Patch1: %name-0.1.8_fix_ctrl_c_break.patch
Patch1: %name-0.1.11_fix_ctrl_c_break.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files
BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel
BuildRequires: docbook-utils
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: libxslt-devel
BuildRequires: pkg-config
BuildRequires: update-desktop-files
%if %suse_version <= 1140
BuildRequires: vte-devel
%else