sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (814584562c51bb8b8e5769e1fe960ea415f32fb6)
- 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 (814584562c51bb8b8e5769e1fe960ea415f32fb6)
- Date: Wed, 5 Sep 2018 19:21:32 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
http/firefox/DEPENDS | 1
http/firefox/DETAILS | 2 -
http/firefox/HISTORY | 6 ++++
http/firefox/mozconfig | 1
http/firefox/patches/2000_system_harfbuzz.patch | 22 +++++++++---------
http/firefox/patches/2001_system_graphite2.patch | 28
+++++++++++------------
6 files changed, 32 insertions(+), 28 deletions(-)
New commits:
commit 814584562c51bb8b8e5769e1fe960ea415f32fb6
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
http/firefox: version 62.0
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 0b624d3..fa3b7a3 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -46,7 +46,6 @@ depends bzip2 "--with-system-bz2"
&&
depends libevent "--with-system-libevent" &&
depends libvpx "--with-system-vpx" &&
depends libffi "--enable-system-ffi" &&
-depends hunspell "--enable-system-hunspell" &&
depends pixman "--enable-system-pixman" &&
depends rust &&
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 5b19539..be5b467 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,5 +1,5 @@
SPELL=firefox
- VERSION=61.0.2
+ VERSION=62.0
SECURITY_PATCH=119
SOURCE="${SPELL}-${VERSION}.source.tar.xz"
SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index b0b27b1..ab4d6a2 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,9 @@
+2018-09-05 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 62.0
+ * DEPENDS: hunspell isn't needed anymore
+ * mozconfig: removed --with-pthreads
+ * patches/200*: updated
+
2018-08-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 61.0.2
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
index db26184..fa5d7ec 100644
--- a/http/firefox/mozconfig
+++ b/http/firefox/mozconfig
@@ -9,7 +9,6 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
# Options for 'configure' (same as command-line options).
ac_add_options --enable-application=browser
-ac_add_options --with-pthreads
ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
diff --git a/http/firefox/patches/2000_system_harfbuzz.patch
b/http/firefox/patches/2000_system_harfbuzz.patch
index 1f8b59f..cebcf9f 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
-@@ -1227,16 +1227,23 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+@@ -1228,16 +1228,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
-@@ -472,16 +472,19 @@ include('/ipc/chromium/chromium-config.m
+@@ -477,16 +477,19 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
@@ -107,7 +107,7 @@ 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
-@@ -132,16 +132,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
+@@ -143,16 +143,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
CXXFLAGS += [
'-Wno-implicit-fallthrough',
@@ -130,7 +130,7 @@ diff --git a/gfx/skia/generate_mozbuild.py
b/gfx/skia/generate_mozbuild.py
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
-@@ -777,16 +777,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
+@@ -817,16 +817,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
CXXFLAGS += [
'-Wno-implicit-fallthrough',
@@ -153,7 +153,7 @@ 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
-@@ -270,11 +270,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
+@@ -281,11 +281,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
@@ -187,7 +187,7 @@ diff --git a/intl/unicharutil/util/moz.build
b/intl/unicharutil/util/moz.build
diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
-@@ -64,12 +64,15 @@ etld_data = GENERATED_FILES['etld_data.i
+@@ -67,12 +67,15 @@ etld_data = GENERATED_FILES['etld_data.i
etld_data.script = 'prepare_tlds.py'
etld_data.inputs = ['effective_tld_names.dat']
@@ -206,7 +206,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
-@@ -223,16 +223,19 @@ if CONFIG['SERVO_TARGET_DIR']:
+@@ -233,16 +233,19 @@ if CONFIG['SERVO_TARGET_DIR']:
OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']
if CONFIG['MOZ_SYSTEM_JPEG']:
@@ -218,18 +218,18 @@ diff --git a/toolkit/library/moz.build
b/toolkit/library/moz.build
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
+
- if CONFIG['MOZ_SYSTEM_HUNSPELL']:
- OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
-
if CONFIG['MOZ_SYSTEM_LIBEVENT']:
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
if CONFIG['MOZ_SYSTEM_LIBVPX']:
OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
+
+ if not CONFIG['MOZ_TREE_PIXMAN']:
+ OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
-@@ -308,16 +308,26 @@ def freetype2_combined_info(fontconfig_i
+@@ -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,
diff --git a/http/firefox/patches/2001_system_graphite2.patch
b/http/firefox/patches/2001_system_graphite2.patch
index e65c11a..96adb83 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
-@@ -1234,16 +1234,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+@@ -1235,16 +1235,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
system_headers += [
@@ -112,7 +112,7 @@ 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
-@@ -268,16 +268,19 @@ CFLAGS += CONFIG['TK_CFLAGS']
+@@ -279,16 +279,19 @@ CFLAGS += CONFIG['TK_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
@@ -136,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
-@@ -4091,16 +4091,37 @@ if test "$USE_FC_FREETYPE"; then
+@@ -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>])
@@ -177,30 +177,30 @@ 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
-@@ -223,16 +223,19 @@ if CONFIG['SERVO_TARGET_DIR']:
- OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']
-
- if CONFIG['MOZ_SYSTEM_JPEG']:
+@@ -236,16 +236,19 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
if CONFIG['MOZ_SYSTEM_PNG']:
OS_LIBS += CONFIG['MOZ_PNG_LIBS']
-+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
-+
if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
- if CONFIG['MOZ_SYSTEM_HUNSPELL']:
- OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
-
++if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
++ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
++
if CONFIG['MOZ_SYSTEM_LIBEVENT']:
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
+
+ if CONFIG['MOZ_SYSTEM_LIBVPX']:
+ OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
+
+ if not CONFIG['MOZ_TREE_PIXMAN']:
+ OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
-@@ -308,16 +308,30 @@ def freetype2_combined_info(fontconfig_i
+@@ -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,
- [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (814584562c51bb8b8e5769e1fe960ea415f32fb6), Pavel Vinogradov, 09/05/2018
Archive powered by MHonArc 2.6.24.