Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (af5ac42b5d160d8d28b862c2f5a866996e1a68f0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (af5ac42b5d160d8d28b862c2f5a866996e1a68f0)
  • Date: Tue, 2 Sep 2014 19:46:59 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

http/firefox/DETAILS | 6 +-
http/firefox/HISTORY | 4 +
http/firefox/PRE_BUILD | 5 -
http/firefox/bug999496_change1f10a8067853.patch | 67
------------------------
4 files changed, 8 insertions(+), 74 deletions(-)

New commits:
commit af5ac42b5d160d8d28b862c2f5a866996e1a68f0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

firefox 32.0, SECURITY_PATCH=75

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 1a12974..8f78579 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,11 +1,11 @@
SPELL=firefox
- VERSION=31.0
+ VERSION=32.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:43e8f538591afde4c1bb4f0651df32a77456c5445204d0538d90112258e1f2cc90b822777799b96b97682b8fc1d8b5648dd3e3648a9392db0dc432c1e8520c85
+
SOURCE_HASH=sha512:e9422c92846bda9dfa4da914be1206c41a8edde7e8bb13d81211433fc2c9013bbaee9bded40f7acf031d675272b04d7902d5631d2932daa3a8a594f768c87974

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
- SECURITY_PATCH=74
+ SECURITY_PATCH=75
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 12e74b1..95155ac 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2014-09-03 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 32.0, SECURITY_PATCH=75
+ * PRE_BUILD, bug999496_change1f10a8067853.patch: patch removed
+
2014-08-28 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, bug999496_change1f10a8067853.patch: fix build with gcc
4.9

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index bb6aa37..db7ca75 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -27,7 +27,4 @@ fi &&
if [[ $FIREFOX_PGO == y ]]; then
echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON)
\$(OBJDIR)/_profile/pgo/profileserver.py'" >> .mozconfig &&
patch -p0 < ${SPELL_DIRECTORY}/Makefile.in-pgo.patch
-fi &&
-# Fix from mozilla scm for gcc 4.9 build (weird missing symbol
-# / relocation error). Probably to be removed for version 32.
-patch -p1 < "$SCRIPT_DIRECTORY/bug999496_change1f10a8067853.patch"
+fi
diff --git a/http/firefox/bug999496_change1f10a8067853.patch
b/http/firefox/bug999496_change1f10a8067853.patch
deleted file mode 100644
index abb9671..0000000
--- a/http/firefox/bug999496_change1f10a8067853.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-
-# HG changeset patch
-# User Simon Wilper <sxw AT cpan.org>
-# Date 1400002680 -43200
-# Node ID 1f10a80678532ff186f314bb98050fd81f22a7fe
-# Parent a54ace627db8f12a9b2c5d3b60a675576887c445
-Bug 999496 - Move AudioData::SizeOfIncludingThis to MediaData.cpp. r=kinetik
-
-diff --git a/content/media/MediaData.cpp b/content/media/MediaData.cpp
---- a/content/media/MediaData.cpp
-+++ b/content/media/MediaData.cpp
-@@ -33,16 +33,26 @@ AudioData::EnsureAudioBuffer()
- AudioDataValue* data = static_cast<AudioDataValue*>(mAudioBuffer->Data());
- for (uint32_t i = 0; i < mFrames; ++i) {
- for (uint32_t j = 0; j < mChannels; ++j) {
- data[j*mFrames + i] = mAudioData[i*mChannels + j];
- }
- }
- }
-
-+size_t
-+AudioData::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
-+{
-+ size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
-+ if (mAudioBuffer) {
-+ size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
-+ }
-+ return size;
-+}
-+
- static bool
- ValidatePlane(const VideoData::YCbCrBuffer::Plane& aPlane)
- {
- return aPlane.mWidth <= PlanarYCbCrImage::MAX_DIMENSION &&
- aPlane.mHeight <= PlanarYCbCrImage::MAX_DIMENSION &&
- aPlane.mWidth * aPlane.mHeight < MAX_VIDEO_WIDTH *
MAX_VIDEO_HEIGHT &&
- aPlane.mStride > 0;
- }
-diff --git a/content/media/MediaData.h b/content/media/MediaData.h
---- a/content/media/MediaData.h
-+++ b/content/media/MediaData.h
-@@ -75,23 +75,17 @@ public:
- MOZ_COUNT_CTOR(AudioData);
- }
-
- ~AudioData()
- {
- MOZ_COUNT_DTOR(AudioData);
- }
-
-- size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const {
-- size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
-- if (mAudioBuffer) {
-- size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
-- }
-- return size;
-- }
-+ size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
-
- // If mAudioBuffer is null, creates it from mAudioData.
- void EnsureAudioBuffer();
-
- const uint32_t mFrames;
- const uint32_t mChannels;
- // At least one of mAudioBuffer/mAudioData must be non-null.
- // mChannels channels, each with mFrames frames
-



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (af5ac42b5d160d8d28b862c2f5a866996e1a68f0), Ladislav Hagara, 09/02/2014

Archive powered by MHonArc 2.6.24.

Top of Page