Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4bd19b334846e3f74703fe0dae8e392f4b689a8a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4bd19b334846e3f74703fe0dae8e392f4b689a8a)
  • Date: Wed, 14 Oct 2015 15:40:10 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:


mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
| 15 --
mail/thunderbird/0002-1f10a8067853.patch
| 67 ----------
mail/thunderbird/DETAILS
| 7 -
mail/thunderbird/HISTORY
| 6
mail/thunderbird/PRE_BUILD
| 2
5 files changed, 8 insertions(+), 89 deletions(-)

New commits:
commit 4bd19b334846e3f74703fe0dae8e392f4b689a8a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

thunderbird: version 38.0.1

diff --git
a/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch

b/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
index d78340c..93f92ae 100644
---
a/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
+++
b/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
@@ -1,18 +1,3 @@
-diff -ruN comm-esr31.orig/config/baseconfig.mk
comm-esr31/config/baseconfig.mk
---- comm-esr31.orig/config/baseconfig.mk 2014-10-12 21:23:01.000000000
+0200
-+++ comm-esr31/config/baseconfig.mk 2014-10-15 13:56:25.169485845 +0200
-@@ -1,7 +1,7 @@
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- MOZILLA_SRCDIR = $(topsrcdir)/mozilla
- MOZDEPTH = $(DEPTH)/mozilla
- DIST = $(MOZDEPTH)/dist
diff -ruN comm-esr31.orig/mozilla/config/baseconfig.mk
comm-esr31/mozilla/config/baseconfig.mk
--- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-10-12
21:30:42.000000000 +0200
+++ comm-esr31/mozilla/config/baseconfig.mk 2014-10-15 13:56:54.937487157
+0200
diff --git a/mail/thunderbird/0002-1f10a8067853.patch
b/mail/thunderbird/0002-1f10a8067853.patch
deleted file mode 100644
index abb9671..0000000
--- a/mail/thunderbird/0002-1f10a8067853.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/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index a0a9f4e..4f8feb0 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,11 +1,8 @@
SPELL=thunderbird
- VERSION=31.5.0
+ VERSION=38.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
- SOURCE2=$SOURCE.asc
- SOURCE_GPG="mozilla.gpg:${SOURCE2}:UPSTREAM_HASH"
- SOURCE2_IGNORE=signature
+
SOURCE_HASH=sha512:009e60035973bbbd44826ac29d281058941cc87fa28a497b106168e8e18e82e42634d2ffbedaa0695328a7f339284a7f39de7cc9ab71c02bed385dc57d372305:UPSTREAM_HASH

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE
-
SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
TMPFS=off
SECURITY_PATCH=40
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 719fe82..3f727bf 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,9 @@
+2015-06-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: bump to 38.0.1
+ no signature anymore, signed hashes instead
+ * 0002*.patch, PRE_BUILD: one patch less
+ * 0001*.patch: adapted
+
2015-03-24 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 31.5.0, SECURITY_PATCH++
* DEPENDS: depend on nss 3.17.x, like firefox
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 63c259e..cad3470 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -15,5 +15,3 @@ if [[ $THUNDERBIRD_OFFICIAL == y ]]; then
sed -i '27iac_add_options --enable-official-branding' .mozconfig || return
1
fi

-cd mozilla &&
-patch -p1 < $SPELL_DIRECTORY/0002-1f10a8067853.patch



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4bd19b334846e3f74703fe0dae8e392f4b689a8a), Thomas Orgis, 10/14/2015

Archive powered by MHonArc 2.6.24.

Top of Page