From a8875ab83c9b33217381a3d90b1e482760962330 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 18 Sep 2007 06:23:28 +0000 Subject: [PATCH] - 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 , thanks! --- x11/pcmanfm/Makefile | 10 +++++++--- x11/pcmanfm/patches/patch-src_xdgmime_xdgmime_c | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 x11/pcmanfm/patches/patch-src_xdgmime_xdgmime_c diff --git a/x11/pcmanfm/Makefile b/x11/pcmanfm/Makefile index 205d1a37cdf..5343a200603 100644 --- a/x11/pcmanfm/Makefile +++ b/x11/pcmanfm/Makefile @@ -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 -# 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 diff --git a/x11/pcmanfm/patches/patch-src_xdgmime_xdgmime_c b/x11/pcmanfm/patches/patch-src_xdgmime_xdgmime_c new file mode 100644 index 00000000000..bc8b920f2e5 --- /dev/null +++ b/x11/pcmanfm/patches/patch-src_xdgmime_xdgmime_c @@ -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; +