diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-11-12 03:56:21 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-11-12 03:56:21 +0000 |
| commit | 9679538ba969f65de89983df4d7e21680f8fa095 (patch) | |
| tree | 986037dfb9a8e8e594890cc6755c975835877b3d /x11-toolkits | |
| parent | o New port hlserver-ns version 1.0.1: Half-Life mod Natural Selection (diff) | |
Fix build with gtkhtml-1.1.
Notes
Notes:
svn path=/head/; revision=69940
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in | 15 | ||||
| -rw-r--r-- | x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml-glue.c | 13 |
2 files changed, 19 insertions, 9 deletions
diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in index bd9cdc0cbc76..2032044326b0 100644 --- a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in +++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::Makefile.in @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- guile-gnome/gtkhtml/Makefile.in 2001/11/12 12:07:17 1.1 -+++ guile-gnome/gtkhtml/Makefile.in 2001/11/12 12:07:44 -@@ -98,7 +98,7 @@ +--- guile-gnome/gtkhtml/Makefile.in.orig Fri Mar 9 12:07:49 2001 ++++ guile-gnome/gtkhtml/Makefile.in Mon Nov 11 22:52:47 2002 +@@ -98,10 +98,10 @@ VERSION = @VERSION@ ZVT_LIBS = @ZVT_LIBS@ @@ -11,4 +8,8 @@ $FreeBSD$ +INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk -I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR) `$(GNOME_CONFIG) --cflags gtkhtml` - GTKHTML_LIBS = -lgtkhtml -lgdk_pixbuf +-GTKHTML_LIBS = -lgtkhtml -lgdk_pixbuf ++GTKHTML_LIBS = -lgtkhtml-1.1 -lgdk_pixbuf + + lib_LTLIBRARIES = libguilegtkhtml.la + libguilegtkhtml_la_SOURCES = gtkhtml-glue.c gtkhtml-support.c diff --git a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml-glue.c b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml-glue.c index a8c661a9d6f6..4144c78d5a89 100644 --- a/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml-glue.c +++ b/x11-toolkits/guile-gnome/files/patch-guile-gnome::gtkhtml::gtkhtml-glue.c @@ -1,5 +1,5 @@ --- guile-gnome/gtkhtml/gtkhtml-glue.c.orig Mon Feb 5 22:46:22 2001 -+++ guile-gnome/gtkhtml/gtkhtml-glue.c Sat Aug 31 14:03:17 2002 ++++ guile-gnome/gtkhtml/gtkhtml-glue.c Mon Nov 11 22:52:04 2002 @@ -110,7 +110,7 @@ extern sgtk_boxed_info sgtk_gtimer_info; @@ -56,7 +56,16 @@ ; ; - cr_ret = gtk_html_request_paste (c_html, c_type, c_time); -+ cr_ret = gtk_html_request_paste (c_html, c_selection, c_type, c_time); ++ cr_ret = gtk_html_request_paste (c_html, c_selection, c_type, c_time, 0); SCM_ALLOW_INTS; return scm_long2num (cr_ret); +@@ -693,7 +698,7 @@ + + SCM_DEFER_INTS; + c_html = (GtkHTML*)sgtk_get_gtkobj (p_html); +- gtk_html_paste (c_html); ++ gtk_html_paste (c_html, 0); + SCM_ALLOW_INTS; + + return SCM_UNSPECIFIED; |