The patch fixes a couple of crashes on i386. OK?
Index: Makefile =================================================================== --- Makefile (revision 134716) +++ Makefile (working copy) @@ -6,7 +6,7 @@ V = 2.3.2 DISTNAME = aMule-$V -REVISION = 11 +REVISION = 12 CATEGORIES = net HOMEPAGE = http://www.amule.org/ Index: patches/patch-src_OScopeCtrl_cpp =================================================================== --- patches/patch-src_OScopeCtrl_cpp (nonexistent) +++ patches/patch-src_OScopeCtrl_cpp (working copy) @@ -0,0 +1,21 @@ +$OpenBSD$ + +Fixes this crash: +"Assertion failed: ./src/gtk/dc.cpp:wxPaintDCImpl:276: Assertion 'cr' failed. +using wxPaintDC without being in a native paint event" + +http://forum.amule.org/index.php?topic=21405.0 +http://forum.amule.org/index.php?topic=21383.15 + +Index: src/OScopeCtrl.cpp +--- src/OScopeCtrl.cpp.orig ++++ src/OScopeCtrl.cpp +@@ -522,7 +522,7 @@ void COScopeCtrl::InvalidateCtrl(bool bInvalidateGraph + bRecreateGraph |= bInvalidateGraph; + bRecreateGrid |= bInvalidateGrid; + // It appears the timerRedraw logic screws up Mac, disable it there +-#ifndef __WXMAC__ ++#if 0 + // To prevent startup problems don't start timer logic until + // a native OnPaint event has been generated. + if (m_onPaint) { Index: patches/patch-src_extern_wxWidgets_listctrl_cpp =================================================================== --- patches/patch-src_extern_wxWidgets_listctrl_cpp (nonexistent) +++ patches/patch-src_extern_wxWidgets_listctrl_cpp (working copy) @@ -0,0 +1,26 @@ +$OpenBSD$ + +Remove an infinite recursion. + +https://github.com/amule-project/amule/commit/110a056fa4bcfc0fe8c1f8eadcc2bd5df0bbf5e1 + +Index: src/extern/wxWidgets/listctrl.cpp +--- src/extern/wxWidgets/listctrl.cpp.orig ++++ src/extern/wxWidgets/listctrl.cpp +@@ -5803,16 +5803,6 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int + #endif + } + +-void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const +-{ +- m_mainWin->DoClientToScreen(x, y); +-} +- +-void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const +-{ +- m_mainWin->DoScreenToClient(x, y); +-} +- + void wxGenericListCtrl::SetFocus() + { + // The test in window.cpp fails as we are a composite Index: patches/patch-src_extern_wxWidgets_listctrl_h =================================================================== --- patches/patch-src_extern_wxWidgets_listctrl_h (nonexistent) +++ patches/patch-src_extern_wxWidgets_listctrl_h (working copy) @@ -0,0 +1,21 @@ +$OpenBSD$ + +Remove an infinite recursion. + +https://github.com/amule-project/amule/commit/110a056fa4bcfc0fe8c1f8eadcc2bd5df0bbf5e1 + +Index: src/extern/wxWidgets/listctrl.h +--- src/extern/wxWidgets/listctrl.h.orig ++++ src/extern/wxWidgets/listctrl.h +@@ -232,11 +232,6 @@ class wxGenericListCtrl: public wxControl (public) + protected: + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); + +- // take into account the coordinates difference between the container +- // window and the list control window itself here +- virtual void DoClientToScreen( int *x, int *y ) const; +- virtual void DoScreenToClient( int *x, int *y ) const; +- + virtual wxSize DoGetBestSize() const; + + // return the text for the given column of the given item
