Skip to Content.
Sympa Menu

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

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 (8cde01607ef8490c4bbb92f9da96e60e5eb92955)
  • Date: Wed, 4 Sep 2019 08:18:18 +0000

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

http/firefox/DEPENDS | 2 -
http/firefox/DETAILS | 4 +--
http/firefox/HISTORY | 10 ++++++++
http/firefox/patches/2000_system_harfbuzz.patch | 22 ++++++++++++++-----
http/firefox/patches/2001_system_graphite2.patch | 26
++++++++++++++++-------
5 files changed, 48 insertions(+), 16 deletions(-)

New commits:
commit 8cde01607ef8490c4bbb92f9da96e60e5eb92955
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: version 69.0, SECURITY_PATCH++

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index d65556e..d041488 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -30,7 +30,7 @@ depends libwebp "--with-system-webp"
&&

depends nspr "--with-system-nspr" &&

-local NSS_BRANCH="3.44" &&
+local NSS_BRANCH="3.45" &&
if spell_ok nss &&
is_version_less "$(installed_version nss)" "${NSS_BRANCH}"; then
depends -sub "${NSS_BRANCH}.x" nss "--with-system-nss"
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 805bdd4..c02f2e9 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
- VERSION=68.0.2
- SECURITY_PATCH=133
+ VERSION=69.0
+ SECURITY_PATCH=134
SOURCE="${SPELL}-${VERSION}.source.tar.xz"

SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}";
SOURCE2="${SOURCE}.asc"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index cde2393..dd4a604 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,13 @@
+2019-09-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 69.0, SECURITY_PATCH++,
+ (CVE-2019-11751, CVE-2019-11746, CVE-2019-11744. CVE-2019-11742,
+ CVE-2019-11736, CVE-2019-11753, CVE-2019-11752, CVE-2019-9812,
+ CVE-2019-11741, CVE-2019-11743, CVE-2019-11748, CVE-2019-11749,
+ CVE-2019-5849, CVE-2019-11750, CVE-2019-11737, CVE-2019-11738,
+ CVE-2019-11747, CVE-2019-11734, CVE-2019-11735, CVE-2019-11740)
+ * DEPENDS: needs nss branch >= 3.45
+ * patches/200*: updated
+
2019-08-26 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Simpilfied cleanup of CFLAGS/CXXFLAGS
* DEPENDS: Added missing libvpx and libpng configure flags
diff --git a/http/firefox/patches/2000_system_harfbuzz.patch
b/http/firefox/patches/2000_system_harfbuzz.patch
index 8a4b11b..62ede07 100644
--- a/http/firefox/patches/2000_system_harfbuzz.patch
+++ b/http/firefox/patches/2000_system_harfbuzz.patch
@@ -57,7 +57,7 @@ diff --git a/dom/base/moz.build b/dom/base/moz.build
diff --git a/gfx/moz.build b/gfx/moz.build
--- a/gfx/moz.build
+++ b/gfx/moz.build
-@@ -7,16 +7,19 @@
+@@ -7,26 +7,28 @@
with Files('**'):
BUG_COMPONENT = ('Core', 'Graphics')
with Files('wr/**'):
@@ -77,10 +77,20 @@ diff --git a/gfx/moz.build b/gfx/moz.build
'qcms',
'gl',
'layers',
+ 'graphite2/src',
+- 'harfbuzz/src',
+ 'ots/src',
+ 'thebes',
+ 'ipc',
+ 'vr',
+ 'config',
+ 'webrender_bindings',
+ ]
+
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
-@@ -111,16 +111,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
+@@ -112,16 +112,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
CXXFLAGS += [
'-Wno-implicit-fallthrough',
@@ -126,10 +136,10 @@ diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
-@@ -274,11 +274,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
+@@ -281,11 +281,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3

- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
+ if CONFIG['MOZ_WAYLAND']:
+ CXXFLAGS += CONFIG['MOZ_WAYLAND_CFLAGS']

LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']

@@ -179,7 +189,7 @@ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
-@@ -207,16 +207,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']:
+@@ -211,16 +211,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']:
OS_LIBS += [
'-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'],
'-lgvr',
diff --git a/http/firefox/patches/2001_system_graphite2.patch
b/http/firefox/patches/2001_system_graphite2.patch
index bb37534..c276241 100644
--- a/http/firefox/patches/2001_system_graphite2.patch
+++ b/http/firefox/patches/2001_system_graphite2.patch
@@ -77,7 +77,7 @@ diff --git a/gfx/graphite2/moz-gr-update.sh
b/gfx/graphite2/moz-gr-update.sh
diff --git a/gfx/moz.build b/gfx/moz.build
--- a/gfx/moz.build
+++ b/gfx/moz.build
-@@ -7,16 +7,19 @@
+@@ -7,28 +7,30 @@
with Files('**'):
BUG_COMPONENT = ('Core', 'Graphics')
with Files('wr/**'):
@@ -97,16 +97,28 @@ diff --git a/gfx/moz.build b/gfx/moz.build
'ycbcr',
'angle',
'src',
+ 'qcms',
+ 'gl',
+ 'layers',
+- 'graphite2/src',
+ 'ots/src',
+ 'thebes',
+ 'ipc',
+ 'vr',
+ 'config',
+ 'webrender_bindings',
+ ]
+
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
-@@ -272,16 +272,19 @@ CFLAGS += CONFIG['TK_CFLAGS']
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
- CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
-
+@@ -279,16 +279,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

+ if CONFIG['MOZ_WAYLAND']:
+ CXXFLAGS += CONFIG['MOZ_WAYLAND_CFLAGS']
+
LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']

-DEFINES['GRAPHITE2_STATIC'] = True
@@ -124,7 +136,7 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
diff --git a/old-configure.in b/old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
-@@ -2690,16 +2690,37 @@ if test "$USE_FC_FREETYPE"; then
+@@ -2680,16 +2680,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>])
@@ -165,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
-@@ -207,16 +207,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']:
+@@ -211,16 +211,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']:
OS_LIBS += [
'-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'],
'-lgvr',



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8cde01607ef8490c4bbb92f9da96e60e5eb92955), Pavel Vinogradov, 09/04/2019

Archive powered by MHonArc 2.6.24.

Top of Page