From 244e4bb4344d2da82ab17505143319345ef64a17551142724b1dd0b0a4395f05 Mon Sep 17 00:00:00 2001 From: andrea florio Date: Wed, 21 Jul 2010 10:08:34 +0000 Subject: [PATCH 1/3] - added lxterminal-0.1.8-hide_menu_bar-sf3032519.patch to fix bug sf#3032519 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=30 --- ...rminal-0.1.8-hide_menu_bar-sf3032519.patch | 20 +++++++++++++++++++ lxterminal.changes | 6 ++++++ lxterminal.spec | 5 +++++ 3 files changed, 31 insertions(+) create mode 100644 lxterminal-0.1.8-hide_menu_bar-sf3032519.patch diff --git a/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch b/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch new file mode 100644 index 0000000..7580d9d --- /dev/null +++ b/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch @@ -0,0 +1,20 @@ +diff --git a/src/lxterminal.c b/src/lxterminal.c +index dc63796..a263150 100644 +--- a/src/lxterminal.c ++++ b/src/lxterminal.c +@@ -1244,12 +1244,12 @@ LXTerminal * lxterminal_initialize(LXTermWindow * lxtermwin, CommandArguments * + /* Initialize accelerators. */ + terminal_accelerator_initialize(terminal); + +- /* Update terminal settings. */ +- terminal_settings_apply(terminal); +- + /* Show the widget, so it is realized and has a window. */ + gtk_widget_show_all(terminal->window); + ++ /* Update terminal settings. */ ++ terminal_settings_apply(terminal); ++ + /* Initialize the geometry hints. */ + gdk_window_get_geometry_hints(GTK_WIDGET(term->vte)->window, &terminal->geometry, &terminal->geometry_mask); + diff --git a/lxterminal.changes b/lxterminal.changes index 541c097..66d7753 100644 --- a/lxterminal.changes +++ b/lxterminal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 21 10:07:47 UTC 2010 - andrea@opensuse.org + +- added lxterminal-0.1.8-hide_menu_bar-sf3032519.patch to fix + bug sf#3032519 + ------------------------------------------------------------------- Tue Jul 20 07:42:08 UTC 2010 - andrea@opensuse.org diff --git a/lxterminal.spec b/lxterminal.spec index 75fa79a..4865be1 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -32,6 +32,10 @@ Patch0: %name-0.1.8-disable-f10.patch # PATCH-FIX-UPSTREAM lxterminal-0.1.8-fix-alt_n-sf3006779.patch andrea@opensuse.org # upstream patch to fix sf#3006779 (enable/disable Alt+n) Patch1: %name-0.1.8-fix-alt_n-sf3006779.patch.bz2 +# PATCH-FIX-UPSTREAM lxterminal-0.1.8-hide_menu_bar-sf3032519.patch andrea@opensuse.org +# upstream patch to fix sf#3032519 if toggle on hide menu bar in preference, then exit +# and restart lxterminal, lxterminal will not hide menu bar, This patch fix this problem +Patch2: %name-0.1.8-hide_menu_bar-sf3032519.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel vte-devel @@ -48,6 +52,7 @@ of the LXDE project %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" From 1e75eadb2afa139de4d618d7cf442a1cbcdc3cc6ca2f56ab9fd58198a059a9f5 Mon Sep 17 00:00:00 2001 From: andrea florio Date: Thu, 29 Jul 2010 08:44:01 +0000 Subject: [PATCH 2/3] - added lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch to fix bug sf#3036189 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=31 --- ...l-0.1.8-fix_alt-key_after_tab_delete.patch | 25 +++++++++++++++++++ lxterminal.changes | 6 +++++ lxterminal.spec | 4 +++ 3 files changed, 35 insertions(+) create mode 100644 lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch diff --git a/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch b/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch new file mode 100644 index 0000000..e2f63be --- /dev/null +++ b/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch @@ -0,0 +1,25 @@ +From 86fbd89e295dfd7dfdc3a4ac838e3aca524dd02c Mon Sep 17 00:00:00 2001 +From: Marty Jack +Date: Wed, 28 Jul 2010 17:30:47 -0400 +Subject: [PATCH] Fix Alt-key assignment after tab deleted (Bug3036189; Patch3036253, Ideal Shang) + +--- + src/lxterminal.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/src/lxterminal.c b/src/lxterminal.c +index a263150..9f89bb4 100644 +--- a/src/lxterminal.c ++++ b/src/lxterminal.c +@@ -737,6 +737,9 @@ static void terminal_child_exited_event(VteTerminal * vte, Term * term) + { + Term * t = g_ptr_array_index(terminal->terms, i); + t->index -= 1; ++ if ((GTK_IS_ACCEL_GROUP(t->parent->accel_group)) && (t->closure != NULL)) ++ gtk_accel_group_disconnect(t->parent->accel_group, t->closure); ++ terminal_set_disable_alt(t, t->parent->setting->disable_alt); + } + + /* Delete the tab and free the Term structure. */ +-- +1.6.3 \ No newline at end of file diff --git a/lxterminal.changes b/lxterminal.changes index 66d7753..5e0ac6c 100644 --- a/lxterminal.changes +++ b/lxterminal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 29 08:30:55 UTC 2010 - andrea@opensuse.org + +- added lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch to + fix bug sf#3036189 + ------------------------------------------------------------------- Wed Jul 21 10:07:47 UTC 2010 - andrea@opensuse.org diff --git a/lxterminal.spec b/lxterminal.spec index 4865be1..56d6694 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -36,6 +36,9 @@ Patch1: %name-0.1.8-fix-alt_n-sf3006779.patch.bz2 # upstream patch to fix sf#3032519 if toggle on hide menu bar in preference, then exit # and restart lxterminal, lxterminal will not hide menu bar, This patch fix this problem Patch2: %name-0.1.8-hide_menu_bar-sf3032519.patch +# PATCH-FIX-UPSTREAM lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch andrea@opensuse.org +# upstream patch to fix sf#3036189 Fix Alt-key assignment after tab deleted +Patch3: %name-0.1.8-fix_alt-key_after_tab_delete.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel vte-devel @@ -53,6 +56,7 @@ of the LXDE project %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" From 1086e74260db990079e84f48496fb8d878bcf3bce2ae66e33894c4cabff86e21 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 2 Aug 2010 08:34:01 +0000 Subject: [PATCH 3/3] Accepting request 44164 from X11:lxde checked in (request 44164) OBS-URL: https://build.opensuse.org/request/show/44164 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=32 --- lxterminal.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lxterminal.spec b/lxterminal.spec index 56d6694..9078d87 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -20,7 +20,7 @@ Name: lxterminal Version: 0.1.8 -Release: 1 +Release: 2 Summary: Lightweight LXDE Terminal Group: System/GUI/LXDE License: GPL @@ -35,10 +35,10 @@ Patch1: %name-0.1.8-fix-alt_n-sf3006779.patch.bz2 # PATCH-FIX-UPSTREAM lxterminal-0.1.8-hide_menu_bar-sf3032519.patch andrea@opensuse.org # upstream patch to fix sf#3032519 if toggle on hide menu bar in preference, then exit # and restart lxterminal, lxterminal will not hide menu bar, This patch fix this problem -Patch2: %name-0.1.8-hide_menu_bar-sf3032519.patch +Patch2: %name-0.1.8-hide_menu_bar-sf3032519.patch # PATCH-FIX-UPSTREAM lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch andrea@opensuse.org # upstream patch to fix sf#3036189 Fix Alt-key assignment after tab deleted -Patch3: %name-0.1.8-fix_alt-key_after_tab_delete.patch +Patch3: %name-0.1.8-fix_alt-key_after_tab_delete.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel vte-devel