forked from pool/MozillaThunderbird
- update to Thunderbird 31.1.0 (bnc#894370)
- added mozilla-nullptr-gcc45.patch to build on gcc 4.5 dists (e.g. openSUSE 11.4) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=253
This commit is contained in:
Wolfgang Rosenauer
Git OBS Bridge
parent
c34ff70793
commit
e1274896ec
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 29 13:02:19 UTC 2014 - wr@rosenauer.org
|
||||
|
||||
- update to Thunderbird 31.1.0 (bnc#894370)
|
||||
- added mozilla-nullptr-gcc45.patch to build on gcc 4.5 dists
|
||||
(e.g. openSUSE 11.4)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 27 20:25:46 UTC 2014 - wr@rosenauer.org
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define mainversion 31.0
|
||||
%define mainversion 31.1.0
|
||||
%define update_channel release
|
||||
|
||||
%if %suse_version > 1210
|
||||
@ -70,7 +70,7 @@ Recommends: gstreamer-0_10-plugins-ffmpeg
|
||||
%endif
|
||||
Version: %{mainversion}
|
||||
Release: 0
|
||||
%define releasedate 2014072100
|
||||
%define releasedate 2014082900
|
||||
Provides: thunderbird = %{version}
|
||||
%if %{with_kde}
|
||||
# this is needed to match this package with the kde4 helper package without the main package
|
||||
@ -100,7 +100,8 @@ Patch2: mozilla-language.patch
|
||||
Patch3: mozilla-nongnome-proxies.patch
|
||||
Patch4: mozilla-kde.patch
|
||||
Patch5: mozilla-arm-disable-edsp.patch
|
||||
Patch7: mozilla-ppc.patch
|
||||
Patch6: mozilla-ppc.patch
|
||||
Patch7: mozilla-nullptr-gcc45.patch
|
||||
# Thunderbird/mail
|
||||
Patch20: tb-ssldap.patch
|
||||
Patch21: tb-develdirs.patch
|
||||
@ -198,6 +199,7 @@ pushd mozilla
|
||||
%patch4 -p1
|
||||
%endif
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
popd
|
||||
# comm-central patches
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:866075cbae4d8846063fcc081e347d35d6b5fe8515b5650d153626d2327019e3
|
||||
oid sha256:e372b42cdea1eda09338aac9974af156d2e3f94d4d3b85cdce52047c185bc0bb
|
||||
size 28428
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
CHANNEL="esr31"
|
||||
BRANCH="releases/comm-$CHANNEL"
|
||||
RELEASE_TAG="THUNDERBIRD_31_0_RELEASE"
|
||||
VERSION="31.0"
|
||||
RELEASE_TAG="THUNDERBIRD_31_1_0_RELEASE"
|
||||
VERSION="31.1.0"
|
||||
|
||||
echo "cloning $BRANCH..."
|
||||
hg clone http://hg.mozilla.org/$BRANCH thunderbird
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c504c66bf29c61b955d9299dba1c7d5e39a98dea3b39bf93a85f619a64748aed
|
||||
size 20730744
|
||||
3
l10n-31.1.0.tar.xz
Normal file
3
l10n-31.1.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f432689f0165ac6e82ef0acbc5a660c917ebed7f152186a4e819cc7735d42b64
|
||||
size 20736200
|
||||
55
mozilla-nullptr-gcc45.patch
Normal file
55
mozilla-nullptr-gcc45.patch
Normal file
@ -0,0 +1,55 @@
|
||||
# HG changeset patch
|
||||
# Parent c7f2d830f66744f9da21b93f80017d28b5fba9a0
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
Bug 1044581 - compilation error: bit_reader.cc:12:3: error: 'nullptr' was not declared in this scope
|
||||
|
||||
diff --git a/content/media/fmp4/demuxer/bit_reader.cc b/content/media/fmp4/demuxer/bit_reader.cc
|
||||
--- a/content/media/fmp4/demuxer/bit_reader.cc
|
||||
+++ b/content/media/fmp4/demuxer/bit_reader.cc
|
||||
@@ -1,12 +1,13 @@
|
||||
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
+#include "nullptr.h"
|
||||
#include "mp4_demuxer/bit_reader.h"
|
||||
#include <algorithm>
|
||||
|
||||
namespace mp4_demuxer {
|
||||
|
||||
BitReader::BitReader(const uint8_t* data, off_t size)
|
||||
: data_(data), bytes_left_(size), num_remaining_bits_in_curr_byte_(0) {
|
||||
DCHECK(data_ != nullptr && bytes_left_ > 0);
|
||||
diff --git a/content/media/fmp4/moz.build b/content/media/fmp4/moz.build
|
||||
--- a/content/media/fmp4/moz.build
|
||||
+++ b/content/media/fmp4/moz.build
|
||||
@@ -2,16 +2,17 @@
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXPORTS += [
|
||||
'MP4Decoder.h',
|
||||
'MP4Reader.h',
|
||||
+ 'nullptr.h',
|
||||
'PlatformDecoderModule.h',
|
||||
]
|
||||
|
||||
EXPORTS.mp4_demuxer += [
|
||||
'demuxer/aac.h',
|
||||
'demuxer/audio_decoder_config.h',
|
||||
'demuxer/avc.h',
|
||||
'demuxer/basictypes.h',
|
||||
diff --git a/content/media/fmp4/nullptr.h b/content/media/fmp4/nullptr.h
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/content/media/fmp4/nullptr.h
|
||||
@@ -0,0 +1,7 @@
|
||||
+
|
||||
+// GCC does not understand nullptr until 4.6
|
||||
+#if defined(__GNUC__) && !defined(__clang__)
|
||||
+#if __GNUC__ * 100 + __GNUC_MINOR__ < 406
|
||||
+#define nullptr __null
|
||||
+#endif
|
||||
+#endif
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c69616a54eb29df16553f3066ae7aa00e9b95850f4ee5d6c28da59e2accbd2de
|
||||
size 144728428
|
||||
3
thunderbird-31.1.0-source.tar.xz
Normal file
3
thunderbird-31.1.0-source.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:76bf88ab49ff939cf0202b318e4b557326980f45191d91eac06cfa6e340a8bf1
|
||||
size 144780468
|
||||
Loading…
Reference in New Issue
Block a user