>Number:         22700
>Category:       pkg
>Synopsis:       update to x11/wxGTK to make x11/py-wxWindows compile
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Sep 05 23:06:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Joachim Koenig-Baltes
>Release:        NetBSD 1.6X
>Organization:
	
>Environment:
	
	
System: NetBSD joachim 1.6X NetBSD 1.6X (JOACHIM_ISDN) #0: Tue Aug 26 15:33:33 CEST 2003 joachim@compaq:/user/unix/work/NetBSD-current/src/sys/arch/i386/compile/obj.i386/JOACHIM_ISDN i386
Architecture: i386
Machine: i386
>Description:
x11/py-wxWindows does not compile after recent x11/py-wxGTK update to
2.4.1, even after updating x11/py-wxWindows to 2.4.1.2 (additional patch
follows).
>How-To-Repeat:
update wxGTK to 2.4.1
cd /usr/pkgsrc/x11/py-wxWindows; make

and see it fail due to a missing definition in include/wx/menuitem.h

>Fix:
according to
http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2003-September/011981.html

menuitem.h needs to be patched (py-wxWindows sources contain the correct
version, so i deduced the patch from that).

Patches:

--- Makefile.orig	2003-09-04 10:52:29.000000000 +0200
+++ Makefile	2003-09-06 00:18:31.000000000 +0200
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=		wxGTK-2.4.1
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxwindows/}
 EXTRACT_SUFX=		.tar.bz2


--- distinfo.orig	2003-09-05 11:37:46.000000000 +0200
+++ distinfo	2003-09-06 00:21:20.000000000 +0200
@@ -6,3 +6,4 @@
 SHA1 (patch-ab) = f0799ad63b9bd39cf58295b6d93ce7b697190d8c
 SHA1 (patch-ac) = 793ba08af48412fea905fc203b0c7322e4bafe9c
 SHA1 (patch-ad) = 1ee314f895451dfab8bf56952ad2822b8530590f
+SHA1 (patch-ae) = 6e1118e431b21c54a9bc721bad71161568e53551



------------------------------------------
and add the follwoing lines as patch-ae
------------------------------------------
$NetBSD$

--- include/wx/menuitem.h.orig	2003-06-08 10:13:11.000000000 +0200
+++ include/wx/menuitem.h	2003-09-06 00:14:03.000000000 +0200
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.10.99
-// RCS-ID:      $Id: patch-ae,v 1.5 2003/09/05 22:29:42 joachim Exp $
+// RCS-ID:      $Id: patch-ae,v 1.5 2003/09/05 22:29:42 joachim Exp $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
@@ -49,6 +49,7 @@
 
     // the menu we're in
     wxMenu *GetMenu() const { return m_parentMenu; }
+    void SetMenu(wxMenu* menu) { m_parentMenu = menu; }
 
     // get/set id
     void SetId(int id) { m_id = id; }
------------------------------------------
>Release-Note:
>Audit-Trail:
>Unformatted: