Date: Thu, 27 Apr 2006 02:20:17 GMT From: Dmitry Marakasov <amdmi3@mail.ru> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/96209: graphics/Gnash + Firefox crash Message-ID: <200604270220.k3R2KHxw000441@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/96209; it has been noted by GNATS.
From: Dmitry Marakasov <amdmi3@mail.ru>
To: bug-followup@FreeBSD.org
Cc: ale@freebsd.org
Subject: Re: ports/96209: graphics/Gnash + Firefox crash
Date: Thu, 27 Apr 2006 06:13:51 +0400
* Edwin Groothuis (edwin@FreeBSD.org) wrote:
> Please note that PR ports/96209 has just been submitted.
I've made a patch to disable plugin (for the case it crashes firefox).
As gnash still isn't considered stable, such stings are likely to
happen... I'll forward tihs and future bug reports to author.
--- gnash.patch begins here ---
diff -ruN gnash.old/Makefile gnash/Makefile
--- gnash.old/Makefile Sat Apr 22 17:52:03 2006
+++ gnash/Makefile Thu Apr 27 05:36:25 2006
@@ -7,7 +7,7 @@
PORTNAME= gnash
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= ale
@@ -18,13 +18,12 @@
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- ogg.5:${PORTSDIR}/audio/libogg \
- gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
+ ogg.5:${PORTSDIR}/audio/libogg
USE_BZIP2= yes
USE_GL= yes
USE_GMAKE= yes
-USE_GNOME= gnomehier gtk20 glib20 atk pango pkgconfig libxml2
+USE_GNOME= gnomehier glib20 pkgconfig libxml2
USE_SDL= sdl mixer
USE_X_PREFIX= yes
USE_GCC= 3.4+
@@ -41,9 +40,28 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-20060422
+OPTIONS= PLUGIN "Enable firefox plugin" off
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITH_PLUGIN)
+CONFIGURE_ARGS+= --disable-plugin
+PLIST_SUB+= PLUGIN="@comment "
+.else
+USE_GNOME+= atk pango gtk20
+LIB_DEPENDS+= gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
+PLIST_SUB+= PLUGIN=""
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/macros/*.m4
@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/macros/*.m4
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/macros/*.m4
+ @${REINPLACE_CMD} -e 's|^AM_LDFLAGS = \\|AM_LDFLAGS = $$(PTHREAD_LIBS) \\|' ${WRKSRC}/utilities/Makefile.am
+
+.if !defined(WITH_PLUGIN)
+post-configure:
+ @${REINPLACE_CMD} -e '/STD_DIRS/ s|plugin||' ${WRKSRC}/Makefile
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN gnash.old/pkg-plist gnash/pkg-plist
--- gnash.old/pkg-plist Sat Apr 22 16:33:58 2006
+++ gnash/pkg-plist Thu Apr 27 05:32:50 2006
@@ -1,7 +1,7 @@
bin/gnash
bin/gparser
bin/gprocessor
-lib/browser_plugins/libgnashplugin.so
+%%PLUGIN%%lib/browser_plugins/libgnashplugin.so
lib/gnash/libgnashasobjs.a
lib/gnash/libgnashasobjs.la
lib/gnash/libgnashasobjs.so
@@ -23,4 +23,4 @@
lib/gnash/libgnashserver.so
lib/gnash/libgnashserver.so.0
@dirrm lib/gnash
-@dirrmtry lib/browser_plugins
+%%PLUGIN%%@dirrmtry lib/browser_plugins
--- gnash.patch ends here ---
--
Best regards,
Dmitry mailto:amdmi3@mail.ru
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604270220.k3R2KHxw000441>