cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix XDG conflicting symbols, from FreeBSD

Browse Source 
this ought to help resolve some crashes in at least evolution and anjuta

hinted by ajacoutot@, thanks :)
This commit is contained in:
jasper 2009-01-28 09:24:38 +00:00
parent afceaa9d42
commit ff9b7c1ac2
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/glib2/Makefile
View File

@ -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

17
devel/glib2/patches/patch-gio_xdgmime_xdgmimecache_h Normal file
View File

@ -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;