Date: Fri, 8 Jun 2012 14:07:32 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r730 - in branches/experimental: mail/thunderbird mail/thunderbird-beta mail/thunderbird-esr mail/thunderbird3 mail/thunderbird3/files www/firefox www/firefox-beta www/firefox-esr www/firefox36 www/firefox36/files www/libxul www/seamonkey www/seamonkey-beta Message-ID: <201206081407.q58E7WNM047598@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Jun 8 14:07:32 2012
New Revision: 730
Log:
- enable system sqlite, except in kompozer;
depends on SECURE_DELETE, THREADSAFE, FTS3, UNLOCK_NOTIFY options (default)
- enable system libffi, except for kompozer, thunderbird3, firefox36
- enable system libpng, depends on APNG option (default)
- enable system libjpeg, can be replaced by API/ABI compatible libjpeg-turbo
Added:
branches/experimental/mail/thunderbird3/files/patch-mozilla-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
branches/experimental/mail/thunderbird3/files/patch-mozilla-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
Modified:
branches/experimental/mail/thunderbird-beta/Makefile
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird3/Makefile
branches/experimental/www/firefox-beta/Makefile
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox36/Makefile
branches/experimental/www/libxul/Makefile
branches/experimental/www/seamonkey-beta/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/mail/thunderbird-beta/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -25,7 +25,7 @@
USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
-USE_MOZILLA= -png -nss -dbm -jpeg -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -vpx
MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/mail/thunderbird-esr/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -26,7 +26,7 @@
LATEST_LINK= thunderbird-esr
USE_GECKO= gecko
CONFLICTS= thunderbird-1[1-9].*
-USE_MOZILLA= -png -nss -dbm -jpeg -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -vpx
MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/mail/thunderbird/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -25,7 +25,7 @@
USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
-USE_MOZILLA= -png -nss -dbm -jpeg -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -vpx
MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/mail/thunderbird3/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -21,7 +21,7 @@
USE_AUTOTOOLS= autoconf213
LATEST_LINK= thunderbird3
USE_GECKO= gecko
-USE_MOZILLA= -png -nss -dbm -jpeg -event -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -event -ffi -vpx
MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
Added: branches/experimental/mail/thunderbird3/files/patch-mozilla-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird3/files/patch-mozilla-modules-libpr0n-encoders-png-nsPNGDecoder.cpp Fri Jun 8 14:07:32 2012 (r730)
@@ -0,0 +1,74 @@
+--- mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp.orig 2009-05-02 18:39:49.000000000 +0200
++++ mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp 2012-05-09 13:14:57.000000000 +0200
+@@ -116,7 +116,7 @@ void nsPNGDecoder::CreateFrame(png_uint_
+ nsresult rv = mImage->AppendFrame(x_offset, y_offset, width, height, format,
+ &mImageData, &imageDataLength);
+ if (NS_FAILED(rv))
+- longjmp(mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++ longjmp(png_jmpbuf(mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+
+ mFrameRect.x = x_offset;
+ mFrameRect.y = y_offset;
+@@ -376,7 +376,7 @@ static NS_METHOD ReadDataOut(nsIInputStr
+ }
+
+ // we need to do the setjmp here otherwise bad things will happen
+- if (setjmp(decoder->mPNG->jmpbuf)) {
++ if (setjmp(png_jmpbuf(decoder->mPNG))) {
+ png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
+
+ decoder->mError = PR_TRUE;
+@@ -443,7 +443,8 @@ PNGGetColorProfile(png_structp png_ptr,
+ // First try to see if iCCP chunk is present
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
+ png_uint_32 profileLen;
+- char *profileData, *profileName;
++ unsigned char *profileData;
++ char *profileName;
+ int compression;
+
+ png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
+@@ -551,7 +552,7 @@ info_callback(png_structp png_ptr, png_i
+ /* limit image dimensions (bug #251381) */
+ #define MOZ_PNG_MAX_DIMENSION 1000000L
+ if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION)
+- longjmp(decoder->mPNG->jmpbuf, 1);
++ longjmp(png_jmpbuf(decoder->mPNG), 1);
+ #undef MOZ_PNG_MAX_DIMENSION
+
+ if (color_type == PNG_COLOR_TYPE_PALETTE)
+@@ -667,7 +668,7 @@ info_callback(png_structp png_ptr, png_i
+ // the image hasn't been inited yet
+ decoder->mImage->Init(width, height, decoder->mObserver);
+ } else if (containerWidth != PRInt32(width) || containerHeight != PRInt32(height)) {
+- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_UNEXPECTED
++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_UNEXPECTED
+ }
+
+ if (decoder->mObserver)
+@@ -693,14 +694,14 @@ info_callback(png_structp png_ptr, png_i
+ decoder->mCMSLine =
+ (PRUint8 *)nsMemory::Alloc(bpp[channels] * width);
+ if (!decoder->mCMSLine)
+- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+ }
+
+ if (interlace_type == PNG_INTERLACE_ADAM7) {
+ if (height < PR_INT32_MAX / (width * channels))
+ decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(channels * width * height);
+ if (!decoder->interlacebuf) {
+- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+ }
+ }
+
+@@ -920,7 +921,7 @@ void
+ error_callback(png_structp png_ptr, png_const_charp error_msg)
+ {
+ PR_LOG(gPNGLog, PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+
Added: branches/experimental/mail/thunderbird3/files/patch-mozilla-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird3/files/patch-mozilla-modules-libpr0n-encoders-png-nsPNGEncoder.cpp Fri Jun 8 14:07:32 2012 (r730)
@@ -0,0 +1,11 @@
+--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-03-28 13:48:53.000000000 +0200
++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-03-28 13:46:50.000000000 +0200
+@@ -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)
Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/www/firefox-beta/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -28,7 +28,7 @@
USE_GECKO= gecko
CONFLICTS= firefox-10.*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -png -nss -dbm -jpeg -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -vpx
MOZILLA_NAME= Firefox
MOZ_TOOLKIT= cairo-gtk2
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/www/firefox-esr/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -28,7 +28,7 @@
USE_GECKO= gecko
CONFLICTS= firefox-1[1-9].*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -png -nss -dbm -jpeg -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -vpx
MOZILLA_NAME= Firefox
MOZ_TOOLKIT= cairo-gtk2
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/www/firefox/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -27,7 +27,7 @@
USE_GECKO= gecko
CONFLICTS= firefox-10.*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -png -nss -dbm -jpeg -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -vpx
MOZILLA_NAME= Firefox
MOZ_TOOLKIT= cairo-gtk2
Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/www/firefox36/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -23,7 +23,7 @@
LATEST_LINK= firefox36
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -png -nss -dbm -jpeg -cairo -event -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -cairo -event -ffi -vpx
MOZILLA_NAME= Firefox${MOZILLA_SUFX}
MOZILLA_SUFX= 3
MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
Added: branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp Fri Jun 8 14:07:32 2012 (r730)
@@ -0,0 +1,74 @@
+--- modules/libpr0n/decoders/png/nsPNGDecoder.cpp.orig 2009-05-02 18:39:49.000000000 +0200
++++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp 2012-05-09 13:14:57.000000000 +0200
+@@ -116,7 +116,7 @@ void nsPNGDecoder::CreateFrame(png_uint_
+ nsresult rv = mImage->AppendFrame(x_offset, y_offset, width, height, format,
+ &mImageData, &imageDataLength);
+ if (NS_FAILED(rv))
+- longjmp(mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++ longjmp(png_jmpbuf(mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+
+ mFrameRect.x = x_offset;
+ mFrameRect.y = y_offset;
+@@ -376,7 +376,7 @@ static NS_METHOD ReadDataOut(nsIInputStr
+ }
+
+ // we need to do the setjmp here otherwise bad things will happen
+- if (setjmp(decoder->mPNG->jmpbuf)) {
++ if (setjmp(png_jmpbuf(decoder->mPNG))) {
+ png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
+
+ decoder->mError = PR_TRUE;
+@@ -443,7 +443,8 @@ PNGGetColorProfile(png_structp png_ptr,
+ // First try to see if iCCP chunk is present
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
+ png_uint_32 profileLen;
+- char *profileData, *profileName;
++ unsigned char *profileData;
++ char *profileName;
+ int compression;
+
+ png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
+@@ -551,7 +552,7 @@ info_callback(png_structp png_ptr, png_i
+ /* limit image dimensions (bug #251381) */
+ #define MOZ_PNG_MAX_DIMENSION 1000000L
+ if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION)
+- longjmp(decoder->mPNG->jmpbuf, 1);
++ longjmp(png_jmpbuf(decoder->mPNG), 1);
+ #undef MOZ_PNG_MAX_DIMENSION
+
+ if (color_type == PNG_COLOR_TYPE_PALETTE)
+@@ -667,7 +668,7 @@ info_callback(png_structp png_ptr, png_i
+ // the image hasn't been inited yet
+ decoder->mImage->Init(width, height, decoder->mObserver);
+ } else if (containerWidth != PRInt32(width) || containerHeight != PRInt32(height)) {
+- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_UNEXPECTED
++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_UNEXPECTED
+ }
+
+ if (decoder->mObserver)
+@@ -693,14 +694,14 @@ info_callback(png_structp png_ptr, png_i
+ decoder->mCMSLine =
+ (PRUint8 *)nsMemory::Alloc(bpp[channels] * width);
+ if (!decoder->mCMSLine)
+- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+ }
+
+ if (interlace_type == PNG_INTERLACE_ADAM7) {
+ if (height < PR_INT32_MAX / (width * channels))
+ decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(channels * width * height);
+ if (!decoder->interlacebuf) {
+- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+ }
+ }
+
+@@ -920,7 +921,7 @@ void
+ error_callback(png_structp png_ptr, png_const_charp error_msg)
+ {
+ PR_LOG(gPNGLog, PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
+- longjmp(png_ptr->jmpbuf, 1);
++ longjmp(png_jmpbuf(png_ptr), 1);
+ }
+
+
Added: branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp Fri Jun 8 14:07:32 2012 (r730)
@@ -0,0 +1,11 @@
+--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-03-28 13:48:53.000000000 +0200
++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-03-28 13:46:50.000000000 +0200
+@@ -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)
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/www/libxul/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -47,7 +47,7 @@
USE_GECKO= gecko
MOZILLA_EXEC_NAME=xulrunner
MOZ_TOOLKIT= cairo-gtk2
-USE_MOZILLA= -png -nss -dbm -jpeg -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -vpx
MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js mozilla-nss \
mozilla-plugin
Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/www/seamonkey-beta/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -48,7 +48,7 @@
--disable-necko-wifi \
--disable-updater
-USE_MOZILLA= -png -nss -dbm -jpeg -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -vpx
MOZ_TOOLKIT= cairo-gtk2
MOZILLA_PLIST_DIRS= bin lib
MOZ_PKGCONFIG_FILES=
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Fri Jun 8 14:06:11 2012 (r729)
+++ branches/experimental/www/seamonkey/Makefile Fri Jun 8 14:07:32 2012 (r730)
@@ -48,7 +48,7 @@
--disable-necko-wifi \
--disable-updater
-USE_MOZILLA= -png -nss -dbm -jpeg -ffi -sqlite -vpx
+USE_MOZILLA= -nss -dbm -vpx
MOZ_TOOLKIT= cairo-gtk2
MOZILLA_PLIST_DIRS= bin lib
MOZ_PKGCONFIG_FILES=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206081407.q58E7WNM047598>