diff options
| author |   Eric Hameleers <alien@slackware.com> | 2008-04-13 20:42:34 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2008-04-13 20:42:34 +0000 |
| commit | 8b43e9a5e048d62a0dfae8b66525d983104795eb (patch) | |
| tree | 2eb7978d1c1681d9c56c99f4fe212cb90a1a80b5 /vlc/build/wxGTK-2.6_borderfree.patch | |
| parent | a3acd3f809fedc74feb58bc63fed0d8c29fe27f3 (diff) | |
| download | asb-8b43e9a5e048d62a0dfae8b66525d983104795eb.tar.gz asb-8b43e9a5e048d62a0dfae8b66525d983104795eb.tar.xz | |
Use official patch and comment
Diffstat (limited to 'vlc/build/wxGTK-2.6_borderfree.patch')
| -rw-r--r-- | vlc/build/wxGTK-2.6_borderfree.patch | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/vlc/build/wxGTK-2.6_borderfree.patch b/vlc/build/wxGTK-2.6_borderfree.patch index 79bde957..e925e45f 100644 --- a/vlc/build/wxGTK-2.6_borderfree.patch +++ b/vlc/build/wxGTK-2.6_borderfree.patch @@ -1,11 +1,16 @@ -Add fix for invalid free on border objects, fixes invalid free errors with recent versions of gtk-engines. -See http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/x11/wxgtk-2.6/wxgtk-borderfree.patch?cvsroot=Extra&only_with_tag=CURRENT#dirlist +http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=46513 + +gtk_border_free is for freeing GtkBorder's, not g_free. +Using g_free instead used to have no ill effects as gtk_border_free called +that anyway, but in gtk+-2.11 GtkBorder uses GSlice and gtk_border_free +therefore uses g_slice_free and using g_free makes things crash hard. +So fix it or wxGTK won't work with the gtk+-2.12 stable release. Thanks to Keith Ritchie for pointing me to the patch. ---- src/gtk/button.cpp.orig 2007-08-30 23:26:57.000000000 +0200 -+++ src/gtk/button.cpp 2007-08-30 23:27:52.000000000 +0200 -@@ -80,7 +80,7 @@ +--- src/gtk/button.cpp 2007/06/18 05:53:03 46512 ++++ src/gtk/button.cpp 2007/06/18 06:03:50 46513 +@@ -71,7 +71,7 @@ right_border += default_border->right; top_border += default_border->top; bottom_border += default_border->bottom; @@ -14,9 +19,9 @@ Thanks to Keith Ritchie for pointing me to the patch. } win->MoveWindow( win->m_x - top_border, ---- src/gtk/window.cpp.orig 2007-08-30 23:52:06.000000000 +0200 -+++ src/gtk/window.cpp 2007-08-30 23:52:14.000000000 +0200 -@@ -2706,7 +2706,7 @@ +--- src/gtk/window.cpp 2007/06/18 05:53:03 46512 ++++ src/gtk/window.cpp 2007/06/18 06:03:50 46513 +@@ -2738,7 +2738,7 @@ right_border += default_border->right; top_border += default_border->top; bottom_border += default_border->bottom; |