- fix a SIGSEGV under amd64 (and possibly other archs too) by telling

pcmanfm where to look for mime.cache instead of letting try to access
non existent directories

from Benoit Chesneau <bchesneau at gmail dot com>, thanks!
This commit is contained in:
ajacoutot 2007-09-18 06:23:28 +00:00
parent f693652d02
commit a8875ab83c
2 changed files with 22 additions and 3 deletions

View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.2 2007/09/10 06:16:09 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2007/09/18 06:23:28 ajacoutot Exp $
COMMENT= fast and lightweight file manager
DISTNAME= pcmanfm-0.3.2.2
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= x11
HOMEPAGE= http://pcmanfm.sourceforge.net/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -39,4 +39,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lm"
CONFIGURE_ARGS= --disable-hal
pre-configure:
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
${WRKSRC}/src/xdgmime/xdgmime.c
.include <bsd.port.mk>

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_xdgmime_xdgmime_c,v 1.1 2007/09/18 06:23:28 ajacoutot Exp $
--- src/xdgmime/xdgmime.c.orig Fri Oct 27 19:51:44 2006
+++ src/xdgmime/xdgmime.c Tue Sep 18 08:10:53 2007
@@ -219,7 +219,11 @@ void xdg_run_command_on_dirs ( XdgDirectoryFunc func,
xdg_data_dirs = getenv ( "XDG_DATA_DIRS" );
if ( xdg_data_dirs == NULL )
+#ifdef __OpenBSD__
+ xdg_data_dirs = "!!LOCALBASE!!/share";
+#else
xdg_data_dirs = "/usr/local/share:/usr/share";
+#endif
ptr = xdg_data_dirs;