From 5172419613e05a465ae638433f8f7f078565180d52c42307538d21be440a1c60 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 13 Sep 2010 10:20:04 +0000 Subject: [PATCH] Accepting request 47395 from X11:lxde checked in (request 47395) OBS-URL: https://build.opensuse.org/request/show/47395 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=49 --- ...rminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 | 3 + ...l-0.1.8-fix_alt-key_after_tab_delete.patch | 25 +++++++ ...rminal-0.1.8-hide_menu_bar-sf3032519.patch | 20 ++++++ lxterminal-0.1.8.tar.bz2 | 3 + lxterminal-0.1.9-fix-char_widthheight.patch | 72 ------------------- lxterminal-0.1.9.tar.bz2 | 3 - lxterminal.changes | 16 ----- lxterminal.spec | 20 ++++-- 8 files changed, 66 insertions(+), 96 deletions(-) create mode 100644 lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 create mode 100644 lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch create mode 100644 lxterminal-0.1.8-hide_menu_bar-sf3032519.patch create mode 100644 lxterminal-0.1.8.tar.bz2 delete mode 100644 lxterminal-0.1.9-fix-char_widthheight.patch delete mode 100644 lxterminal-0.1.9.tar.bz2 diff --git a/lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 b/lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 new file mode 100644 index 0000000..c8389f3 --- /dev/null +++ b/lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12ab9db3af00dea0a56b65702eda672f9e5ea60c54c4beed501c967c3f84d8a1 +size 34507 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-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-0.1.8.tar.bz2 b/lxterminal-0.1.8.tar.bz2 new file mode 100644 index 0000000..1001966 --- /dev/null +++ b/lxterminal-0.1.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86c87bcd275f5d6d59f6e1be3781e26e943693097fa3df694effe596ba7cb901 +size 226335 diff --git a/lxterminal-0.1.9-fix-char_widthheight.patch b/lxterminal-0.1.9-fix-char_widthheight.patch deleted file mode 100644 index 282d3ca..0000000 --- a/lxterminal-0.1.9-fix-char_widthheight.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 2cda6d2217f82cc993f4758ed44ef74c61f729ba Mon Sep 17 00:00:00 2001 -From: Andrea Florio -Date: Thu, 2 Sep 2010 19:34:52 +0200 -Subject: [PATCH] fixed vte failure because of deprecated API - ---- - configure.ac | 2 +- - src/lxterminal.c | 14 +++++++------- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7458f21..bf0612e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_ARG_ENABLE(man, - # Checks for libraries. - PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.6.0]) - PKG_CHECK_MODULES(gtk, [gtk+-2.0 >= 2.12.0]) --PKG_CHECK_MODULES(vte, [vte >= 0.17.1]) -+PKG_CHECK_MODULES(vte, [vte >= 0.20.0]) - CFLAGS="$CFLAGS $glib_CFLAGS $gtk_CFLAGS $vte_CFLAGS" - LIBS="$LIBS $glib_LIBS $gtk_LIBS $vte_LIBS" - -diff --git a/src/lxterminal.c b/src/lxterminal.c -index dcae22a..da232b1 100644 ---- a/src/lxterminal.c -+++ b/src/lxterminal.c -@@ -259,8 +259,8 @@ static void terminal_geometry_restore(Term * term) - vte_terminal_get_column_count(VTE_TERMINAL(term->vte)), - vte_terminal_get_row_count(VTE_TERMINAL(term->vte))); - gtk_window_resize(GTK_WINDOW(term->parent->window), -- border->left + VTE_TERMINAL(term->vte)->char_width, -- border->top + VTE_TERMINAL(term->vte)->char_height); -+ border->left + vte_terminal_get_char_width(VTE_TERMINAL(term->vte)), -+ border->top + vte_terminal_get_char_height(VTE_TERMINAL(term->vte))); - gtk_border_free(border); - } - -@@ -632,8 +632,8 @@ static gboolean terminal_window_size_request_event(GtkWidget * widget, GtkRequis - Term * term = g_ptr_array_index(terminal->terms, 0); - GtkBorder * border = terminal_get_border(term); - GdkGeometry hints; -- hints.width_inc = VTE_TERMINAL(term->vte)->char_width; -- hints.height_inc = VTE_TERMINAL(term->vte)->char_height; -+ hints.width_inc = vte_terminal_get_char_width(VTE_TERMINAL(term->vte)); -+ hints.height_inc = vte_terminal_get_char_height(VTE_TERMINAL(term->vte)); - hints.base_width = border->left; - hints.base_height = border->top; - hints.min_width = hints.base_width + hints.width_inc * 4; -@@ -803,8 +803,8 @@ static gboolean terminal_vte_button_press_event(VteTerminal * vte, GdkEventButto - GtkBorder * border = terminal_get_border(term); - gint tag; - gchar * match = vte_terminal_match_check(vte, -- (event->x - border->left) / vte->char_width, -- (event->y - border->top) / vte->char_height, -+ (event->x - border->left) / vte_terminal_get_char_width(vte), -+ (event->y - border->top) / vte_terminal_get_char_height(vte), - &tag); - gtk_border_free(border); - -@@ -929,7 +929,7 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch - gtk_widget_show_all(term->tab); - - /* Set up scrollbar. */ -- gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), VTE_TERMINAL(term->vte)->adjustment); -+ gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), vte_terminal_get_adjustment(VTE_TERMINAL(term->vte))); - - /* Fork the process that will have the VTE as its controlling terminal. */ - if (exec != NULL) --- -1.6.3 - diff --git a/lxterminal-0.1.9.tar.bz2 b/lxterminal-0.1.9.tar.bz2 deleted file mode 100644 index 2edcce2..0000000 --- a/lxterminal-0.1.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12d158019a4144361f87df6334bc7c48e4337db5f2f870e9d4ceafe2618faa53 -size 227802 diff --git a/lxterminal.changes b/lxterminal.changes index 9e24143..5e0ac6c 100644 --- a/lxterminal.changes +++ b/lxterminal.changes @@ -1,19 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 2 17:42:41 UTC 2010 - andrea@opensuse.org - -- added lxterminal-0.1.9-fix-char_widthheight.patch to fix - failure cause of vte deprecated API (thanks BManojlovic) - -------------------------------------------------------------------- -Wed Sep 01 21:10:55 UTC 2010 - andrea@opensuse.org - -- new upstream version 0.1.9 - - fixed mistake in preferences file write sf#3056693 - - translations updates - - fix next/prev tab key shortcuts leave garbage characters - in window problem sf#3036190 -- removed patches that taken from upstream git code - ------------------------------------------------------------------- Thu Jul 29 08:30:55 UTC 2010 - andrea@opensuse.org diff --git a/lxterminal.spec b/lxterminal.spec index 7fbead6..9078d87 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -1,5 +1,5 @@ # -# spec file for package lxterminal (Version 0.1.9) +# spec file for package lxterminal (Version 0.1.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: lxterminal -Version: 0.1.9 +Version: 0.1.8 Release: 2 Summary: Lightweight LXDE Terminal Group: System/GUI/LXDE @@ -29,9 +29,16 @@ 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 -# PATCH-FEATURE-UPSTREAM lxterminal-0.1.9-fix-char_widthheight.patch andrea@opensuse.org -# fixed failure because of vte deprecated API -Patch1: %name-0.1.9-fix-char_widthheight.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 +# 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 @@ -48,9 +55,12 @@ of the LXDE project %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" %configure --enable-man %__make %{?jobs:-j%jobs}