cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chase mozilla-firefox update and bump xulrunner to 1.9.2.9.

Browse Source 
Switch to use internal sqlite as now mozilla needs SQLITE_SECURE_DELETE
set, and there's no way we're going to do that with systemwide sqlite.
This commit is contained in:
landry 2010-09-12 17:58:51 +00:00
parent 5f8a1719d1
commit b377bfd9c7
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/xulrunner/1.8/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2010/07/11 14:55:56 landry Exp $ # $OpenBSD: Makefile,v 1.5 2010/09/12 17:58:51 landry Exp $
VERSION= 1.8.1.19 VERSION= 1.8.1.19
REVISION-main= 5 REVISION-main= 5
@ -15,6 +15,7 @@ SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor .endfor
CONFIGURE_ARGS+= --with-system-png=${LOCALBASE} \ CONFIGURE_ARGS+= --with-system-png=${LOCALBASE} \
--enable-system-sqlite \
--enable-default-toolkit=gtk2 --enable-default-toolkit=gtk2
MOB= ${WRKSRC}/dist/bin MOB= ${WRKSRC}/dist/bin

14
devel/xulrunner/1.9/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.20 2010/07/25 21:39:20 landry Exp $ # $OpenBSD: Makefile,v 1.21 2010/09/12 17:58:51 landry Exp $
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
VERSION= 1.9.2.8 VERSION= 1.9.2.9
FFX_VERSION= 3.6.8 FFX_VERSION= 3.6.9
DIRECTORY= xulrunner1.9 DIRECTORY= xulrunner1.9
# needed for mozilla.port.mk # needed for mozilla.port.mk
MOZILLA_PROJECT= xulrunner1.9 MOZILLA_PROJECT= xulrunner1.9
@ -12,10 +12,10 @@ DISTFILES= firefox-${FFX_VERSION}.source.tar.bz2
MASTER_SITES= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${FFX_VERSION}/source/ MASTER_SITES= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${FFX_VERSION}/source/
SO_VERSION= 3.0 SO_VERSION= 3.1
# NOTE: Must bump minor version if any shlib's are removed from the # NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues. # components dir to avoid pkg_add -r issues.
.for _lib in imgicon mozjs xpcom xul nullplugin unixprintplugin .for _lib in imgicon mozjs xpcom xul sqlite3 nullplugin unixprintplugin
SHARED_LIBS+= ${_lib} ${SO_VERSION} SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor .endfor
@ -35,13 +35,13 @@ MODULES+= lang/python
MODPY_RUNDEP= No MODPY_RUNDEP= No
CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 \ CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 \
--disable-system-sqlite \
--disable-crashreporter \ --disable-crashreporter \
--disable-ipc \ --disable-ipc \
--disable-libnotify \ --disable-libnotify \
--disable-necko-wifi --disable-necko-wifi
LIB_DEPENDS+= :sqlite3->=3.6.10:databases/sqlite3
WANTLIB-devel+= gthread-2.0 gobject-2.0 WANTLIB-devel+= gthread-2.0 gobject-2.0
WANTLIB-main+= sndio sqlite3.>=13.0 WANTLIB-main+= sndio
MOB= ${WRKSRC}/dist/bin MOB= ${WRKSRC}/dist/bin
MOZ= ${PREFIX}/${DIRECTORY} MOZ= ${PREFIX}/${DIRECTORY}

10
devel/xulrunner/1.9/distinfo
View File

@ -1,5 +1,5 @@
MD5 (firefox-3.6.8.source.tar.bz2) = DuXxT9i+B1E9FhMQJ+vLYQ== MD5 (firefox-3.6.9.source.tar.bz2) = EA7K/WxsUGK8A7svtlH8Fw==
RMD160 (firefox-3.6.8.source.tar.bz2) = FOJFxkPUGh2iX+TbwV1q5Gahnls= RMD160 (firefox-3.6.9.source.tar.bz2) = UwsdZMwCugQzw6OdHJfFadrQkO8=
SHA1 (firefox-3.6.8.source.tar.bz2) = STblQ/bHSSxZVMvVsw3dprION5c= SHA1 (firefox-3.6.9.source.tar.bz2) = JCkVTI1Qu17u+AIztW+ybc9yfqM=
SHA256 (firefox-3.6.8.source.tar.bz2) = /GCcxqDdqiqevYUR7DmuSkBOEQehLgeyM+KvylHZoQ4= SHA256 (firefox-3.6.9.source.tar.bz2) = n38J4tBkpYNdcZzLWacNLTKhhg9ny5zIjEtpNmhYBQM=
SIZE (firefox-3.6.8.source.tar.bz2) = 51238976 SIZE (firefox-3.6.9.source.tar.bz2) = 51240588

4
devel/xulrunner/1.9/pkg/PLIST-devel
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-devel,v 1.8 2010/07/22 21:43:01 landry Exp $ @comment $OpenBSD: PLIST-devel,v 1.9 2010/09/12 17:58:51 landry Exp $
@option no-default-conflict @option no-default-conflict
@conflict xulrunner-devel->=1.9,<1.9.1 @conflict xulrunner-devel->=1.9,<1.9.1
%%jit%% %%jit%%
@ -1657,6 +1657,7 @@ ${MOZILLA_PROJECT}/include/nsIContentSerializer.h
${MOZILLA_PROJECT}/include/nsIContentSink.h ${MOZILLA_PROJECT}/include/nsIContentSink.h
${MOZILLA_PROJECT}/include/nsIContentSniffer.h ${MOZILLA_PROJECT}/include/nsIContentSniffer.h
${MOZILLA_PROJECT}/include/nsIContentURIGrouper.h ${MOZILLA_PROJECT}/include/nsIContentURIGrouper.h
${MOZILLA_PROJECT}/include/nsIContentUtils.h
${MOZILLA_PROJECT}/include/nsIContentViewer.h ${MOZILLA_PROJECT}/include/nsIContentViewer.h
${MOZILLA_PROJECT}/include/nsIContentViewerContainer.h ${MOZILLA_PROJECT}/include/nsIContentViewerContainer.h
${MOZILLA_PROJECT}/include/nsIContentViewerEdit.h ${MOZILLA_PROJECT}/include/nsIContentViewerEdit.h
@ -3005,6 +3006,7 @@ ${MOZILLA_PROJECT}/include/rdf.h
${MOZILLA_PROJECT}/include/rdfIDataSource.h ${MOZILLA_PROJECT}/include/rdfIDataSource.h
${MOZILLA_PROJECT}/include/rdfISerializer.h ${MOZILLA_PROJECT}/include/rdfISerializer.h
${MOZILLA_PROJECT}/include/rdfITripleVisitor.h ${MOZILLA_PROJECT}/include/rdfITripleVisitor.h
${MOZILLA_PROJECT}/include/sqlite3.h
${MOZILLA_PROJECT}/include/std_semaphore.h ${MOZILLA_PROJECT}/include/std_semaphore.h
${MOZILLA_PROJECT}/include/stopwatch.h ${MOZILLA_PROJECT}/include/stopwatch.h
${MOZILLA_PROJECT}/include/string-template-def-char.h ${MOZILLA_PROJECT}/include/string-template-def-char.h

3
devel/xulrunner/1.9/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2010/07/09 16:38:58 landry Exp $ @comment $OpenBSD: PLIST-main,v 1.6 2010/09/12 17:58:51 landry Exp $
@option no-default-conflict @option no-default-conflict
@conflict xulrunner->=1.9,<1.9.1 @conflict xulrunner->=1.9,<1.9.1
@unexec xulrunner1.9 --unregister-global @unexec xulrunner1.9 --unregister-global
@ -218,6 +218,7 @@ ${MOZILLA_PROJECT}/greprefs/xpinstall.js
${MOZILLA_PROJECT}/icons/ ${MOZILLA_PROJECT}/icons/
${MOZILLA_PROJECT}/icons/document.png ${MOZILLA_PROJECT}/icons/document.png
@lib ${MOZILLA_PROJECT}/libmozjs.so.${LIBmozjs_VERSION} @lib ${MOZILLA_PROJECT}/libmozjs.so.${LIBmozjs_VERSION}
@lib ${MOZILLA_PROJECT}/libsqlite3.so.${LIBsqlite3_VERSION}
@lib ${MOZILLA_PROJECT}/libxpcom.so.${LIBxpcom_VERSION} @lib ${MOZILLA_PROJECT}/libxpcom.so.${LIBxpcom_VERSION}
@lib ${MOZILLA_PROJECT}/libxul.so.${LIBxul_VERSION} @lib ${MOZILLA_PROJECT}/libxul.so.${LIBxul_VERSION}
${MOZILLA_PROJECT}/modules/ ${MOZILLA_PROJECT}/modules/

3
devel/xulrunner/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.7 2010/07/11 14:55:56 landry Exp $ # $OpenBSD: Makefile.inc,v 1.8 2010/09/12 17:58:51 landry Exp $
# #
# For legacy reasons (smooth updates), directory is xulrunner. # For legacy reasons (smooth updates), directory is xulrunner.
@ -87,7 +87,6 @@ CONFIGURE_ARGS+= --with-system-jpeg=${LOCALBASE} \
--enable-svg \ --enable-svg \
--enable-svg-renderer=cairo \ --enable-svg-renderer=cairo \
--enable-system-cairo \ --enable-system-cairo \
--enable-system-sqlite \
--enable-canvas \ --enable-canvas \
--enable-application=xulrunner \ --enable-application=xulrunner \
--enable-extensions=default,cookie,permissions --enable-extensions=default,cookie,permissions