Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (98416d7101b5f83efe23c086e47224a4bb03c096)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (98416d7101b5f83efe23c086e47224a4bb03c096)
  • Date: Thu, 19 Mar 2015 02:31:08 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

http/firefox/HISTORY | 5 +
http/firefox/Makefile.in-pgo.patch | 10 ---
http/firefox/PRE_BUILD | 10 +--
http/firefox/bug999496_change1f10a8067853.patch | 67
------------------------
http/firefox/mozconfig | 1
5 files changed, 9 insertions(+), 84 deletions(-)

New commits:
commit 50ad1fd98591b9dc5ddead9f5e7d725f69dde833
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

firefox: only disable tests if pgo is not enabled
mozconfig: remove --disable-tests, pgo requires it
Makefile.in-pgo.patch, bug999496_change1f10a8067853.patch: removed, no
longer applies

diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index d737694..c8486b9 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2015-03-19 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: only disable tests if pgo is not enabled
+ * mozconfig: remove --disable-tests, pgo requires it
+ * Makefile.in-pgo.patch, bug999496_change1f10a8067853.patch: removed,
no longer applies
+
2015-03-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 36.0.1, SECURITY_PATCH++
* BUILD: yet another fix of LDFLAGS
diff --git a/http/firefox/Makefile.in-pgo.patch
b/http/firefox/Makefile.in-pgo.patch
deleted file mode 100644
index 3679dd9..0000000
--- a/http/firefox/Makefile.in-pgo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.old 2014-01-27 08:45:10.795890277 +1300
-+++ Makefile.in 2014-01-27 08:51:22.170242862 +1300
-@@ -205,3 +205,7 @@
- $(call SUBMAKE,$@,js/src)
- endif
- endif
-+
-+
-+pgo-profile-run:
-+ $(PYTHON) $(topsrcdir)/build/pgo/profileserver.py $(EXTRA_TEST_ARGS)
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index bb6aa37..4c4555a 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -25,9 +25,7 @@ if [[ $FIREFOX_OFFICIAL == y ]]; then
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"
+ echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON)
\$(OBJDIR)/_profile/pgo/profileserver.py'" >> .mozconfig
+else
+ echo "ac_add_options --disable-tests" >> .mozconfig
+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
-
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
index 2fea2e9..a9929e4 100644
--- a/http/firefox/mozconfig
+++ b/http/firefox/mozconfig
@@ -13,7 +13,6 @@ ac_add_options --with-pthreads
ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
-ac_add_options --disable-tests
ac_add_options --prefix=$INSTALL_ROOT/usr
ac_add_options --mandir=$INSTALL_ROOT/usr
ac_add_options --enable-optimize="$CFLAGS -fno-fast-math"



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (98416d7101b5f83efe23c086e47224a4bb03c096), Sukneet Basuta, 03/19/2015

Archive powered by MHonArc 2.6.24.

Top of Page