- added lxterminal-0.1.9-fix-char_widthheight.patch to fix

failure cause of vte deprecated API (thanks BManojlovic)

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

lxterminal-0.1.9-fix-char_widthheight.patch

@@ -1,30 +1,53 @@
-Index: src/lxterminal.c
+From 2cda6d2217f82cc993f4758ed44ef74c61f729ba Mon Sep 17 00:00:00 2001
-===================================================================
+From: Andrea Florio <andrea@opensuse.org>
---- src/lxterminal.c.orig	2010-08-17 02:20:35.000000000 +0200
+Date: Thu, 2 Sep 2010 19:34:52 +0200
-+++ src/lxterminal.c	2010-09-02 19:11:47.792423947 +0200
+Subject: [PATCH] fixed vte failure because of deprecated API
-@@ -259,8 +259,8 @@ static void terminal_geometry_restore(Te
+
+---
+ 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->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_req
+@@ -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.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_pres
+@@ -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,
@@ -35,7 +58,7 @@ Index: src/lxterminal.c
              &tag);
          gtk_border_free(border);
  
-@@ -929,7 +929,7 @@ static Term * terminal_new(LXTerminal *
+@@ -929,7 +929,7 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
      gtk_widget_show_all(term->tab);
  
      /* Set up scrollbar. */
@@ -44,3 +67,6 @@ Index: src/lxterminal.c
  
      /* Fork the process that will have the VTE as its controlling terminal. */
      if (exec != NULL)
+-- 
+1.6.3
+

lxterminal.changes

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

lxterminal.spec

@@ -29,7 +29,9 @@ 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-fix-char_widthheight.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 vte-devel
@@ -45,7 +47,7 @@ of the LXDE project
 %prep
 %setup -q
 %patch0 -p1
-%patch1
+%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"