Remove reference to gtk internal functions. These functions are no longer

available in recent versions of gtk, and sawfish doesn't use them anyway.
Bug 48439, patch from fn_x
Package-Manager: portage-2.0.51.19

4 files changed, 43 insertions, 7 deletions

diff --git a/x11-libs/rep-gtk/ChangeLog b/x11-libs/rep-gtk/ChangeLog
index 38bde8b2ae4f..9bb68bd53d28 100644
--- a/x11-libs/rep-gtk/ChangeLog
+++ b/x11-libs/rep-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/rep-gtk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/ChangeLog,v 1.32 2005/03/14 04:07:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/ChangeLog,v 1.33 2005/03/14 04:17:50 agriffis Exp $
+
+  14 Mar 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/rep-gtk-0.18-gtk26.patch, rep-gtk-0.18-r1.ebuild:
+  Remove reference to gtk internal functions. These functions are no longer
+  available in recent versions of gtk, and sawfish doesn't use them anyway.
+  Bug 48439, patch from fn_x
 
 *rep-gtk-0.18-r1 (14 Mar 2005)
 
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index 44078fcbfc10..0e5e1fc3ee6a 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -3,20 +3,21 @@ Hash: SHA1
 
 MD5 18c0650e89460e8f7e1c93650fb8970e rep-gtk-0.15-r3.ebuild 1083
 MD5 e6e8f23c3f86aabf461f2c02af3ba114 rep-gtk-0.17-r1.ebuild 1331
-MD5 65d71ecdea0ead19e4aa80c66382de9a ChangeLog 4707
+MD5 888d5cd667ada8786ba0413e3c119d83 ChangeLog 4998
 MD5 87cb07e2d3612bc798e3722f4f882671 metadata.xml 250
-MD5 a7d488321ca893cbac1cefd6260ca199 rep-gtk-0.18-r1.ebuild 1339
 MD5 ea8512744ddf9751615237ed0a700344 rep-gtk-0.18.ebuild 1428
+MD5 ef3fe019de2858fa1c4138bc406be533 rep-gtk-0.18-r1.ebuild 1571
 MD5 220aadeb6d56c63c76c4a8ee31e2099f files/digest-rep-gtk-0.15-r3 64
 MD5 1ea67ff5530d10194d5eb14361003264 files/digest-rep-gtk-0.17-r1 63
 MD5 7e43019a0be09f8a64bbc489fa63fd6a files/rep-gtk-0.18-gtk24.patch 1580
 MD5 a84fef69d72f4d670468dd74e8e788de files/digest-rep-gtk-0.18 64
 MD5 e46cf05f7e6b4bc7788ab928acda4d08 files/rep-gtk-0.17-64bit.patch 698
 MD5 a84fef69d72f4d670468dd74e8e788de files/digest-rep-gtk-0.18-r1 64
+MD5 b240daed7b25f7875150b314db4f26d0 files/rep-gtk-0.18-gtk26.patch 623
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCNQ4oBXaUFmZvwyMRAsbqAKC+RuaPAacZ/naoVy4IC9s5pht+1ACgtjwg
-De5hTgZmSmsNlkVqh46O+yk=
-=rGPu
+iD8DBQFCNRB0BXaUFmZvwyMRAo3bAJ9hK+2VaCzyCRI/jcB6THMQ48iWGACgjJ+N
+iFcgALMJbYGmldKSb7b5usI=
+=Ux7e
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk26.patch b/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk26.patch
new file mode 100644
index 000000000000..6325445f53d3
--- /dev/null
+++ b/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk26.patch
@@ -0,0 +1,24 @@
+Remove reference to gtk internal functions.  These functions are no longer
+available in recent versions of gtk, and sawfish doesn't use them anyway.  
+Bug 48439, patch from fn_x
+
+13 Mar 2005 agriffis
+
+--- gtk.defs.orig	2005-01-14 02:58:25.104563416 +0100
++++ gtk.defs	2005-01-14 02:58:53.158298600 +0100
+@@ -1717,15 +1717,6 @@
+   ((GtkWindow window)
+    (string geometry)))
+ 
+-;; XXX GtkWindowGroup
+-
+-;; XXX marked as internal
+-(define-func _gtk_window_internal_set_focus
+-  none
+-  ((GtkWindow window)
+-   (GtkWidget focus))
+-  (scm-name "gtk-window-set-focus"))
+-
+ ;;; HandleBox
+ 
+ (define-object GtkHandleBox (GtkBin))
diff --git a/x11-libs/rep-gtk/rep-gtk-0.18-r1.ebuild b/x11-libs/rep-gtk/rep-gtk-0.18-r1.ebuild
index a1578d2a8fdd..45f9c3af35dd 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.18-r1.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/rep-gtk-0.18-r1.ebuild,v 1.1 2005/03/14 04:07:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/rep-gtk-0.18-r1.ebuild,v 1.2 2005/03/14 04:17:50 agriffis Exp $
 
 inherit eutils
 
@@ -33,6 +33,11 @@ src_unpack() {
 	if has_version '>=x11-libs/gtk+-2.4'; then
 		epatch ${FILESDIR}/rep-gtk-0.18-gtk24.patch
 	fi
+
+	# Remove reference to gtk internal functions.  These functions are no
+	# longer available in recent versions of gtk, and sawfish doesn't use
+	# them anyway.  Bug 48439, patch from fn_x
+	epatch ${FILESDIR}/rep-gtk-0.18-gtk26.patch
 }
 
 src_compile() {