Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4b1878f3bcb84150f6aa758e6ce3068e26dd0b17)

Chronological Thread  
    < 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 (4b1878f3bcb84150f6aa758e6ce3068e26dd0b17)
  • Date: Tue, 13 Mar 2018 18:58:18 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

http/firefox/DETAILS | 14 ++++----
http/firefox/HISTORY | 13 +++++++-
http/firefox/patches/2000_system_harfbuzz.patch | 36
+++++++++++------------
http/firefox/patches/2001_system_graphite2.patch | 14 ++++----
4 files changed, 44 insertions(+), 33 deletions(-)

New commits:
commit 4b1878f3bcb84150f6aa758e6ce3068e26dd0b17
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: version 59.0, SECURITY_PATCH++

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 4a83c8f..bda7446 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,11 +1,11 @@
SPELL=firefox
- VERSION=58.0.2
- SOURCE=${SPELL}-${VERSION}.source.tar.xz
-
SOURCE_HASH=sha512:ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f:UPSTREAM_HASH
-
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=113
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ VERSION=59.0
+ HG_ID="c61f5f5ead48c78a80c80db5c489bdc7cfaf8175"
+ SOURCE=${SPELL}-${VERSION}.source.tar.bz2
+
SOURCE_HASH="sha512:89de6bb4b1ed6441aca50054fe594c488b7da915b3a1c0cccdd92551f790f6bb0e55491e75b8590a02456538315f0afa803a590c9c9f6b5f26f1d2f5212eef07"
+
SOURCE_URL[0]="https://hg.mozilla.org/releases/mozilla-release/archive/${HG_ID}.tar.bz2";
+ SECURITY_PATCH=114
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/mozilla-release-${HG_ID}"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
TMPFS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index f8b305b..8696606 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,5 +1,16 @@
+2018-03-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 59.0, downloading now from mercurial repository
+ using commit identificator and .tar.bz2 source, switched back to
+ WORKS_FOR_ME hash checking level, SECURITY_PATCH++,
+ (CVE-2018-5127, CVE-2018-5128, CVE-2018-5129, CVE-2018-5130,
+ CVE-2018-5131, CVE-2018-5132, CVE-2018-5133, CVE-2018-5134,
+ CVE-2018-5135, CVE-2018-5136, CVE-2018-5137, CVE-2018-5138,
+ CVE-2018-5140, CVE-2018-5141, CVE-2018-5142, CVE-2018-5143,
+ CVE-2018-5126, CVE-2018-5125)
+ * patches/200*: updated
+
2018-02-07 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 58.0.2, switched to UPSTRRAM_HASH
+ * DETAILS: version 58.0.2, switched to UPSTREAM_HASH
* BUILD: added forgotten &&

2018-02-03 Pavel Vinogradov <public AT sourcemage.org>
diff --git a/http/firefox/patches/2000_system_harfbuzz.patch
b/http/firefox/patches/2000_system_harfbuzz.patch
index 8365a64..1f8b59f 100644
--- a/http/firefox/patches/2000_system_harfbuzz.patch
+++ b/http/firefox/patches/2000_system_harfbuzz.patch
@@ -7,7 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
--- a/config/system-headers.mozbuild
+++ b/config/system-headers.mozbuild
-@@ -1228,16 +1228,23 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+@@ -1227,16 +1227,23 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
'utils/TypeHelpers.h',
'utils/Unicode.h',
'utils/Vector.h',
@@ -34,7 +34,7 @@ diff --git a/config/system-headers.mozbuild
b/config/system-headers.mozbuild
diff --git a/dom/base/moz.build b/dom/base/moz.build
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
-@@ -465,16 +465,19 @@ include('/ipc/chromium/chromium-config.m
+@@ -472,16 +472,19 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'

if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
@@ -57,9 +57,9 @@ diff --git a/dom/base/moz.build b/dom/base/moz.build
diff --git a/gfx/harfbuzz/README-mozilla b/gfx/harfbuzz/README-mozilla
--- a/gfx/harfbuzz/README-mozilla
+++ b/gfx/harfbuzz/README-mozilla
-@@ -14,8 +14,13 @@ this file when updating harfbuzz, and ch
+@@ -14,8 +14,13 @@ this file when updating HarfBuzz, and ch

- The normal approach to updating harfbuzz, therefore, is to pull the latest
HB
+ The normal approach to updating HarfBuzz, therefore, is to pull the latest
HB
source into a scratch directory and do a local build; then copy the original
sources AND the generated header mentioned above from the build directory
into
the mozilla tree.
@@ -107,8 +107,8 @@ diff --git a/gfx/moz.build b/gfx/moz.build
diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
-@@ -130,16 +130,19 @@ if CONFIG['GNU_CXX'] and not CONFIG['CLA
- if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
+@@ -132,16 +132,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
+ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
CXXFLAGS += [
'-Wno-implicit-fallthrough',
'-Wno-inconsistent-missing-override',
@@ -119,19 +119,19 @@ diff --git a/gfx/skia/generate_mozbuild.py
b/gfx/skia/generate_mozbuild.py
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
-@@ -775,16 +775,19 @@ if CONFIG['GNU_CXX'] and not CONFIG['CLA
- if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
+@@ -777,16 +777,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
+ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
CXXFLAGS += [
'-Wno-implicit-fallthrough',
'-Wno-inconsistent-missing-override',
@@ -142,20 +142,20 @@ diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
-@@ -264,11 +264,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
+@@ -270,11 +270,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and

- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
@@ -165,7 +165,7 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
- if CONFIG['CLANG_CXX']:
+ if CONFIG['CC_TYPE'] == 'clang':
# Suppress warnings from Skia header files.
SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
diff --git a/intl/unicharutil/util/moz.build
b/intl/unicharutil/util/moz.build
@@ -201,12 +201,12 @@ diff --git a/netwerk/dns/moz.build
b/netwerk/dns/moz.build
+
USE_LIBS += ['icu']

- if CONFIG['GNU_CXX']:
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow']
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
-@@ -226,16 +226,19 @@ if CONFIG['SERVO_TARGET_DIR']:
+@@ -223,16 +223,19 @@ if CONFIG['SERVO_TARGET_DIR']:
OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']

if CONFIG['MOZ_SYSTEM_JPEG']:
@@ -229,7 +229,7 @@ diff --git a/toolkit/library/moz.build
b/toolkit/library/moz.build
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
-@@ -312,16 +312,26 @@ def freetype2_combined_info(fontconfig_i
+@@ -308,16 +308,26 @@ def freetype2_combined_info(fontconfig_i
return namespace(
cflags=freetype2_info.cflags + fontconfig_info.cflags,
libs=freetype2_info.libs + fontconfig_info.libs,
diff --git a/http/firefox/patches/2001_system_graphite2.patch
b/http/firefox/patches/2001_system_graphite2.patch
index 5abe15f..e65c11a 100644
--- a/http/firefox/patches/2001_system_graphite2.patch
+++ b/http/firefox/patches/2001_system_graphite2.patch
@@ -7,7 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=847568
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
--- a/config/system-headers.mozbuild
+++ b/config/system-headers.mozbuild
-@@ -1235,16 +1235,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+@@ -1234,16 +1234,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr

if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
system_headers += [
@@ -112,11 +112,11 @@ diff --git a/gfx/moz.build b/gfx/moz.build
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
-@@ -262,16 +262,19 @@ CFLAGS += CONFIG['TK_CFLAGS']
+@@ -268,16 +268,19 @@ CFLAGS += CONFIG['TK_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
@@ -130,13 +130,13 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']

- if CONFIG['CLANG_CXX']:
+ if CONFIG['CC_TYPE'] == 'clang':
# Suppress warnings from Skia header files.
SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
diff --git a/old-configure.in b/old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
-@@ -4242,16 +4242,37 @@ if test "$USE_FC_FREETYPE"; then
+@@ -4091,16 +4091,37 @@ if test "$USE_FC_FREETYPE"; then
CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS"
MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], ,
[AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)],
[#include <fontconfig/fontconfig.h>])
@@ -177,7 +177,7 @@ diff --git a/old-configure.in b/old-configure.in
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
-@@ -226,16 +226,19 @@ if CONFIG['SERVO_TARGET_DIR']:
+@@ -223,16 +223,19 @@ if CONFIG['SERVO_TARGET_DIR']:
OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']

if CONFIG['MOZ_SYSTEM_JPEG']:
@@ -200,7 +200,7 @@ diff --git a/toolkit/library/moz.build
b/toolkit/library/moz.build
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
-@@ -312,16 +312,30 @@ def freetype2_combined_info(fontconfig_i
+@@ -308,16 +308,30 @@ def freetype2_combined_info(fontconfig_i
return namespace(
cflags=freetype2_info.cflags + fontconfig_info.cflags,
libs=freetype2_info.libs + fontconfig_info.libs,


  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4b1878f3bcb84150f6aa758e6ce3068e26dd0b17), Pavel Vinogradov, 03/13/2018

Archive powered by MHonArc 2.6.24.

Top of Page