[arch-commits] CVS update of extra/x11/wxgtk-2.6 (PKGBUILD wxgtk-borderfree.patch)

[Jan de Groot]

    Date: Friday, August 31, 2007 @ 03:54:59
  Author: jgc
    Path: /home/cvs-extra/extra/x11/wxgtk-2.6

   Added: wxgtk-borderfree.patch (1.1)
Modified: PKGBUILD (1.1 -> 1.2)

upgpkg: wxgtk-2.6 2.6.4-2
Add fix for invalid free on border objects, fixes invalid free errors with recent versions of gtk-engines


------------------------+
 PKGBUILD               |   12 +++++++-----
 wxgtk-borderfree.patch |   22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)


Index: extra/x11/wxgtk-2.6/PKGBUILD
diff -u extra/x11/wxgtk-2.6/PKGBUILD:1.1 extra/x11/wxgtk-2.6/PKGBUILD:1.2
--- extra/x11/wxgtk-2.6/PKGBUILD:1.1	Tue Apr 17 09:00:43 2007
+++ extra/x11/wxgtk-2.6/PKGBUILD	Fri Aug 31 03:54:59 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.1 2007/04/17 13:00:43 alexander Exp $
+# $Id: PKGBUILD,v 1.2 2007/08/31 07:54:59 jgc Exp $
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 pkgname=wxgtk-2.6
 pkgver=2.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc="wxGTK - GTK+ implementation of wxWidgets API for GUI"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -10,11 +10,14 @@
 replaces=('wxgtk-gtk1')
 conflicts=('wxgtk-gtk1')
 provides=('wxgtk-gtk1')
-source=(http://dl.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2
+	wxgtk-borderfree.patch)
 url="http://wxwidgets.org"
+md5sums=('ce0fd2b425bc98957cf70eea5f154b49' 'cffc3739d315e7d78299bd75f25ff5c4')
 
 build() {
   cd ${startdir}/src/wxGTK-${pkgver}
+  patch -Np0 -i ${startdir}/src/wxgtk-borderfree.patch || return 1
   ./configure --prefix=/usr \
               --with-gtk=2 \
               --with-opengl \
@@ -35,10 +38,9 @@
   find ${startdir}/pkg/usr/share/locale -name wxmsw.mo | xargs rm -f
 
   for i in ${startdir}/pkg/usr/share/locale/*/LC_MESSAGES/wxstd.mo; do
-    NEWNAME=`echo $i | sed -e 's!wxstd.mo!compat-wxstd26.mo!'`;
+    NEWNAME=${i/wxstd.mo/compat-wxstd26.mo}
     mv $i $NEWNAME;
   done
   mv ${startdir}/pkg/usr/share/aclocal/wxwin.m4 \
    ${startdir}/pkg/usr/share/aclocal/wxwin-2.6.m4
 }
-md5sums=('ce0fd2b425bc98957cf70eea5f154b49')
Index: extra/x11/wxgtk-2.6/wxgtk-borderfree.patch
diff -u /dev/null extra/x11/wxgtk-2.6/wxgtk-borderfree.patch:1.1
--- /dev/null	Fri Aug 31 03:54:59 2007
+++ extra/x11/wxgtk-2.6/wxgtk-borderfree.patch	Fri Aug 31 03:54:59 2007
@@ -0,0 +1,22 @@
+--- 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 @@
+             right_border += default_border->right;
+             top_border += default_border->top;
+             bottom_border += default_border->bottom;
+-            g_free( default_border );
++            gtk_border_free( default_border );
+         }
+         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 @@
+                 right_border += default_border->right;
+                 top_border += default_border->top;
+                 bottom_border += default_border->bottom;
+-                g_free( default_border );
++                gtk_border_free( default_border );
+             }
+         }
+