Date: Tue, 26 Jan 2010 03:42:16 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r255 - in branches/experimental: mail/thunderbird3-devel mail/thunderbird3-devel/files www/libxul-devel www/libxul-devel/files Message-ID: <201001260342.o0Q3gG98024603@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Tue Jan 26 03:42:16 2010
New Revision: 255
Log:
- Disable updater by default for -devel ports in the experimental branch
Deleted:
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp
branches/experimental/www/libxul-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp
Modified:
branches/experimental/mail/thunderbird3-devel/Makefile
branches/experimental/www/libxul-devel/Makefile
Modified: branches/experimental/mail/thunderbird3-devel/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3-devel/Makefile Mon Jan 25 16:15:37 2010 (r254)
+++ branches/experimental/mail/thunderbird3-devel/Makefile Tue Jan 26 03:42:16 2010 (r255)
@@ -40,7 +40,7 @@
MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--enable-single-profile --disable-profilesharing \
--enable-application=mail --enable-official-branding \
- --disable-necko-wifi
+ --disable-updater --disable-necko-wifi
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZILLA_PLIST_DIRS= bin lib
Deleted: branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp
==============================================================================
--- branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp Tue Jan 26 03:42:16 2010 (r254)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.orig 2009-09-16 04:41:19.000000000 +0200
-+++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp 2009-09-18 01:49:47.000000000 +0200
-@@ -511,7 +511,7 @@
- struct stat ss;
-
- AutoFile sfile = NS_tfopen(spath, NS_T("rb"));
-- if (sfile == NULL || fstat(fileno(sfile), &ss)) {
-+ if (sfile == NULL || fstat(fileno((FILE*)sfile), &ss)) {
- LOG(("copy_file: failed to open or stat: %p," LOG_S ",%d\n", sfile.get(), spath, errno));
- return READ_ERROR;
- }
-@@ -1660,7 +1660,7 @@
- return READ_ERROR;
-
- struct stat ms;
-- rv = fstat(fileno(mfile), &ms);
-+ rv = fstat(fileno((FILE*)mfile), &ms);
- if (rv)
- return READ_ERROR;
-
Modified: branches/experimental/www/libxul-devel/Makefile
==============================================================================
--- branches/experimental/www/libxul-devel/Makefile Mon Jan 25 16:15:37 2010 (r254)
+++ branches/experimental/www/libxul-devel/Makefile Tue Jan 26 03:42:16 2010 (r255)
@@ -39,7 +39,8 @@
PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig
MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--disable-javaxpcom --enable-canvas \
- --enable-system-cairo --disable-necko-wifi
+ --enable-system-cairo --disable-updater \
+ --disable-necko-wifi
MOZ_EXTENSIONS= default,cookie,permissions
OPTIONS= # Empty, used for generic gecko OPTIONS
USE_GECKO_OPTIONS= java debug logging optimized_cflags
Deleted: branches/experimental/www/libxul-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp
==============================================================================
--- branches/experimental/www/libxul-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp Tue Jan 26 03:42:16 2010 (r254)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- toolkit/mozapps/update/src/updater/updater.cpp.orig 2009-09-16 04:41:19.000000000 +0200
-+++ toolkit/mozapps/update/src/updater/updater.cpp 2009-09-18 01:49:47.000000000 +0200
-@@ -511,7 +511,7 @@
- struct stat ss;
-
- AutoFile sfile = NS_tfopen(spath, NS_T("rb"));
-- if (sfile == NULL || fstat(fileno(sfile), &ss)) {
-+ if (sfile == NULL || fstat(fileno((FILE*)sfile), &ss)) {
- LOG(("copy_file: failed to open or stat: %p," LOG_S ",%d\n", sfile.get(), spath, errno));
- return READ_ERROR;
- }
-@@ -1660,7 +1660,7 @@
- return READ_ERROR;
-
- struct stat ms;
-- rv = fstat(fileno(mfile), &ms);
-+ rv = fstat(fileno((FILE*)mfile), &ms);
- if (rv)
- return READ_ERROR;
-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001260342.o0Q3gG98024603>