- 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

OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=56

lxterminal-0.1.10-fix-desyncronization.patch

@@ -1,39 +0,0 @@
-From 84506b12f892c9504efbfe7d0c484ce423d3f9a5 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: Tue, 26 Jul 2011 09:28:52 +0800
-Subject: [PATCH] fix desynchonization of terminal index and notebook index (fixes #3372388)
-
----
- src/lxterminal.c |   16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git a/src/lxterminal.c b/src/lxterminal.c
-index bb1a2b2..5d4940f 100644
---- a/src/lxterminal.c
-+++ b/src/lxterminal.c
-@@ -567,6 +567,22 @@ static void terminal_move_tab_execute(LXTerminal * terminal, gint direction)
- {
-     GtkNotebook * notebook = GTK_NOTEBOOK(terminal->notebook);
-     gint current_page_number = gtk_notebook_get_current_page(notebook);
-+    gint target_page_number = current_page_number + direction;
-+
-+    /* prevent out of index */
-+    if (target_page_number < 0 || target_page_number >= terminal->terms->len)
-+    {
-+	    return;
-+    }
-+    
-+    /* swap index in terms array and its id */
-+    Term * term_current = g_ptr_array_index(terminal->terms, current_page_number);
-+    Term * term_target = g_ptr_array_index(terminal->terms, target_page_number);
-+    g_ptr_array_index(terminal->terms, target_page_number) = term_current;
-+    g_ptr_array_index(terminal->terms, current_page_number) = term_target;
-+    term_current->index = target_page_number;
-+    term_target->index = current_page_number;
-+
-     gtk_notebook_reorder_child(notebook, gtk_notebook_get_nth_page(notebook, current_page_number), current_page_number + direction);
- }
- 
--- 
-1.7.0.1
-

lxterminal-0.1.10-fix-rgba-composite.patch

@@ -1,37 +0,0 @@
-From 6d11a3ce447088bb473b4796b6b306edd714894a 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: Tue, 26 Jul 2011 08:49:12 +0800
-Subject: [PATCH] solve rgba composite problems. (fixed SF#3376800)
-
----
- src/lxterminal.c |   13 ++++++++++---
- 1 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/lxterminal.c b/src/lxterminal.c
-index 0219d50..bb1a2b2 100644
---- a/src/lxterminal.c
-+++ b/src/lxterminal.c
-@@ -1199,9 +1199,16 @@ LXTerminal * lxterminal_initialize(LXTermWindow * lxtermwin, CommandArguments *
-     terminal->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- 
-     /* Try to get an RGBA visual (colormap) and assign it to the new window. */
--    GdkVisual *visual = gdk_screen_get_rgba_visual(gtk_widget_get_screen(GTK_WIDGET(terminal->window)));
--    if (visual != NULL)
--        gtk_widget_set_visual(terminal->window, visual);
-+    #if GTK_CHECK_VERSION (2, 90, 8)
-+        GdkVisual *visual = gdk_screen_get_rgba_visual(gtk_widget_get_screen(GTK_WIDGET(terminal->window)));
-+        if (visual != NULL)
-+            gtk_widget_set_visual(terminal->window, visual);
-+    #else
-+        GdkColormap *colormap = gdk_screen_get_rgba_colormap(gtk_widget_get_screen(GTK_WIDGET(terminal->window)));
-+        if (colormap != NULL)
-+            gtk_widget_set_colormap(terminal->window, colormap);
-+    #endif
-+
- 
-     /* Set window title. */
-     gtk_window_set_title(GTK_WINDOW(terminal->window), ((arguments->title != NULL) ? arguments->title : _("LXTerminal")));
--- 
-1.7.0.1
-
-

lxterminal-0.1.10.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9f689fecb160a05a7167529353962507ef11e280cd0bc774e884352aef82b4d
-size 243703

lxterminal-0.1.11.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3efe7d1dddb81cf3221125cdd3814f9f841da8108b58ef189be61421786e1af
+size 243851

lxterminal.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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
 

lxterminal.spec

@@ -19,7 +19,7 @@
 
 
 Name:           lxterminal
-Version:        0.1.10
+Version:        0.1.11
 Release:        9
 Summary:        Lightweight LXDE Terminal
 Group:          System/GUI/LXDE
@@ -29,12 +29,6 @@ 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-FIX-UPSTREAM lxterminal-0.1.10-fix-rgba-composite.patch
-# Fix sourceforge bug #3376800
-Patch1:		%name-0.1.10-fix-rgba-composite.patch
-# PATCH-FIX-UPSTREAM lxterminal-0.1.10-fix-desyncronization.patch
-# fix sourceforge bug #3372388
-Patch2:		%name-0.1.10-fix-desyncronization.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  fdupes gtk2-devel intltool pkg-config update-desktop-files
 BuildRequires:  docbook-utils docbook-xsl-stylesheets libxslt-devel
@@ -55,8 +49,6 @@ of the LXDE project
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure --enable-man