Date: Mon, 14 Jun 2010 20:40:03 GMT From: Anonymous <swell.k@gmail.com> To: gecko@FreeBSD.org Subject: Re: ports/146231: [feature request] www/firefox: use port libs Message-ID: <201006142040.o5EKe3nn076455@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/146231; it has been noted by GNATS.
From: Anonymous <swell.k@gmail.com>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/146231: [feature request] www/firefox: use port libs
Date: Tue, 15 Jun 2010 00:36:29 +0400
This should make more sense.
- move sqlite to bsd.gecko.mk [1]
- add bz2 and event [1]
- disable event, it's currently only useful for mercurial snapshots
- sort USE_MOZILLA
[1] may require other users of bsd.gecko.mk to fix their dependencies
--- a.diff begins here ---
Index: Mk/bsd.gecko.mk
===================================================================
RCS file: /a/.cvsup/ports/Mk/bsd.gecko.mk,v
retrieving revision 1.20
diff -u -p -r1.20 bsd.gecko.mk
--- Mk/bsd.gecko.mk 28 Mar 2010 06:30:26 -0000 1.20
+++ Mk/bsd.gecko.mk 14 Jun 2010 20:32:21 -0000
@@ -312,7 +312,9 @@ _${option}= ${TRUE}
.endfor
# Standard depends
-_ALL_DEPENDS= cairo dbm jpeg nspr nss png xft zip
+_ALL_DEPENDS= bz2 cairo dbm event jpeg nspr nss png sqlite xft zip
+
+bz2_MOZ_OPTIONS= --with-system-bz2=/usr
cairo_LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
cairo_MOZ_OPTIONS= --enable-system-cairo
@@ -320,6 +322,9 @@ cairo_EXTRACT_AFTER_ARGS= --exclude mozi
dbm_EXTRACT_AFTER_ARGS= --exclude mozilla/dbm
+event_LIB_DEPENDS= event-1.[0-9].3:${PORTSDIR}/devel/libevent
+event_MOZ_OPTIONS= --with-system-libevent=${LOCALBASE}
+
jpeg_LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE}
jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla/jpeg
@@ -333,11 +338,14 @@ nss_MOZ_OPTIONS= --with-system-nss
nss_CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss
nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
-
png_LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
png_MOZ_OPTIONS= --with-system-png=${LOCALBASE}
+sqlite_USE_SQLITE= yes
+sqlite_MOZ_OPTIONS= --enable-system-sqlite
+
xft_LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
+
zip_DEPENDS= zip:${PORTSDIR}/archivers/zip
.for use in ${USE_MOZILLA}
Index: www/firefox/Makefile
===================================================================
RCS file: /a/.cvsup/ports/www/firefox/Makefile,v
retrieving revision 1.223
diff -u -p -r1.223 Makefile
--- www/firefox/Makefile 6 Apr 2010 08:14:01 -0000 1.223
+++ www/firefox/Makefile 14 Jun 2010 20:11:35 -0000
@@ -21,7 +21,11 @@ BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/dev
USE_AUTOTOOLS= autoconf:213
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -png -nss -dbm -jpeg -xft
+.if defined(WITH_PORT_LIBS)
+USE_MOZILLA= -bz2 -dbm -event -jpeg -nss -png -sqlite -xft
+.else
+USE_MOZILLA= -dbm -event -xft
+.endif
MOZILLA_NAME= Firefox${MOZILLA_SUFX}
MOZILLA_SUFX= 3
MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
Index: www/firefox/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
===================================================================
RCS file: www/firefox/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
diff -N www/firefox/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/firefox/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp 25 May 2010 23:09:15 -0000
@@ -0,0 +1,11 @@
+--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp~
++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp
+@@ -135,7 +135,7 @@ NS_IMETHODIMP nsPNGEncoder::StartImageEn
+
+ // initialize
+ mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL,
++ NULL,
+ ErrorCallback,
+ ErrorCallback);
+ if (! mPNG)
--- a.diff ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006142040.o5EKe3nn076455>