Date: Sat, 31 Aug 2013 15:20:12 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1344 - in trunk: mail/linux-thunderbird mail/thunderbird www/firefox www/firefox-nightly www/firefox-nightly/files www/linux-firefox Message-ID: <201308311520.r7VFKCIQ051336@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Aug 31 15:20:11 2013 New Revision: 1344 Log: update and switch Nightly to inbound branch Note, when using `make update' don't forget to keep an eye on https://tbpl.mozilla.org/?tree=Mozilla-Inbound # official http://buildbot.rhaalovely.net/one_line_per_build # bsd http://mozillaproject.osuosl.org:8010/one_line_per_build # linux ppc64 Deleted: trunk/www/firefox-nightly/files/patch-bug876156 trunk/www/firefox-nightly/files/patch-bug910875 Modified: trunk/mail/linux-thunderbird/Makefile trunk/mail/linux-thunderbird/distinfo trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/distinfo trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/linux-firefox/Makefile trunk/www/linux-firefox/distinfo Modified: trunk/mail/linux-thunderbird/Makefile ============================================================================== --- trunk/mail/linux-thunderbird/Makefile Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/mail/linux-thunderbird/Makefile Sat Aug 31 15:20:11 2013 (r1344) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 24.0b1 +DISTVERSION= 24.0b2 CATEGORIES= mail DISTNAME= ${PORTNAME}-${DISTVERSION} MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US Modified: trunk/mail/linux-thunderbird/distinfo ============================================================================== --- trunk/mail/linux-thunderbird/distinfo Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/mail/linux-thunderbird/distinfo Sat Aug 31 15:20:11 2013 (r1344) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-24.0b1.tar.bz2) = 82c51452abe328b6d8d1ea15bf75a0823220aee472d01955ea4a5c2cff2d47fe -SIZE (thunderbird-24.0b1.tar.bz2) = 28998133 +SHA256 (thunderbird-24.0b2.tar.bz2) = 3f08922e4642bdfe007470537f8c1ceb3db01c326bc024009cba4a212af242fe +SIZE (thunderbird-24.0b2.tar.bz2) = 28996852 Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/mail/thunderbird/Makefile Sat Aug 31 15:20:11 2013 (r1344) @@ -2,7 +2,7 @@ # $FreeBSD: head/mail/thunderbird/Makefile 324744 2013-08-14 22:35:50Z ak $ PORTNAME= thunderbird -DISTVERSION= 24.0b1 +DISTVERSION= 24.0b2 CATEGORIES= mail ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} Modified: trunk/mail/thunderbird/distinfo ============================================================================== --- trunk/mail/thunderbird/distinfo Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/mail/thunderbird/distinfo Sat Aug 31 15:20:11 2013 (r1344) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-24.0b1.source.tar.bz2) = 2cea1f9be8497a01607272b8a7a08bdb7f0310d29bc3f91659017c869ca88125 -SIZE (thunderbird-24.0b1.source.tar.bz2) = 140459430 +SHA256 (thunderbird-24.0b2.source.tar.bz2) = bfbd85af55c43ff9fe9842142cd68067a93ac2de0c6e92ead6e5d0506a97d579 +SIZE (thunderbird-24.0b2.source.tar.bz2) = 139997053 SHA256 (enigmail-1.5.2.tar.gz) = f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26 SIZE (enigmail-1.5.2.tar.gz) = 1211395 Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/www/firefox-nightly/Makefile Sat Aug 31 15:20:11 2013 (r1344) @@ -5,7 +5,7 @@ PORTVERSION= 26.0.${HGREV:C/:.*//} PORTEPOCH= 1 CATEGORIES= www ipv6 -MASTER_SITES= https://hg.mozilla.org/mozilla-central/archive/ +MASTER_SITES= https://hg.mozilla.org/integration/mozilla-inbound/archive/ PKGNAMESUFFIX= ${MOZILLA_SUFX} DISTNAME= ${HGREV:C/.*://} DIST_SUBDIR= ${MOZILLA} Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/www/firefox-nightly/Makefile.hgrev Sat Aug 31 15:20:11 2013 (r1344) @@ -1 +1 @@ -HGREV= 144701:dc7b76fcf7e4 +HGREV= 145161:b24700fc8592 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/www/firefox-nightly/distinfo Sat Aug 31 15:20:11 2013 (r1344) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/dc7b76fcf7e4.tar.bz2) = f524095ec992ba45acf7984e8ca1ac9a25d8eef1f8991d44cf1c47535493b5a6 -SIZE (firefox-nightly/dc7b76fcf7e4.tar.bz2) = 125427736 +SHA256 (firefox-nightly/b24700fc8592.tar.bz2) = 4663964d7939862a1476b1a876ca54f0d3330e6f747a9a277eeab2485d15c635 +SIZE (firefox-nightly/b24700fc8592.tar.bz2) = 125131288 Deleted: trunk/www/firefox-nightly/files/patch-bug876156 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug876156 Sat Aug 31 15:20:11 2013 (r1343) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ -diff --git mfbt/Atomics.h mfbt/Atomics.h -index d79af6c..40b9336 100644 ---- mfbt/Atomics.h -+++ mfbt/Atomics.h -@@ -35,7 +35,7 @@ - */ - # if !defined(__linux__) && !defined(__OpenBSD__) && \ - (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && \ -- __has_include(<atomic>) -+ __has_include_next(<atomic>) - # define MOZ_HAVE_CXX11_ATOMICS - # endif - /* Deleted: trunk/www/firefox-nightly/files/patch-bug910875 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug910875 Sat Aug 31 15:20:11 2013 (r1343) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,96 +0,0 @@ -diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -index f231b1e..6087696 100644 ---- media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -+++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -@@ -16,7 +16,9 @@ - #include <assert.h> - #include <string.h> - --#if defined(_WIN32) -+#if defined(WEBRTC_DUMMY_AUDIO_BUILD) -+// do not include platform specific headers -+#elif defined(_WIN32) - #include "audio_device_utility_win.h" - #include "audio_device_wave_win.h" - #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) -@@ -37,11 +39,8 @@ - #include <stdlib.h> - #include "audio_device_utility_android.h" - #include "audio_device_jni_android.h" --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - #include "audio_device_utility_linux.h" -- #if defined(LINUX_ALSA) -- #include "audio_device_alsa_linux.h" -- #endif - #elif defined(WEBRTC_IOS) - #include "audio_device_utility_ios.h" - #include "audio_device_ios.h" -@@ -49,6 +48,9 @@ - #include "audio_device_utility_mac.h" - #include "audio_device_mac.h" - #endif -+#if defined(LINUX_ALSA) -+ #include "audio_device_alsa_linux.h" -+#endif - #if defined(LINUX_PULSE) - #include "audio_device_pulse_linux.h" - #endif -@@ -166,7 +168,7 @@ int32_t AudioDeviceModuleImpl::CheckPlatform() - #elif defined(WEBRTC_ANDROID) - platform = kPlatformAndroid; - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is ANDROID"); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - platform = kPlatformLinux; - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is LINUX"); - #elif defined(WEBRTC_IOS) -@@ -309,7 +311,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() - - // Create the *Linux* implementation of the Audio Device - // --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - if ((audioLayer == kLinuxPulseAudio) || (audioLayer == kPlatformDefaultAudio)) - { - #if defined(LINUX_PULSE) -@@ -355,7 +357,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() - // - ptrAudioDeviceUtility = new AudioDeviceUtilityLinux(Id()); - } --#endif // #if defined(WEBRTC_LINUX) -+#endif // #if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - - // Create the *iPhone* implementation of the Audio Device - // -diff --git media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -index defd7f8..906c4a2 100644 ---- media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -+++ media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -@@ -197,7 +197,7 @@ class AudioDeviceAPITest: public testing::Test { - // Create default implementation instance - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( - kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( - kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL); - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( -@@ -1690,7 +1690,7 @@ TEST_F(AudioDeviceAPITest, CPULoad) { - - // TODO(kjellander): Fix flakiness causing failures on Windows. - // TODO(phoglund): Fix flakiness causing failures on Linux. --#if !defined(_WIN32) && !defined(WEBRTC_LINUX) -+#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - TEST_F(AudioDeviceAPITest, StartAndStopRawOutputFileRecording) { - // NOTE: this API is better tested in a functional test - CheckInitialPlayoutStates(); -@@ -1759,7 +1759,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRawInputFileRecording) { - // - size of raw_input_not_recording.pcm shall be 0 - // - size of raw_input_not_recording.pcm shall be > 0 - } --#endif // !WIN32 && !WEBRTC_LINUX -+#endif // !WIN32 && !WEBRTC_LINUX && !defined(WEBRTC_BSD) - - TEST_F(AudioDeviceAPITest, RecordingSampleRate) { - uint32_t sampleRate(0); Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/www/firefox/Makefile Sat Aug 31 15:20:11 2013 (r1344) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 24.0b6 +DISTVERSION= 24.0b7 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/www/firefox/distinfo Sat Aug 31 15:20:11 2013 (r1344) @@ -1,2 +1,2 @@ -SHA256 (firefox-24.0b6.source.tar.bz2) = d09da384304616b58a70b260779c007416b645c82071aa96a631283a5bb82c58 -SIZE (firefox-24.0b6.source.tar.bz2) = 119733711 +SHA256 (firefox-24.0b7.source.tar.bz2) = f7b505d83cbc2fadbad203d3429d43bff8cd8b8af529d2e05e78c9a6a4e2eb8a +SIZE (firefox-24.0b7.source.tar.bz2) = 119767637 Modified: trunk/www/linux-firefox/Makefile ============================================================================== --- trunk/www/linux-firefox/Makefile Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/www/linux-firefox/Makefile Sat Aug 31 15:20:11 2013 (r1344) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/linux-firefox/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= firefox -DISTVERSION= 24.0b6 +DISTVERSION= 24.0b7 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US Modified: trunk/www/linux-firefox/distinfo ============================================================================== --- trunk/www/linux-firefox/distinfo Sat Aug 31 15:20:02 2013 (r1343) +++ trunk/www/linux-firefox/distinfo Sat Aug 31 15:20:11 2013 (r1344) @@ -1,2 +1,2 @@ -SHA256 (firefox-24.0b6.tar.bz2) = 967a052ba9ed2b492ff4884771ee60671854723a1a702ead7f2ef6ff00ebfb56 -SIZE (firefox-24.0b6.tar.bz2) = 29035269 +SHA256 (firefox-24.0b7.tar.bz2) = 7bb11313be1f568d87548ee504471bc3edb59e5f97e67c5a81b04b2a7e71bf40 +SIZE (firefox-24.0b7.tar.bz2) = 28911718
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308311520.r7VFKCIQ051336>