Patch to disable three private GTK+ functions. Closes bug# 46737

4 files changed, 55 insertions, 13 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 78833d33150a..2230099e38c1 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.66 2004/11/13 17:13:58 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.67 2004/12/05 20:53:42 pythonhead Exp $
+
+  05 Dec 2004; Rob Cakebread <pythonhead@gentoo.org>
+  +files/wxGTK-2.4.2-menu.cpp.patch, wxGTK-2.4.2-r3.ebuild:
+  Patch to disable three private GTK+ functions. Closes bug# 46737
 
   13 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> wxGTK-2.5.3.ebuild:
   Removed monolithic build, fixed gtk1 detection, bug# 71036
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 8c3153fb0a47..43c12f4957d7 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9a8eb3171d5c29a993606087ea0c6863 ChangeLog 11161
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 MD5 3ada4f33a027c1a1b644ce88588d5046 wxGTK-2.4.2-r2.ebuild 4067
-MD5 28e6685025d1b5be5609b9de0c371cec wxGTK-2.4.2-r3.ebuild 4222
+MD5 49a4ec001c5b822c97f937c485577eb8 wxGTK-2.4.2-r3.ebuild 4205
 MD5 270b050e37d18d6af8b63ace9704e708 wxGTK-2.5.3.ebuild 4303
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 65
@@ -14,10 +11,4 @@ MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
 MD5 1e85c1c970da32626580dfef7228b314 files/wxGTK-2.4.1-wxpython2.patch 8459
 MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162
 MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBlrHDI1lqEGTUzyQRAuB2AKCbJTX/rRnRXvSY2nlvxBYe46MktwCfbBt9
-Ftns29VuI4/7hnXn+UJ5vVQ=
-=HboU
------END PGP SIGNATURE-----
+MD5 f3bc3ab73cb31c91683e3ed58f8ffabb files/wxGTK-2.4.2-menu.cpp.patch 2253
diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.2-menu.cpp.patch b/x11-libs/wxGTK/files/wxGTK-2.4.2-menu.cpp.patch
new file mode 100644
index 000000000000..8219a15a063c
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.4.2-menu.cpp.patch
@@ -0,0 +1,45 @@
+diff -Nur wxGTK-2.4.2/src/gtk/menu.cpp wxGTK-2.4.2-patched/src/gtk/menu.cpp
+--- wxGTK-2.4.2/src/gtk/menu.cpp    2003-09-21 05:31:57.000000000 -0600
++++ wxGTK-2.4.2-patched/src/gtk/menu.cpp    2004-03-31 22:37:42.422032816 -0700
+@@ -30,13 +30,13 @@
+ #ifdef __WXGTK20__
+     #include <glib-object.h>
+ 
+-    #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))
+-    #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
++    #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
++    #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
+     #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
+ 
+-    #define ACCEL_OBJECT        GObject
++    #define ACCEL_OBJECT        GtkWindow
+     #define ACCEL_OBJECTS(a)    (a)->acceleratables
+-    #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
++    #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
+ #else // GTK+ 1.x
+     #define ACCEL_OBJECT        GtkObject
+     #define ACCEL_OBJECTS(a)    (a)->attach_objects
+diff -Nur wxGTK-2.4.2/src/gtk/settings.cpp wxGTK-2.4.2-patched/src/gtk/settings.cpp
+--- wxGTK-2.4.2/src/gtk/settings.cpp    2003-09-21 05:31:57.000000000 -0600
++++ wxGTK-2.4.2-patched/src/gtk/settings.cpp    2004-03-31 23:03:41.888957808 -0700
+@@ -340,9 +340,17 @@
+                 }  
+                 else  
+                 {  
+-                    const gchar *font_name =
+-                        _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
+-                    g_systemFont = new wxFont(wxString::FromAscii(font_name));
++                    GtkSettings *settings = gtk_settings_get_default();
++                    gchar *font_name = NULL;
++                    g_object_get ( settings,
++                                   "gtk-font-name", 
++                                   &font_name,
++                                   NULL);
++                    if (!font_name)
++                        g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
++                    else
++                        g_systemFont = new wxFont(wxString::FromAscii(font_name));
++                    g_free (font_name);
+                 }  
+                 gtk_widget_destroy( widget );
+ #else
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
index 58a1a1672152..f1a9bafd2293 100644
--- a/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.3 2004/11/13 03:32:58 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r3.ebuild,v 1.4 2004/12/05 20:53:42 pythonhead Exp $
 
 inherit flag-o-matic eutils
 
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${PN}-2.4.2-menu.cpp.patch || \
+		die "Failed to patch menu.cpp"
 	# fix xml contrib makefile problems
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.1-contrib.patch
 	# disable contrib/src/animate