summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2008-05-31 13:13:57 +0000
committerRémi Cardona <remi@gentoo.org>2008-05-31 13:13:57 +0000
commit13b5e05cfedd2f32c3d7b678762b770a6b0dab83 (patch)
tree54c46d2e2f01adce443d9bf718a8391eba57395b /x11-libs/gtk+extra/files
parentVersion bump. (diff)
downloadgentoo-2-13b5e05cfedd2f32c3d7b678762b770a6b0dab83.tar.gz
gentoo-2-13b5e05cfedd2f32c3d7b678762b770a6b0dab83.tar.bz2
gentoo-2-13b5e05cfedd2f32c3d7b678762b770a6b0dab83.zip
x11-libs/gtk+extra: add patches to fix segfaults, see bug #219777
(Portage version: 2.1.5.2)
Diffstat (limited to 'x11-libs/gtk+extra/files')
-rw-r--r--x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch16
-rw-r--r--x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch21
2 files changed, 37 insertions, 0 deletions
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch
new file mode 100644
index 000000000000..04aaeb4f9d90
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch
@@ -0,0 +1,16 @@
+diff -ur gtk+extra/gtkextra/gtksheet.c gtk+extra-2.1.1/gtkextra/gtksheet.c
+--- gtk+extra/gtkextra/gtksheet.c 2008-02-01 01:04:09.000000000 +0100
++++ gtk+extra-2.1.1/gtkextra/gtksheet.c 2008-02-01 01:08:52.000000000 +0100
+@@ -7956,11 +7956,10 @@
+ }
+
+ tbl->maxallocrow-=MIN(nrows,tbl->maxallocrow-row+1);
+- tbl->maxallocrow = MIN(tbl->maxallocrow, tbl->maxrow);
+-
+ }
+
+ tbl->maxrow-=nrows;
++ tbl->maxallocrow = MIN(tbl->maxallocrow, tbl->maxrow);
+ gtk_sheet_recalc_top_ypixels(tbl, 0);
+ return TRUE;
+ }
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch
new file mode 100644
index 000000000000..c4fbfce39d3c
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch
@@ -0,0 +1,21 @@
+--- gtkextra/gtksheet.c.orig 2005-06-24 19:51:00.000000000 +0200
++++ gtkextra/gtksheet.c 2007-10-19 15:13:42.000000000 +0200
+@@ -2738,7 +2738,7 @@
+ gdk_window_destroy (sheet->row_title_window);
+
+ if (sheet->pixmap){
+- g_free (sheet->pixmap);
++ g_object_unref (sheet->pixmap);
+ sheet->pixmap = NULL;
+ }
+
+@@ -4149,7 +4149,7 @@
+ &pixmap_width, &pixmap_height);
+ if ((pixmap_width != width) || (pixmap_height != height))
+ {
+- g_free(sheet->pixmap);
++ g_object_unref(sheet->pixmap);
+ sheet->pixmap = gdk_pixmap_new (sheet->sheet_window,
+ width, height,
+ -1);
+