fix dependencies and build with -current gtk2

This commit is contained in:
sturm 2005-06-03 19:08:30 +00:00
parent bda3767814
commit 912c3a372c
3 changed files with 48 additions and 6 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.12 2005/05/23 20:28:50 marius Exp $
# $OpenBSD: Makefile,v 1.13 2005/06/03 19:08:30 sturm Exp $
COMMENT= "GTK+ binding for librep Lisp environment"
VERSION= 0.18
DISTNAME= rep-gtk-${VERSION}
PKGNAME= ${DISTNAME}p0
CATEGORIES= x11
HOMEPAGE= http://rep-gtk.sourceforge.net/
@ -13,13 +14,16 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xi gmodule iconv intl m
WANTLIB= X11 Xft.5 Xrender.3 atk-1.0.0.0 fontconfig.2 freetype.13 \
glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 iconv intl m \
pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rep-gtk/}
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
glib.1.2::devel/glib \
rep.10::lang/librep
BUILD_DEPENDS= ::devel/pkgconfig \
${RUN_DEPENDS}
RUN_DEPENDS= ::lang/librep
LIB_DEPENDS= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2
GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd${OPSYS_VER}
SUBST_VARS= GNU_ARCH VERSION
@ -28,7 +32,7 @@ USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --without-gdk-pixbuf --without-gnome --without-libglade
CONFIGURE_ARGS+= --without-gnome --without-libglade
NO_REGRESS= Yes

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-gtk-compat_c,v 1.1 2005/06/03 19:08:30 sturm Exp $
--- gtk-compat.c.orig Fri Jun 3 12:02:25 2005
+++ gtk-compat.c Fri Jun 3 12:02:47 2005
@@ -62,6 +62,7 @@ gtk_menu_popup_interp (GtkMenu *menu,
func, func_data, button, activate_time);
}
+#if 0
GtkWidget*
gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
gchar *label)
@@ -77,6 +78,7 @@ gtk_radio_menu_item_new_with_mnemonic_fr
GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
return gtk_radio_menu_item_new_with_mnemonic (g, label);
}
+#endif
GtkWidget*
gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group)

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-rep-gtk_h,v 1.1 2005/06/03 19:08:30 sturm Exp $
--- rep-gtk.h.orig Fri Jun 3 12:03:02 2005
+++ rep-gtk.h Fri Jun 3 12:03:31 2005
@@ -289,12 +289,15 @@ void gtk_menu_popup_interp (GtkMenu *men
guint32 activate_time,
repv position);
+#if 0
GtkWidget*
gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
gchar *label);
GtkWidget*
gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
gchar *label);
+#endif
+
GtkWidget* gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group);
GtkWidget* gtk_pixmap_new_interp (char *file, GtkWidget *intended_parent);