Fix some known compatibility problems with GNOME 2.6.

6 files changed, 123 insertions, 1 deletions

diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 3b057cbce72..fadf52a645b 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rep-gtk2
 PORTVERSION=	0.18
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/rep-gtk2/files/patch-gnome-canvas.defs b/x11-toolkits/rep-gtk2/files/patch-gnome-canvas.defs
new file mode 100644
index 00000000000..06a547e90e6
--- /dev/null
+++ b/x11-toolkits/rep-gtk2/files/patch-gnome-canvas.defs
@@ -0,0 +1,14 @@
+--- gnome-canvas.defs.orig	Thu Mar 18 15:02:22 2004
++++ gnome-canvas.defs	Thu Mar 18 15:02:26 2004
+@@ -295,11 +295,6 @@
+ 
+ ;; GnomeCanvasGroup
+ 
+-(define-func gnome_canvas_group_child_bounds
+-  none
+-  ((GnomeCanvasGroup group)
+-   (GnomeCanvasItem item)))
+-
+ 
+ ;; gnome-canvas-util
+ 
diff --git a/x11-toolkits/rep-gtk2/files/patch-gnomeui.defs b/x11-toolkits/rep-gtk2/files/patch-gnomeui.defs
new file mode 100644
index 00000000000..6d963c35e22
--- /dev/null
+++ b/x11-toolkits/rep-gtk2/files/patch-gnomeui.defs
@@ -0,0 +1,72 @@
+--- gnomeui.defs.orig	Thu Mar 18 15:03:51 2004
++++ gnomeui.defs	Thu Mar 18 15:04:41 2004
+@@ -228,42 +228,6 @@
+   (protection *result*))
+ 
+ 
+-;; gnome-geometry
+-
+-(define-func gnome_parse_geometry
+-  bool
+-  ((string geom)
+-   ((ret int) xpos)
+-   ((ret int) ypos)
+-   ((ret int) width)
+-   ((ret int) height)))
+-
+-(define-func gnome_geometry_string
+-  string
+-  ((GdkWindow window)))
+-
+-
+-;; gtkcauldron
+-
+-;; [the interface isn't suited to lisp anyway..]
+-
+-
+-;; GnomeAbout
+-
+-(define-object GnomeAbout (GtkDialog))
+-
+-(define-func gnome_about_new
+-  GtkWidget
+-  ((string name)
+-   (string version)
+-   (string copyright)
+-   (string comments)
+-   ((tvec string) authors)
+-   ((tvec string) documentors)
+-   (string translator_credits)
+-   (GdkPixbuf logo (null-ok))))
+-
+-
+ ;; GnomeApp
+ 
+ (define-object GnomeApp (GtkWindow))
+@@ -327,11 +291,6 @@
+   none
+   ((GnomeAppBar appbar)))
+ 
+-(define-func gnome_appbar_set_progress
+-  none
+-  ((GnomeAppBar appbar)
+-   (float percentage)))
+-
+ (define-func gnome_appbar_get_progress
+   GtkProgress
+   ((GnomeAppBar appbar)))
+@@ -675,14 +634,6 @@
+   ((GnomeEntry ge)
+    (int save)
+    (string text)))
+-
+-(define-func gnome_entry_load_history
+-  none
+-  ((GnomeEntry ge)))
+-
+-(define-func gnome_entry_save_history
+-  none
+-  ((GnomeEntry ge)))
+ 
+ 
+ ;; GnomeFileEntry
diff --git a/x11-toolkits/rep-gtk2/files/patch-gtk-compat.c b/x11-toolkits/rep-gtk2/files/patch-gtk-compat.c
new file mode 100644
index 00000000000..7ee510da51b
--- /dev/null
+++ b/x11-toolkits/rep-gtk2/files/patch-gtk-compat.c
@@ -0,0 +1,20 @@
+--- gtk-compat.c.orig	Thu Mar 18 16:17:34 2004
++++ gtk-compat.c	Thu Mar 18 16:17:49 2004
+@@ -64,7 +64,7 @@
+ 
+ GtkWidget*
+ gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
+-						gchar            *label)
++						const gchar            *label)
+ {
+   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
+   return gtk_radio_menu_item_new_with_label (g, label);
+@@ -72,7 +72,7 @@
+ 
+ GtkWidget*
+ gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
+-						   gchar            *label)
++						   const gchar            *label)
+ {
+   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
+   return gtk_radio_menu_item_new_with_mnemonic (g, label);
diff --git a/x11-toolkits/rep-gtk2/files/patch-rep-gtk.h b/x11-toolkits/rep-gtk2/files/patch-rep-gtk.h
new file mode 100644
index 00000000000..d08df121e00
--- /dev/null
+++ b/x11-toolkits/rep-gtk2/files/patch-rep-gtk.h
@@ -0,0 +1,15 @@
+--- rep-gtk.h.orig	Thu Mar 18 16:17:18 2004
++++ rep-gtk.h	Thu Mar 18 16:17:29 2004
+@@ -291,10 +291,10 @@
+ 
+ GtkWidget*
+ gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
+-						gchar            *label);
++						const gchar            *label);
+ GtkWidget*
+ gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
+-						   gchar            *label);
++						   const gchar            *label);
+ GtkWidget* gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group);
+ GtkWidget* gtk_pixmap_new_interp (char *file, GtkWidget *intended_parent);
+ 
diff --git a/x11-toolkits/rep-gtk2/pkg-descr b/x11-toolkits/rep-gtk2/pkg-descr
index 4ceb045b3fe..597294953b5 100644
--- a/x11-toolkits/rep-gtk2/pkg-descr
+++ b/x11-toolkits/rep-gtk2/pkg-descr
@@ -1,3 +1,3 @@
-Rep-gtk offers GTK+-2 bindings for rep Lisp interpreter.
+Rep-gtk offers GTK+-2 bindings for the rep Lisp interpreter.
 
 WWW: http://rep-gtk.sourceforge.net/