From GNOME bugzilla #588655
g_mapped_file_free() has been deprecated in favor of g_mapped_file_unref().

While here, regen WANTLIB.

Breakage reported by jasper@ and naddy@
This commit is contained in:
ajacoutot 2009-10-06 15:24:47 +00:00
parent c63fe47ba7
commit e80392c413
2 changed files with 20 additions and 4 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.27 2009/08/11 08:39:38 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.28 2009/10/06 15:24:47 ajacoutot Exp $
COMMENT= API documentation browser for GNOME
GNOME_PROJECT= devhelp
GNOME_VERSION= 0.22
PKGNAME= ${DISTNAME}p11
PKGNAME= ${DISTNAME}p12
SHARED_LIBS += devhelp-1 1.0 # .0.0
CATEGORIES= textproc
@ -25,6 +25,7 @@ WANTLIB += gtk-x11-2.0 icudata icui18n icuuc jpeg m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += soup-2.4 sqlite3 tasn1 xml2 xslt z
WANTLIB += enchant stdc++ gailutil pthread-stubs xcb
WANTLIB += execinfo xcb-atom xcb-aux xcb-event
MODULES= devel/gettext \
lang/python \

View File

@ -1,11 +1,14 @@
$OpenBSD: patch-src_dh-assistant-view_c,v 1.1 2009/03/19 14:36:53 ajacoutot Exp $
$OpenBSD: patch-src_dh-assistant-view_c,v 1.2 2009/10/06 15:24:47 ajacoutot Exp $
From upstream SVN rev 1265:
Use file: URIs instead of local paths, fixes use with more recent webkit
versions.
From GNOME bugzilla #588655
g_mapped_file_free() has been deprecated in favor of g_mapped_file_unref().
--- src/dh-assistant-view.c.orig Fri Nov 28 16:56:04 2008
+++ src/dh-assistant-view.c Thu Mar 19 15:28:11 2009
+++ src/dh-assistant-view.c Tue Oct 6 17:16:55 2009
@@ -169,6 +169,7 @@ assistant_view_set_link (DhAssistantView *view,
gsize length;
gchar *key;
@ -35,3 +38,15 @@ versions.
g_free (tmp);
webkit_web_view_load_html_string (
@@ -340,7 +344,11 @@ assistant_view_set_link (DhAssistantView *view,
webkit_web_view_open (WEBKIT_WEB_VIEW (view), "about:blank");
}
+#if GLIB_CHECK_VERSION(2,21,3)
+ g_mapped_file_unref (file);
+#else
g_mapped_file_free (file);
+#endif
g_free (filename);
}