Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (23da2a501645d7bbf2c01e59d4de98ced7db0c43)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (23da2a501645d7bbf2c01e59d4de98ced7db0c43)
  • Date: Fri, 6 May 2016 21:46:53 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

http/firefox/DEPENDS | 5 +++
http/firefox/DETAILS | 4 +-
http/firefox/HISTORY | 7 ++++
http/firefox/PRE_BUILD | 2 +
http/firefox/gcc6.patch | 71
++++++++++++++++++++++++++++++++++++++++++++++++
http/firefox/mozconfig | 8 ++---
6 files changed, 91 insertions(+), 6 deletions(-)

New commits:
commit 23da2a501645d7bbf2c01e59d4de98ced7db0c43
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: version 46.0.1 + gcc 6 fix

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 7ed3f6b..8ccb531 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -97,6 +97,11 @@ optional_depends dbus-glib \
# 'for WebGL support' &&
depends OPENGL &&

+optional_depends LIBAVCODEC \
+ "--enable-ffmpeg" \
+ "--disable-ffmpeg" \
+ "for fragmented H264/AAC decoding" &&
+
optional_depends gstreamer \
"--enable-gstreamer" \
"--disable-gstreamer" \
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 9a01c02..3dcba95 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,7 +1,7 @@
SPELL=firefox
- VERSION=46.0
+ VERSION=46.0.1
SOURCE=$SPELL-$VERSION.source.tar.xz
-
SOURCE_HASH=sha512:f5a652e25fa74e3cb271af04d50cc7b63ca73fde9d2ff350e84b3dda55352bac2b28b567aed12164285d992414ad475da9d2555ab972e5c5d7b8f5226591036b
+
SOURCE_HASH=sha512:c58642774f93ceaef4f99bc3fe578db6e4f6de7f1d23080da97b61bc4fc6b516ce99fa04368893c0fa2cb9cd0b36e96955656daa97d0bd0d8f4da6a2d364cb98

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

SOURCE_URL[1]=http://ftp.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SECURITY_PATCH=93
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index c870052..7daca5c 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,10 @@
+2016-05-06 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 46.0.1
+ * DEPENDS: added LIBAVCODEC, optionally
+ * PRE_BUILD, gcc6.patch: added gcc 6 fix from
+ https://bugzilla.mozilla.org/show_bug.cgi?id=1245076
+ * mozconfig: added -fpermissive, install_rootify++
+
2016-04-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 46.0, fixed SOURCE_URL[1].
SECURITY_PATCH++, (MFSA-2016-[39-48])
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 1000704..52e297a 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -Np1 < ${SPELL_DIRECTORY}/gcc6.patch &&
+
# To remove version suffix from some directories
sed 's;-$(MOZ_APP_VERSION);;g' -i config/baseconfig.mk &&

diff --git a/http/firefox/gcc6.patch b/http/firefox/gcc6.patch
new file mode 100644
index 0000000..a7ee1c1
--- /dev/null
+++ b/http/firefox/gcc6.patch
@@ -0,0 +1,71 @@
+diff --git a/config/gcc-stl-wrapper.template.h
b/config/gcc-stl-wrapper.template.h
+--- a/config/gcc-stl-wrapper.template.h
++++ b/config/gcc-stl-wrapper.template.h
+@@ -12,33 +12,39 @@
+ // compiling ObjC.
+ #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ &&
XP_IOS)
+ # error "STL code can only be used with -fno-exceptions"
+ #endif
+
+ // Silence "warning: #include_next is a GCC extension"
+ #pragma GCC system_header
+
++#ifndef moz_dont_include_mozalloc_for_cstdlib
++# define moz_dont_include_mozalloc_for_cstdlib
++#endif
++#ifndef moz_dont_include_mozalloc_for_${HEADER}
+ // mozalloc.h wants <new>; break the cycle by always explicitly
+ // including <new> here. NB: this is a tad sneaky. Sez the gcc docs:
+ //
+ // `#include_next' does not distinguish between <file> and "file"
+ // inclusion, nor does it check that the file you specify has the
+ // same name as the current file. It simply looks for the file
+ // named, starting with the directory in the search path after the
+ // one where the current file was found.
+-#include_next <new>
++# include_next <new>
+
+ // See if we're in code that can use mozalloc. NB: this duplicates
+ // code in nscore.h because nscore.h pulls in prtypes.h, and chromium
+ // can't build with that being included before base/basictypes.h.
+-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) &&
!defined(MOZ_NO_MOZALLOC)
+-# include "mozilla/mozalloc.h"
+-#else
+-# error "STL code can only be used with infallible ::operator new()"
++# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) &&
!defined(MOZ_NO_MOZALLOC)
++# include "mozilla/mozalloc.h"
++# else
++# error "STL code can only be used with infallible ::operator new()"
++# endif
++
+ #endif
+
+ #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG)
+ // Enable checked iterators and other goodies
+ //
+ // FIXME/bug 551254: gcc's debug STL implementation requires -frtti.
+ // Figure out how to resolve this with -fno-rtti. Maybe build with
+ // -frtti in DEBUG builds?
+diff --git a/gfx/graphite2/src/Collider.cpp b/gfx/graphite2/src/Collider.cpp
+--- a/gfx/graphite2/src/Collider.cpp
++++ b/gfx/graphite2/src/Collider.cpp
+@@ -21,17 +21,17 @@
+
+ Alternatively, the contents of this file may be used under the terms of the
+ Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public
+ License, as published by the Free Software Foundation, either version 2
+ of the License or (at your option) any later version.
+ */
+ #include <algorithm>
+ #include <limits>
+-#include <math.h>
++#include <cmath>
+ #include <string>
+ #include <functional>
+ #include "inc/Collider.h"
+ #include "inc/Segment.h"
+ #include "inc/Slot.h"
+ #include "inc/GlyphCache.h"
+ #include "inc/Sparse.h"
+
+
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
index beb7c50..3bcaa24 100644
--- a/http/firefox/mozconfig
+++ b/http/firefox/mozconfig
@@ -14,10 +14,10 @@ ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-tests
ac_add_options --disable-crashreporter
-ac_add_options --prefix=$INSTALL_ROOT/usr
-ac_add_options --mandir=$INSTALL_ROOT/usr
-ac_add_options --enable-optimize="$CXXFLAGS -fno-fast-math"
-ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
+ac_add_options --prefix=${INSTALL_ROOT}/usr
+ac_add_options --mandir=${INSTALL_ROOT}/usr
+ac_add_options --enable-optimize="${CXXFLAGS} -fno-fast-math -fpermissive"
+ac_add_options
--with-default-mozilla-five-home=${INSTALL_ROOT}/usr/lib/firefox
ac_add_options --enable-release
ac_add_options --enable-pie
ac_add_options --enable-mathml



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (23da2a501645d7bbf2c01e59d4de98ced7db0c43), Pavel Vinogradov, 05/06/2016

Archive powered by MHonArc 2.6.24.

Top of Page