diff --git a/lxterminal-0.1.11.tar.bz2 b/lxterminal-0.1.11.tar.bz2 new file mode 100644 index 0000000..e670b52 --- /dev/null +++ b/lxterminal-0.1.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3efe7d1dddb81cf3221125cdd3814f9f841da8108b58ef189be61421786e1af +size 243851 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 04b1910..9404614 100644 --- a/lxterminal.changes +++ b/lxterminal.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Jul 29 09:08:52 UTC 2011 - andrea@opensuse.org + +- upstream bugfix release 0.1.11 +- removed lxterminal-0.1.10-fix-rgba-composite.patch and + lxterminal-0.1.10-fix-desyncronization.patch now in + upstream code + +------------------------------------------------------------------- +Tue Jul 26 10:33:11 UTC 2011 - andrea@opensuse.org + +- added lxterminal-0.1.10-fix-rgba-composite.patch + and lxterminal-0.1.10-fix-desyncronization.patch + to fix upstream bugs 3372388 and 3376800 + +------------------------------------------------------------------- +Sun Jul 24 12:14:57 UTC 2011 - andrea@opensuse.org + +- new upstream version 0.1.10 + * translations update + * gtk3 support + * bug fixes +- removed patches now in upsteam code + ------------------------------------------------------------------- Tue May 31 10:01:36 UTC 2011 - andrea@opensuse.org diff --git a/lxterminal.spec b/lxterminal.spec index 0d3b7a9..9c30faf 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -19,23 +19,19 @@ Name: lxterminal -Version: 0.1.9 +Version: 0.1.11 Release: 9 Summary: Lightweight LXDE Terminal Group: System/GUI/LXDE -License: GPL +License: GPLv2 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 -# 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel -# lxterminal is not yet compatible with gtk3 %if %suse_version <= 1140 BuildRequires: vte-devel %else @@ -53,17 +49,13 @@ of the LXDE project %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" %configure --enable-man -%__make %{?jobs:-j%jobs} +%__make %{?jobs:-j%jobs} V=1 %install %makeinstall -# remove not available languages -%__rm -rf %buildroot/%_datadir/locale/{frp,es_VE,ur_PK} %suse_update_desktop_file %name System %find_lang %{name} %fdupes -s %{buildroot}