Attachment 131559 Details for Bug 175644 – file.diff

[patch] file.diff

file.diff (text/plain), 1.62 KB, created by Alexey Dokuchaev on 2013-01-28 08:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Dokuchaev

Created: 2013-01-28 08:30:00 UTC

Size: 1.62 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 310911)
>+++ Makefile	(working copy)
>@@ -10,7 +10,6 @@
> COMMENT=	Qt4 WebKit engine
> 
> USE_GNOME=	glib20
>-USE_GSTREAMER=	yes
> USE_QT4=	corelib declarative gui network \
> 		qmake_build moc_build rcc_build
> QT_NONSTANDARD=	yes
>@@ -44,8 +43,19 @@
> 
> EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
> 
>+OPTIONS_DEFINE=	GSTREAMER
>+OPTIONS_DEFAULT=	GSTREAMER
>+
>+GSTREAMER_DESC=	HTML5 audio and video support
>+
> .include <bsd.port.pre.mk>
> 
>+.if ${PORT_OPTIONS:MGSTREAMER}
>+USE_GSTREAMER=	yes
>+.else
>+CONFIGURE_ARGS+=	-no-gstreamer
>+.endif
>+
> # Base ld(1) segfaults on PowerPC:
> # http://bugs.freebsd.org/173042
> .if ${ARCH} == "powerpc"
>@@ -57,8 +67,7 @@
> 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
> 	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
> 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
>-	# Avoid building and installing several tests. Should this be
>-	# made an option?
>+# Avoid building and installing several tests. Should this be made an option?
> 	${REINPLACE_CMD} -e '/WebKit\/qt\/tests/ d' \
> 		${BUILD_WRKSRC}/WebKit.pro
> 
>@@ -76,7 +85,7 @@
> 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
> 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
> 		${WRKSRC}/lib/pkgconfig/QtWebKit.pc
>-	# QtWebKit is statically linked with jscore, remove the latest.
>+# QtWebKit is statically linked with jscore, remove the latest.
> 	${REINPLACE_CMD} -e 's|-L../JavaScriptCore/release||; s|-ljscore||' \
> 		${WRKSRC}/lib/pkgconfig/QtWebKit.pc \
> 		${WRKSRC}/lib/libQtWebKit.la

Actions: View | Diff

Attachments on bug 175644: 131559