Skip to Content.
Sympa Menu

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

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 (278d67fc3f3b58e8a22484bd8ee9b1d540ad4f20)
  • Date: Thu, 14 Mar 2019 21:30:49 +0000

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

http/firefox/DETAILS | 4
http/firefox/HISTORY | 4
http/firefox/patches/2000_system_harfbuzz.patch | 127
++---------------------
http/firefox/patches/2001_system_graphite2.patch | 96 ++---------------
4 files changed, 37 insertions(+), 194 deletions(-)

New commits:
commit 278d67fc3f3b58e8a22484bd8ee9b1d540ad4f20
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: version 66.0, SECURITY_PATCH++

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 3dadceb..e340c5c 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
- VERSION=65.0.2
- SECURITY_PATCH=126
+ VERSION=66.0
+ SECURITY_PATCH=127
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 4e0f3fc..3523504 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2019-03-14 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 66.0, SECURITY_PATCH++
+ * patches/200*: updated
+
2019-02-28 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 65.0.2

diff --git a/http/firefox/patches/2000_system_harfbuzz.patch
b/http/firefox/patches/2000_system_harfbuzz.patch
index aa4155f..f5d6fdd 100644
--- a/http/firefox/patches/2000_system_harfbuzz.patch
+++ b/http/firefox/patches/2000_system_harfbuzz.patch
@@ -4,15 +4,9 @@ Add ability to use system-harfbuzz instead of bundled.

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
- 'utils/TypeHelpers.h',
- 'utils/Unicode.h',
- 'utils/Vector.h',
- 'utils/VectorImpl.h',
- 'vr/gvr/capi/include/gvr_controller.h',
+@@ -1234,6 +1234,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
'vr/gvr/capi/include/gvr.h',
]

@@ -26,20 +20,9 @@ diff --git a/config/system-headers.mozbuild
b/config/system-headers.mozbuild
if CONFIG['MOZ_JACK']:
system_headers += [
'jack/jack.h',
- 'jack/statistics.h',
- ]
-
- if CONFIG['MOZ_SYSTEM_JPEG']:
- system_headers += [
-diff --git a/dom/base/moz.build b/dom/base/moz.build
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
-@@ -477,16 +477,19 @@ include('/ipc/chromium/chromium-config.m
- FINAL_LIBRARY = 'xul'
-
- if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
- DEFINES['HAVE_SIDEBAR'] = True
-
+@@ -506,6 +506,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser',
'mobile/android', 'xulrunner']:
if CONFIG['MOZ_X11']:
CXXFLAGS += CONFIG['TK_CFLAGS']

@@ -49,32 +32,9 @@ diff --git a/dom/base/moz.build b/dom/base/moz.build
GENERATED_FILES += [
'PropertyUseCounterMap.inc',
'UseCounterList.h',
- ]
-
- countermap = GENERATED_FILES['PropertyUseCounterMap.inc']
- countermap.script = 'gen-usecounters.py:property_map'
- countermap.inputs = ['UseCounters.conf']
-diff --git a/gfx/harfbuzz/README-mozilla b/gfx/harfbuzz/README-mozilla
---- a/gfx/harfbuzz/README-mozilla
-+++ b/gfx/harfbuzz/README-mozilla
-@@ -15,3 +15,8 @@
-
- If the collection of source files changes, manual updates to moz.build may
be
- needed as we don't use the upstream makefiles.
-+
-+The in-tree copy may be omitted during build by --with-system-harfbuzz.
-+Make sure to keep pkg-config version check within toolkit/moz.configure in
sync
-+with checkout version or increment latest tag by one if it's not based
-+on upstream release.
-diff --git a/gfx/moz.build b/gfx/moz.build
--- a/gfx/moz.build
+++ b/gfx/moz.build
-@@ -5,26 +5,28 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
- with Files('**'):
- BUG_COMPONENT = ('Core', 'Graphics')
-
+@@ -10,6 +10,9 @@ with Files('**'):
if CONFIG['MOZ_TREE_CAIRO']:
DIRS += ['cairo']

@@ -84,9 +44,7 @@ diff --git a/gfx/moz.build b/gfx/moz.build
DIRS += [
'2d',
'ycbcr',
- 'angle',
- 'src',
- 'qcms',
+@@ -19,7 +22,6 @@ DIRS += [
'gl',
'layers',
'graphite2/src',
@@ -94,20 +52,9 @@ diff --git a/gfx/moz.build b/gfx/moz.build
'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
-@@ -143,16 +143,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
- if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
- CXXFLAGS += [
- '-Wno-implicit-fallthrough',
- '-Wno-inconsistent-missing-override',
- '-Wno-macro-redefined',
+@@ -138,6 +138,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
'-Wno-unused-private-field',
]

@@ -117,20 +64,9 @@ diff --git a/gfx/skia/generate_mozbuild.py
b/gfx/skia/generate_mozbuild.py
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
-
- 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
-@@ -817,16 +817,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
- if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
- CXXFLAGS += [
- '-Wno-implicit-fallthrough',
- '-Wno-inconsistent-missing-override',
- '-Wno-macro-redefined',
+@@ -818,6 +818,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
'-Wno-unused-private-field',
]

@@ -140,15 +76,9 @@ diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
-
- 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
-@@ -290,6 +290,9 @@
+@@ -278,6 +278,9 @@ LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']

DEFINES['GRAPHITE2_STATIC'] = True

@@ -158,15 +88,9 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
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
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
-@@ -20,9 +20,12 @@ UNIFIED_SOURCES += [
- 'ICUUtils.cpp',
- 'IrishCasing.cpp',
- 'nsBidiUtils.cpp',
- 'nsSpecialCasingData.cpp',
- 'nsUnicharUtils.cpp',
+@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [
'nsUnicodeProperties.cpp',
]

@@ -174,15 +98,9 @@ diff --git a/intl/unicharutil/util/moz.build
b/intl/unicharutil/util/moz.build
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
FINAL_LIBRARY = 'xul'
-diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
-@@ -67,12 +67,15 @@ etld_data = GENERATED_FILES['etld_data.i
- etld_data.script = 'prepare_tlds.py'
- etld_data.inputs = ['effective_tld_names.dat']
-
- # need to include etld_data.inc
- LOCAL_INCLUDES += [
+@@ -75,6 +75,9 @@ LOCAL_INCLUDES += [
'/netwerk/base',
]

@@ -192,29 +110,21 @@ diff --git a/netwerk/dns/moz.build
b/netwerk/dns/moz.build
USE_LIBS += ['icu']

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
-@@ -223,6 +223,9 @@
- if CONFIG['MOZ_SYSTEM_PNG']:
- OS_LIBS += CONFIG['MOZ_PNG_LIBS']
+@@ -217,6 +217,9 @@ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
+ if CONFIG['MOZ_LIB_SECRET']:
+ OS_LIBS += CONFIG['MOZ_LIB_SECRET_LIBS']

+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
+
- if CONFIG['MOZ_SYSTEM_WEBP']:
- OS_LIBS += CONFIG['MOZ_WEBP_LIBS']
+ if CONFIG['MOZ_SYSTEM_JPEG']:
+ OS_LIBS += CONFIG['MOZ_JPEG_LIBS']

-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
-@@ -331,16 +331,26 @@ def freetype2_combined_info(fontconfig_i
- return namespace(
- cflags=freetype2_info.cflags + fontconfig_info.cflags,
- libs=freetype2_info.libs + fontconfig_info.libs,
- )
-
+@@ -340,6 +340,16 @@ def freetype2_combined_info(fontconfig_info,
freetype2_info):
add_old_configure_assignment('_HAVE_FREETYPE2',
depends_if(freetype2_info)(lambda _: True))

@@ -223,7 +133,7 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
+option('--with-system-harfbuzz',
+ help="Use system harfbuzz (located with pkgconfig)")
+
-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.2',
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.3.1',
+ when='--with-system-harfbuzz')
+
+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _:
True))
@@ -231,8 +141,3 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
# Apple platform decoder support
# ==============================================================
@depends(toolkit)
- def applemedia(toolkit):
- if toolkit in ('cocoa', 'uikit'):
- return True
-
- set_config('MOZ_APPLEMEDIA', applemedia)
diff --git a/http/firefox/patches/2001_system_graphite2.patch
b/http/firefox/patches/2001_system_graphite2.patch
index b0a4888..555566f 100644
--- a/http/firefox/patches/2001_system_graphite2.patch
+++ b/http/firefox/patches/2001_system_graphite2.patch
@@ -4,15 +4,9 @@ Allow building against system-wide graphite2.

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
-
- if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
- system_headers += [
- 'harfbuzz/hb-glib.h',
- 'harfbuzz/hb-ot.h',
+@@ -1241,6 +1241,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
'harfbuzz/hb.h',
]

@@ -25,15 +19,9 @@ diff --git a/config/system-headers.mozbuild
b/config/system-headers.mozbuild
if CONFIG['MOZ_JACK']:
system_headers += [
'jack/jack.h',
- 'jack/statistics.h',
- ]
-
- if CONFIG['MOZ_SYSTEM_JPEG']:
- system_headers += [
-diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
--- a/gfx/graphite2/moz-gr-update.sh
+++ b/gfx/graphite2/moz-gr-update.sh
-@@ -1,11 +1,12 @@
+@@ -1,6 +1,7 @@
#!/bin/bash

# Script used to update the Graphite2 library in the mozilla source tree
@@ -41,17 +29,7 @@ diff --git a/gfx/graphite2/moz-gr-update.sh
b/gfx/graphite2/moz-gr-update.sh

# This script lives in gfx/graphite2, along with the library source,
# but must be run from the top level of the mozilla-central tree.
-
- # Run as
- #
- # ./gfx/graphite2/moz-gr-update.sh RELEASE
- #
-@@ -32,22 +33,26 @@ echo "This directory contains the Graphi
- echo "$TARBALL" >> gfx/graphite2/README.mozilla
- echo ""
- echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
-
- # fix up includes because of bug 721839 (cstdio) and bug 803066 (Windows.h)
+@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >>
gfx/graphite2/README.mozilla
#find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e
"s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
#find gfx/graphite2/ -name "*.h" -exec perl -p -i -e
"s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;

@@ -69,20 +47,9 @@ diff --git a/gfx/graphite2/moz-gr-update.sh
b/gfx/graphite2/moz-gr-update.sh

echo
echo If gfx/graphite2/src/files.mk has changed, please make corresponding
- echo changes to gfx/graphite2/src/moz.build
- echo
-
- echo
- echo Now use hg commands to create a patch for the mozilla tree.
-diff --git a/gfx/moz.build b/gfx/moz.build
--- a/gfx/moz.build
+++ b/gfx/moz.build
-@@ -5,28 +5,30 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
- with Files('**'):
- BUG_COMPONENT = ('Core', 'Graphics')
-
+@@ -10,6 +10,9 @@ with Files('**'):
if CONFIG['MOZ_TREE_CAIRO']:
DIRS += ['cairo']

@@ -92,11 +59,7 @@ diff --git a/gfx/moz.build b/gfx/moz.build
if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
DIRS += ['harfbuzz/src']

- DIRS += [
- '2d',
- 'ycbcr',
- 'angle',
- 'src',
+@@ -21,7 +24,6 @@ DIRS += [
'qcms',
'gl',
'layers',
@@ -104,15 +67,9 @@ diff --git a/gfx/moz.build b/gfx/moz.build
'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
-@@ -288,7 +288,10 @@
+@@ -276,7 +276,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':

LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']

@@ -124,18 +81,13 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build

if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-diff --git a/old-configure.in b/old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
-@@ -3857,16 +3857,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>])
- CPPFLAGS="$_SAVE_CPPFLAGS"
+@@ -3645,6 +3645,27 @@ if test "$USE_FC_FREETYPE"; then
fi
fi

- dnl ========================================================
++dnl ========================================================
+dnl Check for graphite2
+dnl ========================================================
+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
@@ -156,37 +108,24 @@ diff --git a/old-configure.in b/old-configure.in
+ CFLAGS=$_SAVE_CFLAGS
+fi
+
-+dnl ========================================================
- dnl Check if we need the 32-bit Linux SSE2 error dialog
dnl ========================================================
-
- AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
-
- dnl ========================================================
- dnl Check for pixman and cairo
+ dnl Check if we need the 32-bit Linux SSE2 error dialog
dnl ========================================================
-diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
-@@ -226,6 +226,9 @@
- if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
- OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
+@@ -217,6 +217,9 @@ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
+ if CONFIG['MOZ_LIB_SECRET']:
+ OS_LIBS += CONFIG['MOZ_LIB_SECRET_LIBS']

+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
+
- if CONFIG['MOZ_SYSTEM_WEBP']:
- OS_LIBS += CONFIG['MOZ_WEBP_LIBS']
+ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']

-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
-@@ -331,16 +331,30 @@ def freetype2_combined_info(fontconfig_i
- return namespace(
- cflags=freetype2_info.cflags + fontconfig_info.cflags,
- libs=freetype2_info.libs + fontconfig_info.libs,
- )
-
+@@ -340,6 +340,20 @@ def freetype2_combined_info(fontconfig_info,
freetype2_info):
add_old_configure_assignment('_HAVE_FREETYPE2',
depends_if(freetype2_info)(lambda _: True))

@@ -207,8 +146,3 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
# HarfBuzz
# ==============================================================
option('--with-system-harfbuzz',
- help="Use system harfbuzz (located with pkgconfig)")
-
- system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.2',
- when='--with-system-harfbuzz')
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (278d67fc3f3b58e8a22484bd8ee9b1d540ad4f20), Pavel Vinogradov, 03/14/2019

Archive powered by MHonArc 2.6.24.

Top of Page