From ff9b7c1ac22c9ba51275ced227788fb046ccd2d0 Mon Sep 17 00:00:00 2001 From: jasper Date: Wed, 28 Jan 2009 09:24:38 +0000 Subject: [PATCH] - fix XDG conflicting symbols, from FreeBSD this ought to help resolve some crashes in at least evolution and anjuta hinted by ajacoutot@, thanks :) --- devel/glib2/Makefile | 6 +++--- .../patches/patch-gio_xdgmime_xdgmimecache_h | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 devel/glib2/patches/patch-gio_xdgmime_xdgmimecache_h diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 93f2a32e557..c209db0661b 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2009/01/11 17:06:26 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.58 2009/01/28 09:24:38 jasper Exp $ COMMENT-main= general-purpose utility library COMMENT-docs= glib2 documentation @@ -6,7 +6,7 @@ COMMENT-fam= fam(3) gio module VERSION= 2.18.4 DISTNAME= glib-${VERSION} -PKGNAME-main= glib2-${VERSION} +PKGNAME-main= glib2-${VERSION}p0 PKGNAME-docs= glib2-docs-${VERSION} PKGNAME-fam= glib2-fam-${VERSION} @@ -18,7 +18,7 @@ SHARED_LIBS+= glib-2.0 1800.1 #.1800.3 SHARED_LIBS+= gobject-2.0 1800.1 SHARED_LIBS+= gmodule-2.0 1800.1 SHARED_LIBS+= gthread-2.0 1800.1 -SHARED_LIBS+= gio-2.0 1800.1 +SHARED_LIBS+= gio-2.0 1800.2 # LGPLv2 PERMIT_PACKAGE_CDROM= Yes diff --git a/devel/glib2/patches/patch-gio_xdgmime_xdgmimecache_h b/devel/glib2/patches/patch-gio_xdgmime_xdgmimecache_h new file mode 100644 index 00000000000..5ffb285aa84 --- /dev/null +++ b/devel/glib2/patches/patch-gio_xdgmime_xdgmimecache_h @@ -0,0 +1,17 @@ +$OpenBSD: patch-gio_xdgmime_xdgmimecache_h,v 1.1 2009/01/28 09:24:38 jasper Exp $ + +Fix XDG conflicting symbols, from FreeBSD's +devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h + +--- gio/xdgmime/xdgmimecache.h.orig Tue Jan 27 18:49:55 2009 ++++ gio/xdgmime/xdgmimecache.h Tue Jan 27 18:50:32 2009 +@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCache; + #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) + #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) + #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) ++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) ++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) ++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) + #endif + + extern XdgMimeCache **_caches;