From 2a5fc7975544363023ec4ce212cf953a25797f1a3516dc5a19843518a5f374c1 Mon Sep 17 00:00:00 2001 From: andrea florio Date: Sun, 17 Aug 2014 17:51:26 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=60 --- lxterminal-0.1.8_fix_ctrl_c_break.patch | 192 ++++++++++++++++++++++++ lxterminal.spec | 4 +- 2 files changed, 194 insertions(+), 2 deletions(-) create mode 100644 lxterminal-0.1.8_fix_ctrl_c_break.patch diff --git a/lxterminal-0.1.8_fix_ctrl_c_break.patch b/lxterminal-0.1.8_fix_ctrl_c_break.patch new file mode 100644 index 0000000..aab6cc3 --- /dev/null +++ b/lxterminal-0.1.8_fix_ctrl_c_break.patch @@ -0,0 +1,192 @@ +From ac4f84c88ab6526d78efa2b9639cca614a67bc3a Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Yao=20Wei=20(=E9=AD=8F=E9=8A=98=E5=BB=B7)?= +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 @@ + /* Menu and accelerator event handlers. */ + static void terminal_initialize_switch_tab_accelerator(Term * term); + static void terminal_update_alt(LXTerminal *terminal); +-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 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 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. */ +@@ -349,11 +348,14 @@ + + /* Handler for accelerator 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. +@@ -366,9 +368,10 @@ + } + + /* Handler for accelerator 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. +@@ -427,9 +430,10 @@ + } + + /* Handler for accelerator 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. +@@ -441,9 +445,10 @@ + } + + /* Handler for accelerator 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. +@@ -455,9 +460,10 @@ + } + + /* Handler for accelerator 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. +@@ -469,9 +475,10 @@ + } + + /* Handler for accelerator 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. */ +@@ -550,9 +557,10 @@ + } + + /* Handler for accelerator 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. +@@ -567,10 +575,11 @@ + } + + /* Handler for accelerator . 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. +@@ -585,10 +594,11 @@ + } + + /* Handler for accelerator . 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. */ +@@ -626,9 +636,10 @@ + } + + /* Handler for accelerator . 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. +@@ -639,9 +650,10 @@ + } + + /* Handler for accelerator . 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. */ diff --git a/lxterminal.spec b/lxterminal.spec index 21171ae..df4c472 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -20,10 +20,10 @@ Name: lxterminal Version: 0.1.11 -Release: 1 +Release: 11 Summary: Lightweight LXDE Terminal Group: System/GUI/LXDE -License: GPLv2 +License: GPL-2.0 Url: http://www.lxde.org/ Source0: %name-%version.tar.bz2 # PATCH-FEATURE-OPENSUSE lxterminal-0.1.8-disable-f10.patch andrea@opensuse.org From b03b5e15af92ce23f020c863cd336465d527b37f24788c3224db63d5ed6ca3ca Mon Sep 17 00:00:00 2001 From: andrea florio Date: Sun, 17 Aug 2014 17:51:52 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=61 --- lxterminal.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lxterminal.spec b/lxterminal.spec index df4c472..6ac1e14 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -29,6 +29,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel @@ -49,6 +50,7 @@ of the LXDE project. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure --enable-man From 55fcb9dccea18ce7f6649bb4ef0f85c96c18a6356ea7e683d1a9e3e98e91cc89 Mon Sep 17 00:00:00 2001 From: andrea florio Date: Sun, 17 Aug 2014 18:53:03 +0000 Subject: [PATCH 3/3] - added lxterminal-0.1.11_fix_ctrl_c_break.patch to fix bnc#891851 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=62 --- ...> lxterminal-0.1.11_fix_ctrl_c_break.patch | 45 ++++++++----------- lxterminal.changes | 5 +++ lxterminal.spec | 20 +++++---- 3 files changed, 35 insertions(+), 35 deletions(-) rename lxterminal-0.1.8_fix_ctrl_c_break.patch => lxterminal-0.1.11_fix_ctrl_c_break.patch (89%) diff --git a/lxterminal-0.1.8_fix_ctrl_c_break.patch b/lxterminal-0.1.11_fix_ctrl_c_break.patch similarity index 89% rename from lxterminal-0.1.8_fix_ctrl_c_break.patch rename to lxterminal-0.1.11_fix_ctrl_c_break.patch index aab6cc3..f531638 100644 --- a/lxterminal-0.1.8_fix_ctrl_c_break.patch +++ b/lxterminal-0.1.11_fix_ctrl_c_break.patch @@ -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)?= -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 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 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 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 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 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 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 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 . 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 . 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 . 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 . Move the tab one position in the forward direction. */ diff --git a/lxterminal.changes b/lxterminal.changes index d1810ea..5de08db 100644 --- a/lxterminal.changes +++ b/lxterminal.changes @@ -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 diff --git a/lxterminal.spec b/lxterminal.spec index 6ac1e14..d31c2fb 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -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