[gnome-terminal] Backport a fix for a crash in terminal_screen_container_style_updated

Kalev Lember kalev at fedoraproject.org
Fri Jan 25 20:16:48 UTC 2013


commit 99b9f2ba8966661e364552e767187d329452cf27
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Jan 25 21:14:40 2013 +0100

    Backport a fix for a crash in terminal_screen_container_style_updated

 0001-Don-t-assume-enum-size.patch |   25 +++++++++++++++++++++++++
 gnome-terminal.spec               |    7 ++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/0001-Don-t-assume-enum-size.patch b/0001-Don-t-assume-enum-size.patch
new file mode 100644
index 0000000..5e9a23e
--- /dev/null
+++ b/0001-Don-t-assume-enum-size.patch
@@ -0,0 +1,25 @@
+From afbdd5f632db00d9065ea8eeda3c2d3bbc646627 Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti at declera.com>
+Date: Fri, 25 Jan 2013 14:56:45 +0200
+Subject: [PATCH] Don't assume enum size
+
+---
+ src/terminal-screen-container.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/terminal-screen-container.c b/src/terminal-screen-container.c
+index 843f871..c7ec914 100644
+--- a/src/terminal-screen-container.c
++++ b/src/terminal-screen-container.c
+@@ -73,7 +73,7 @@ terminal_screen_container_style_updated (GtkWidget *widget)
+ {
+   TerminalScreenContainer *container = TERMINAL_SCREEN_CONTAINER (widget);
+   TerminalScreenContainerPrivate *priv = container->priv;
+-  glong corner;
++  GtkCornerType corner;
+   gboolean set;  
+ 
+   GTK_WIDGET_CLASS (terminal_screen_container_parent_class)->style_updated (widget);
+-- 
+1.8.1
+
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index cbb8586..0fc5ad4 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -8,12 +8,13 @@
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
 Version: 3.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+ and GFDL
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
 #VCS: git:git://git.gnome.org/gnome-terminal
 Source0: http://download.gnome.org/sources/gnome-terminal/3.7/gnome-terminal-%{version}.tar.xz
+Patch0: 0001-Don-t-assume-enum-size.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: GConf2-devel
@@ -39,6 +40,7 @@ clickable URLs.
 
 %prep
 %setup -q
+%patch0 -p1 -b .enum_size
 
 %build
 %configure --with-gtk=3.0
@@ -75,6 +77,9 @@ fi
 %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml
 
 %changelog
+* Fri Jan 25 2013 Kalev Lember <kalevlember at gmail.com> - 3.7.2-2
+- Backport a fix for a crash in terminal_screen_container_style_updated
+
 * Fri Jan 25 2013 Kalev Lember <kalevlember at gmail.com> - 3.7.2-1
 - Update to 3.7.2
 


More information about the scm-commits mailing list