[oe-commits] org.oe.dev gtk+: Add patch to fix file selector segfault contributed by HEXaBYTE.

[florian commit]

gtk+: Add patch to fix file selector segfault contributed by HEXaBYTE.

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 7d055c0af1800d25200ac6ecd4c27f7dbf792959
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7d055c0af1800d25200ac6ecd4c27f7dbf792959
Files:
1
packages/gtk+/files/filesel-fix-segfault.patch
packages/gtk+/gtk+_2.10.12.bb
packages/gtk+/gtk+_2.6.10.bb
Diffs:

#
# mt diff -re81f5f3384f35d17a23f2208339b42c88d14ae53 -r7d055c0af1800d25200ac6ecd4c27f7dbf792959
#
# 
# 
# add_file "packages/gtk+/files/filesel-fix-segfault.patch"
#  content [d6aa03d6195e53a733f97db8bd69b13a03ef553e]
# 
# patch "packages/gtk+/gtk+_2.10.12.bb"
#  from [9b21ea0efe015df3d2fddf0cc7633626765140b7]
#    to [093d8fd76656568d1115610d2e6be2558960748c]
# 
# patch "packages/gtk+/gtk+_2.6.10.bb"
#  from [2c69f45ec2e51a207dc984c638ae2db4445d457a]
#    to [01004b9583b8edf5f9742879b1db95005b9f25e4]
# 
============================================================
--- packages/gtk+/files/filesel-fix-segfault.patch	d6aa03d6195e53a733f97db8bd69b13a03ef553e
+++ packages/gtk+/files/filesel-fix-segfault.patch	d6aa03d6195e53a733f97db8bd69b13a03ef553e
@@ -0,0 +1,19 @@
+--- gtk+-2.10.12_/gtk/gtkfilesel.c	2007-06-12 14:00:38.000000000 +0200
++++ gtk+-2.10.12/gtk/gtkfilesel.c	2007-06-12 14:40:32.000000000 +0200
+@@ -2444,9 +2444,13 @@
+ 
+               if (!is_file)
+                 {
+-                  gtk_file_selection_dir_activate (tree_view, path, 
+-                          gtk_tree_view_get_column (tree_view, DIR_COLUMN),
+-                          user_data);
++		   fs->last_selected = g_strdup (g_ptr_array_index (new_names, index));
++		   gtk_file_selection_dir_activate (tree_view, path, 
++						    gtk_tree_view_get_column (tree_view, DIR_COLUMN),
++						    user_data);
++		   gtk_tree_path_free (path);
++		   return;
++		  
+                 }
+                 
+               gtk_tree_path_free (path);
============================================================
--- packages/gtk+/gtk+_2.10.12.bb	9b21ea0efe015df3d2fddf0cc7633626765140b7
+++ packages/gtk+/gtk+_2.10.12.bb	093d8fd76656568d1115610d2e6be2558960748c
@@ -1,6 +1,6 @@ require gtk-2.10.inc
 require gtk-2.10.inc
 
-PR = "r0"
+PR = "r1"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1"
@@ -21,6 +21,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
            file://single-click.patch;patch=1 \
            file://spinbutton.patch;patch=1 \
            file://gtk+-handhelds.patch;patch=1 \
+           file://filesel-fix-segfault.patch;patch=1 \
 	   "
 
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
============================================================
--- packages/gtk+/gtk+_2.6.10.bb	2c69f45ec2e51a207dc984c638ae2db4445d457a
+++ packages/gtk+/gtk+_2.6.10.bb	01004b9583b8edf5f9742879b1db95005b9f25e4
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
            file://help.patch;patch=1 \
@@ -33,7 +33,9 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
            file://gtk.keynav.gtktextview.patch;patch=1;pnum=0 \
            file://gtk.keynav.gtktreeview.patch;patch=1;pnum=0 \
            file://gtk.keynav.gtkwidget.patch;patch=1;pnum=0 \
-           file://gtk+-2.6.10-bg.patch;patch=1"
+           file://gtk+-2.6.10-bg.patch;patch=1 \
+           file://filesel-fix-segfault.patch;patch=1 \
+           "
 
 inherit autotools pkgconfig