Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ab756cb0a2ff08320236d3f397de7a462c84f04b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ab756cb0a2ff08320236d3f397de7a462c84f04b)
  • Date: Tue, 8 Sep 2020 13:18:16 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

crypto/nss/BUILD | 9
crypto/nss/HISTORY | 3
http/firefox-esr/BUILD | 8
http/firefox-esr/DEPENDS | 73 +--
http/firefox-esr/DETAILS | 6
http/firefox-esr/HISTORY | 11
http/firefox-esr/INSTALL | 2
http/firefox-esr/PRE_BUILD | 2
http/firefox-esr/mozconfig | 13
http/firefox-esr/patches/2000_system_harfbuzz.patch | 231
----------
http/firefox-esr/patches/2001_system_graphite2.patch | 221
---------
http/firefox-esr/patches/2003_blessings_TERM.patch | 29 +
http/firefox-esr/patches/2004_fix_sandbox_lto.patch | 26 +
http/firefox-esr/patches/2006_pgo_gcc_spellchecker.patch | 21
http/firefox-esr/patches/2007_arm-fp-wasm-fixes.patch | 34 +
http/firefox-esr/patches/2012_allow-non-ascii-chars.patch | 15
http/firefox-esr/patches/6003_fix_syscall_wrappers_on_musl.patch | 47 ++
http/firefox-esr/patches/6004_musl_memory_report.patch | 22
http/firefox-esr/patches/6006_musl_fix_tools.patch | 17
http/firefox-esr/patches/7000_sys_auxv_non_glibc.patch | 67 ++
http/firefox-esr/patches/7001_make-pgo-use-toolchain.patch | 32 +
http/firefox/DEPENDS | 2
http/firefox/HISTORY | 3
libs/nspr/DETAILS | 4
libs/nspr/HISTORY | 3
25 files changed, 401 insertions(+), 500 deletions(-)

New commits:
commit ab756cb0a2ff08320236d3f397de7a462c84f04b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

firefox-esr: try current nss, it is a current firefox, sort of

commit 60527c30628ba3ff59df42554c1167b69b1b430d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nspr: version 4.28

commit f27ca6ce84f1215425f6e0559edc2a17e4268ac1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nss: build fix regarding libfreebl

The newer nss builds fail for me because along the line libfreebl.a is
not created
and later dearly missed. There seems to be subtle breakage in the build
system that
is not commonly found, but happens reliably on my recently updated SMGL
system.

My workaround just builds lib/freebl explicitly and then resumes the
overall
build if the first attempt fails. Works.

commit 3520f4448ddc6521047069af9c48cea5542b0188
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

firefox-esr: work-in-progress update to 78.2.0

I cannot test it right now because the required nss version does not
build.
But the outdated ESR is also no solution, so I am at least pushing things
a bit into the future, even if the spell might be broken now.

commit fa106d563953eaac9d7e3f707f8b137e8155cc69
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

firefox: depends JACK-DRIVER, not JACK

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index 7a8d66f..db93590 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -10,7 +10,14 @@ if is_version_less 3.14 "$NSS_BRANCH"; then
cd $SOURCE_DIRECTORY/nss &&
MAKE_OPTS="$MAKE_OPTS NSPR_INCLUDE_DIR=/usr/include/nspr USE_SYSTEM_ZLIB=1
ZLIB_LIBS=-lz"
make_single &&
- make $MAKE_OPTS &&
+ if ! make $MAKE_OPTS; then
+ message "${MESSAGE_COLOR}First attempt failed, maybe due to build order
breakage with libfreebl.$DEFAULT_COLOR" &&
+ message "${MESSAGE_COLOR}Trying again after explicitly building
libfreebl.$DEFAULT_COLOR" &&
+ cd lib/freebl &&
+ make $MAKE_OPTS &&
+ cd ../.. &&
+ make $MAKE_OPTS
+ fi &&
make_normal
else
cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index d5be3fa..3cd88941 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2020-09-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: workaround for curious breakage with missing libfreebl
+
2020-08-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PREPARE: version 3.56

diff --git a/http/firefox-esr/BUILD b/http/firefox-esr/BUILD
index ce6fc40..93b5f7b 100755
--- a/http/firefox-esr/BUILD
+++ b/http/firefox-esr/BUILD
@@ -1,3 +1,5 @@
+disable_stack_clash_protection &&
+
FIREFOX_HOME="$INSTALL_ROOT/usr/lib/firefox" &&
export MOZ_PHOENIX=1 &&

@@ -22,10 +24,6 @@ CXXFLAGS="${CXXFLAGS//-O[3s]/-O2}" &&
# harden
LDFLAGS="$LDFLAGS -Wl,-z,now" &&

-# for gcc 6
-CFLAGS+=" -fno-delete-null-pointer-checks" &&
-CXXFLAGS+=" -fno-delete-null-pointer-checks" &&
-
#
# fix symbol check in build scripts, firefox adds -s to LDFLAGS so we can
# remove it here without changing anything...
@@ -43,7 +41,7 @@ local gccminor=${gccver#*.} &&
gccminor=${gccminor%.*} &&

if [[ $gccmajor == "4" ]] && [[ $gccminor -ge "6" ]]; then
- CFLAGS="${CFLAGS//-mavx} -mno-avx"
+ CFLAGS="${CFLAGS//-mavx} -mno-avx" &&
CXXFLAGS="${CXXFLAGS//-mavx} -mno-avx"
fi

diff --git a/http/firefox-esr/DEPENDS b/http/firefox-esr/DEPENDS
index d65556e..1ba0ee0 100755
--- a/http/firefox-esr/DEPENDS
+++ b/http/firefox-esr/DEPENDS
@@ -3,12 +3,13 @@
depends autoconf-2.13 &&
depends -sub "CLANG" llvm &&
depends perl &&
-depends python &&
+depends python3 &&

-depends icu "--with-system-icu" &&
+#depends icu "--with-system-icu" &&

depends glib2 &&
-depends gtk+3 "--enable-default-toolkit=cairo-gtk3" &&
+depends gtk+3 "--enable-default-toolkit=cairo-gtk3" &&
+depends gtk+2 &&
depends atk &&
depends libx11 &&
depends libxext &&
@@ -17,8 +18,13 @@ depends libxt
&&
depends libxcomposite &&

depends pango &&
+depends fontconfig &&
+depends freetype2 &&
depends libxft &&
-
+
+depends tar &&
+depends unzip &&
+depends zip &&

#depends -sub TEE cairo "--enable-system-cairo" &&
depends gdk-pixbuf2 &&
@@ -30,23 +36,22 @@ depends libwebp "--with-system-webp"
&&

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

-local NSS_BRANCH="3.44" &&
+local NSS_BRANCH="3.56" &&
if spell_ok nss &&
is_version_less "$(installed_version nss)" "${NSS_BRANCH}"; then
- depends -sub "${NSS_BRANCH}.x" nss "--with-system-nss"
+ depends -sub "${NSS_BRANCH}" nss "--with-system-nss"
else
depends nss "--with-system-nss"
fi &&

-depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY ENABLE_DBSTAT_VTAB
-SQLITE_ENABLE_FTS3" sqlite "--enable-system-sqlite" &&
+#depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY ENABLE_DBSTAT_VTAB
+#SQLITE_ENABLE_FTS3" sqlite "--enable-system-sqlite" &&

depends libidl &&

depends zip &&
depends zlib "--with-system-zlib" &&

-depends bzip2 "--with-system-bz2" &&
depends libevent "--with-system-libevent" &&
depends libvpx "--with-system-libvpx" &&
depends libffi "--enable-system-ffi" &&
@@ -58,15 +63,8 @@ depends cbindgen
&&

depends nodejs &&

-optional_depends startup-notification \
- "--enable-startup-notification" \
- "--disable-startup-notification" \
- "for startup notifications" &&
-
-optional_depends gconf2 \
- "--enable-gconf" \
- "--disable-gconf" \
- "for gconf support" &&
+depends startup-notification &&
+depends gconf2 &&

optional_depends wireless_tools \
"--enable-necko-wifi" \
@@ -87,6 +85,11 @@ depends alsa-lib "--enable-alsa" &&
# '--disable-wave --disable-ogg --disable-webm
--disable-dash' \
# 'for audio/video support' &&

+optional_depends JACK-DRIVER \
+ "--enable-jack" \
+ "--disable-jack" \
+ "use JACK for audio support" &&
+
if is_depends_enabled $SPELL alsa-lib; then
# Firefox tries to use ogg/ogg.h even with --disable-ogg given
#optional_depends libogg \
@@ -103,10 +106,7 @@ if is_depends_enabled $SPELL alsa-lib; then
depends yasm
fi &&

-optional_depends dbus-glib \
- "--enable-dbus" \
- "--disable-dbus" \
- "for dbus support" &&
+depends dbus-glib "--enable-dbus" &&

# Firefox is currently borked and does not compile without OpenGL headers
#optional_depends OPENGL \
@@ -121,19 +121,22 @@ optional_depends LIBAVCODEC \
"for fragmented H264/AAC decoding" &&

suggest_depends_2 firefox-smglwiki "" "" \
- "to enable searching the SMGL Wiki from the Search Bar" &&
-
-optional_depends graphite2 \
- "--with-system-graphite2" \
- "--without-system-graphite2" \
- "for system graphite2" &&
-
-optional_depends harfbuzz \
- "--with-system-harfbuzz" \
- "--without-system-harfbuzz" \
- "for system harfbuzz" &&
-
+ "to enable searching the SMGL Wiki from the Search Bar"
+
+#optional_depends graphite2 \
+# "--with-system-graphite2" \
+# "--without-system-graphite2" \
+# "for system graphite2" &&
+#
+#optional_depends harfbuzz \
+# "--with-system-harfbuzz" \
+# "--without-system-harfbuzz" \
+# "for system harfbuzz" &&
+#
optional_depends dav1d \
"--enable-av1" \
"--disable-av1" \
- "for AV1 video support"
+ "for AV1 video support" &&
+if is_depends_enabled $SPELL dav1d; then
+ depends nasm
+fi
diff --git a/http/firefox-esr/DETAILS b/http/firefox-esr/DETAILS
index 225de75..faea31a 100755
--- a/http/firefox-esr/DETAILS
+++ b/http/firefox-esr/DETAILS
@@ -1,10 +1,10 @@
SPELL=firefox-esr
SPELLX=firefox
- VERSION=68.7.0esr
- SECURITY_PATCH=134
+ VERSION=78.2.0esr
+ SECURITY_PATCH=147
SOURCE="${SPELLX}-${VERSION}.source.tar.xz"

SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELLX}/releases/${VERSION}/source/${SOURCE}";
-
SOURCE_HASH="sha512:a3ddcf8ffe5f568b30b1fc9ddcaa5cebe600bf11ce353c09507d5466f999022d45a0dee9a08f53f37b10202a2e2ce4c180743cd6a2ca38dfea1c3e4487b18593"
+
SOURCE_HASH="sha512:38f91a24634ce5d0c10340c9ac762071f8488f4bd7649bff9ed9cb1cbecda23e207b593118d38488810540e63be39d9c1c45c3b9a6acb477b6b2edf636e56d5b"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION%esr}"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index fadb010..2bbcf95 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,3 +1,14 @@
+2020-09-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: try the current nss 3.56
+
+2020-09-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 78.2.0
+ * DEPENDS, PRE_BUILD, BUILD, INSTALL, mozconfig, patches/*:
+ Merge in changes of http/firefox since commit
+ 5c804887576c03db3acc19dc8b684189ded6f5fe up to
+ aa77968361c73222a2d4c325b304e251d7131644, see HISTORY there
+ for the changes leading to 78.0.2.
+
2020-04-07 Thomas Orgis <sobukus AT sourcemage.org>
* Branch off whole spell from http/firefox version 68.0.1
(commit 891c1133185904d88b6b4bb624704fdfaac70c8e).
diff --git a/http/firefox-esr/INSTALL b/http/firefox-esr/INSTALL
index f1cde6c..2899a7c 100755
--- a/http/firefox-esr/INSTALL
+++ b/http/firefox-esr/INSTALL
@@ -1,3 +1,5 @@
+disable_stack_clash_protection &&
+
FIREFOX_HOME="$INSTALL_ROOT/usr/lib/firefox" &&

if spell_ok Firebird; then
diff --git a/http/firefox-esr/PRE_BUILD b/http/firefox-esr/PRE_BUILD
index 3752626..f6e1951 100755
--- a/http/firefox-esr/PRE_BUILD
+++ b/http/firefox-esr/PRE_BUILD
@@ -15,6 +15,8 @@ if [[ "$FIREFOX_STRIP" == "y" ]]; then
echo 'ac_add_options --disable-debug-symbols'
else
echo 'ac_add_options --disable-install-strip'
+ echo 'ac_add_options --disable-strip'
+ echo 'ac_add_options --enable-debug-symbols'
fi >> .mozconfig &&

if [[ "$FIREFOX_SDK" == "n" ]]; then
diff --git a/http/firefox-esr/mozconfig b/http/firefox-esr/mozconfig
index 12c89c9..c90cd0b 100644
--- a/http/firefox-esr/mozconfig
+++ b/http/firefox-esr/mozconfig
@@ -5,6 +5,14 @@
# Options for client.mk.
mk_add_options MOZ_CO_PROJECT=browser
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
+
+# The following option unsets Telemetry Reporting. With the Addons Fiasco,
+# Mozilla was found to be collecting user's data, including saved passwords
and
+# web form data, without users consent. Mozilla was also found shipping
updates
+# to systems without the user's knowledge or permission.
+# The following command to permanently disables telemetry reporting in
Firefox.
+unset MOZ_TELEMETRY_REPORTING
+
#mk_add_options AUTOCONF=autoconf2.13

# Options for 'configure' (same as command-line options).
@@ -13,4 +21,7 @@ ac_add_options --disable-updater
ac_add_options --disable-crashreporter
ac_add_options --prefix=${INSTALL_ROOT}/usr
ac_add_options --enable-release
-ac_add_options --enable-optimize="${CXXFLAGS} -fno-fast-math -fpermissive"
+ac_add_options --enable-optimize="${CXXFLAGS} -fno-fast-math"
+ac_add_options --enable-rust-simd
+
+ac_add_options --with-unsigned-addon-scopes=app,system
diff --git a/http/firefox-esr/patches/2000_system_harfbuzz.patch
b/http/firefox-esr/patches/2000_system_harfbuzz.patch
deleted file mode 100644
index 8a4b11b..0000000
--- a/http/firefox-esr/patches/2000_system_harfbuzz.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From: Jan Beich <jbeich AT FreeBSD.org>
-
-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['OS_TARGET'] == 'Android':
- 'utils/TypeHelpers.h',
- 'utils/Unicode.h',
- 'utils/Vector.h',
- 'utils/VectorImpl.h',
- 'vr/gvr/capi/include/gvr_controller.h',
- 'vr/gvr/capi/include/gvr.h',
- ]
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ system_headers += [
-+ 'harfbuzz/hb-glib.h',
-+ 'harfbuzz/hb-ot.h',
-+ 'harfbuzz/hb.h',
-+ ]
-+
- 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
-@@ -523,16 +523,19 @@ include('/ipc/chromium/chromium-config.m
- FINAL_LIBRARY = 'xul'
-
- if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
- DEFINES['HAVE_SIDEBAR'] = True
-
- if CONFIG['MOZ_X11']:
- CXXFLAGS += CONFIG['TK_CFLAGS']
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- 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/moz.build b/gfx/moz.build
---- a/gfx/moz.build
-+++ b/gfx/moz.build
-@@ -7,16 +7,19 @@
- with Files('**'):
- BUG_COMPONENT = ('Core', 'Graphics')
- with Files('wr/**'):
- BUG_COMPONENT = ('Core', 'Graphics: WebRender')
-
- if CONFIG['MOZ_TREE_CAIRO']:
- DIRS += ['cairo']
-
-+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ DIRS += ['harfbuzz/src']
-+
- DIRS += [
- '2d',
- 'ycbcr',
- 'angle',
- 'src',
- 'qcms',
- 'gl',
- 'layers',
-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':
- if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
- CXXFLAGS += [
- '-Wno-implicit-fallthrough',
- '-Wno-inconsistent-missing-override',
- '-Wno-macro-redefined',
- '-Wno-unused-private-field',
- ]
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- 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
-@@ -488,16 +488,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',
- '-Wno-unused-private-field',
- ]
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- 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
-@@ -274,11 +274,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
-
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-
- LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
-
- DEFINES['GRAPHITE2_STATIC'] = True
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- 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',
- 'nsUnicodeProperties.cpp',
- ]
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ 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
-@@ -74,12 +74,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 += [
- '/netwerk/base',
- ]
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- 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
-@@ -207,16 +207,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']:
- OS_LIBS += [
- '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'],
- '-lgvr',
- ]
-
- OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
- OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
-+
- 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_WEBP']:
- OS_LIBS += CONFIG['MOZ_WEBP_LIBS']
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
---- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -377,16 +377,26 @@ def freetype2_combined_info(fontconfig_i
- return namespace(
- cflags=freetype2_info.cflags + fontconfig_info.cflags,
- libs=freetype2_info.libs + fontconfig_info.libs,
- )
-
- add_old_configure_assignment('_HAVE_FREETYPE2',
- depends_if(freetype2_info)(lambda _: True))
-
-+# HarfBuzz
-+# ==============================================================
-+option('--with-system-harfbuzz',
-+ help="Use system harfbuzz (located with pkgconfig)")
-+
-+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))
-+
- # 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-esr/patches/2001_system_graphite2.patch
b/http/firefox-esr/patches/2001_system_graphite2.patch
deleted file mode 100644
index bb37534..0000000
--- a/http/firefox-esr/patches/2001_system_graphite2.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From: Jan Beich <jbeich AT FreeBSD.org>
-
-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['OS_TARGET'] == 'Android':
-
- if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
- system_headers += [
- 'harfbuzz/hb-glib.h',
- 'harfbuzz/hb-ot.h',
- 'harfbuzz/hb.h',
- ]
-
-+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+ system_headers += [
-+ 'graphite2/Font.h',
-+ 'graphite2/Segment.h',
-+ ]
-+
- 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 @@
- #!/bin/bash
-
- # Script used to update the Graphite2 library in the mozilla source tree
-+# and bump version for --with-system-graphite2
-
- # 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)
- #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/;" {} \;
-
-+# chase version for --with-system-graphite2
-+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \
-+ if /GR2_VERSION_REQUIRE/" old-configure.in
-+
- # summarize what's been touched
- echo Updated to $RELEASE.
- echo Here is what changed in the gfx/graphite2 directory:
- echo
-
--hg stat gfx/graphite2
-+hg stat old-configure.in gfx/graphite2
-
- 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
-@@ -7,16 +7,19 @@
- with Files('**'):
- BUG_COMPONENT = ('Core', 'Graphics')
- with Files('wr/**'):
- BUG_COMPONENT = ('Core', 'Graphics: WebRender')
-
- if CONFIG['MOZ_TREE_CAIRO']:
- DIRS += ['cairo']
-
-+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+ DIRS += ['graphite2/src' ]
-+
- if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
- DIRS += ['harfbuzz/src']
-
- DIRS += [
- '2d',
- 'ycbcr',
- 'angle',
- 'src',
-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']
-
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-
- LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
-
--DEFINES['GRAPHITE2_STATIC'] = True
-+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
-+else:
-+ DEFINES['GRAPHITE2_STATIC'] = True
-
- if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
- CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-
- 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
-@@ -2690,16 +2690,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"
- fi
- fi
-
- dnl ========================================================
-+dnl Check for graphite2
-+dnl ========================================================
-+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
-+ dnl graphite2.pc has bogus version, check manually
-+ _SAVE_CFLAGS=$CFLAGS
-+ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS"
-+ AC_TRY_COMPILE([ #include <graphite2/Font.h>
-+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \
-+ ( GR2_VERSION_MAJOR * 10000 +
GR2_VERSION_MINOR \
-+ * 100 + GR2_VERSION_BUGFIX >= \
-+ (major) * 10000 + (minor) * 100 + (bugfix) )
-+ ], [
-+ #if !GR2_VERSION_REQUIRE(1,3,8)
-+ #error "Insufficient graphite2 version."
-+ #endif
-+ ], [],
-+ [AC_MSG_ERROR([--with-system-graphite2 requested but no
working libgraphite2 found])])
-+ 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 ========================================================
-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']:
- OS_LIBS += [
- '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'],
- '-lgvr',
- ]
-
- OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
- OS_LIBS += CONFIG['MOZ_WEBRTC_X11_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_JPEG']:
- OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
-
- if CONFIG['MOZ_SYSTEM_PNG']:
- OS_LIBS += CONFIG['MOZ_PNG_LIBS']
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
---- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -377,16 +377,30 @@ def freetype2_combined_info(fontconfig_i
- return namespace(
- cflags=freetype2_info.cflags + fontconfig_info.cflags,
- libs=freetype2_info.libs + fontconfig_info.libs,
- )
-
- add_old_configure_assignment('_HAVE_FREETYPE2',
- depends_if(freetype2_info)(lambda _: True))
-
-+# Graphite2
-+# ==============================================================
-+option('--with-system-graphite2',
-+ help="Use system graphite2 (located with pkgconfig)")
-+
-+@depends('--with-system-graphite2')
-+def check_for_graphite2(value):
-+ return bool(value)
-+
-+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2',
-+ when=check_for_graphite2)
-+
-+set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _:
True))
-+
- # HarfBuzz
- # ==============================================================
- option('--with-system-harfbuzz',
- help="Use system harfbuzz (located with pkgconfig)")
-
- system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.3.1',
- when='--with-system-harfbuzz')
-
diff --git a/http/firefox-esr/patches/2003_blessings_TERM.patch
b/http/firefox-esr/patches/2003_blessings_TERM.patch
new file mode 100644
index 0000000..838aa05
--- /dev/null
+++ b/http/firefox-esr/patches/2003_blessings_TERM.patch
@@ -0,0 +1,29 @@
+https://github.com/erikrose/blessings/pull/137
+
+Fixes: https://bugs.gentoo.org/654316
+
+From 5fefc65c306cf9ec492e7b422d6bb4842385afbc
+[PATCH 1/2] Fix error when TERM is unset or improperly set
+
+From d885df78c6f931abf3259343aaaa897e16c8cba1
+[PATCH 2/2] Explicitly catch curses.error
+
+
+--- a/third_party/python/blessings/blessings/__init__.py
++++ b/third_party/python/blessings/blessings/__init__.py
+@@ -94,8 +94,13 @@ class Terminal(object):
+ # init sequences to the stream if it has a file descriptor, and
+ # send them to stdout as a fallback, since they have to go
+ # somewhere.
+- setupterm(kind or environ.get('TERM', 'unknown'),
+- self._init_descriptor)
++ try:
++ setupterm(kind or environ.get('TERM', 'dumb') or 'dumb',
++ self._init_descriptor)
++ except curses.error:
++ # There was an error setting up the terminal, either curses
is
++ # not supported or TERM is incorrectly set. Fall back to
dumb.
++ self._does_styling = False
+
+ self.stream = stream
+
diff --git a/http/firefox-esr/patches/2004_fix_sandbox_lto.patch
b/http/firefox-esr/patches/2004_fix_sandbox_lto.patch
new file mode 100644
index 0000000..ed1f8c9
--- /dev/null
+++ b/http/firefox-esr/patches/2004_fix_sandbox_lto.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# Parent b8e6418f771de6a3a183d0bb37d313512b61bbab
+https://bugs.gentoo.org/666580
+
+diff --git a/security/sandbox/linux/moz.build
b/security/sandbox/linux/moz.build
+--- a/security/sandbox/linux/moz.build
++++ b/security/sandbox/linux/moz.build
+@@ -96,17 +96,17 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc')
+ '-Wno-empty-body',
+ ]
+
+ # gcc lto likes to put the top level asm in syscall.cc in a different
partition
+ # from the function using it which breaks the build. Work around that by
+ # forcing there to be only one partition.
+ for f in CONFIG['OS_CXXFLAGS']:
+ if f.startswith('-flto') and CONFIG['CC_TYPE'] != 'clang':
+- LDFLAGS += ['--param lto-partitions=1']
++ LDFLAGS += ['--param', 'lto-partitions=1']
+
+ DEFINES['NS_NO_XPCOM'] = True
+ DisableStlWrapping()
+
+ LOCAL_INCLUDES += ['/security/sandbox/linux']
+ LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']
+ LOCAL_INCLUDES += ['/security/sandbox/chromium']
+ LOCAL_INCLUDES += ['/nsprpub']
diff --git a/http/firefox-esr/patches/2006_pgo_gcc_spellchecker.patch
b/http/firefox-esr/patches/2006_pgo_gcc_spellchecker.patch
new file mode 100644
index 0000000..2ecfa46
--- /dev/null
+++ b/http/firefox-esr/patches/2006_pgo_gcc_spellchecker.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# Parent dad467be4860095b6bd0efdf58e60e975e12d3c5
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88561
+
+diff --git a/extensions/spellcheck/src/moz.build
b/extensions/spellcheck/src/moz.build
+--- a/extensions/spellcheck/src/moz.build
++++ b/extensions/spellcheck/src/moz.build
+@@ -26,8 +26,13 @@ LOCAL_INCLUDES += [
+ ]
+ EXPORTS.mozilla += [
+ 'mozInlineSpellChecker.h',
+ 'mozSpellChecker.h',
+ ]
+
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+ CXXFLAGS += ['-Wno-error=shadow']
++
++# spell checker triggers bug
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88561
++# in gcc 7 and 8. It will be fixed in GCC 7.5 and 8.3
++if CONFIG['CC_TYPE'] in ('gcc'):
++ CXXFLAGS += ['-fno-devirtualize']
diff --git a/http/firefox-esr/patches/2007_arm-fp-wasm-fixes.patch
b/http/firefox-esr/patches/2007_arm-fp-wasm-fixes.patch
new file mode 100644
index 0000000..8c66657
--- /dev/null
+++ b/http/firefox-esr/patches/2007_arm-fp-wasm-fixes.patch
@@ -0,0 +1,34 @@
+# HG changeset patch
+# Parent 869216461f5985d028e679b86e0afd1642dd2b82
+
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp
b/js/src/wasm/WasmSignalHandlers.cpp
+--- a/js/src/wasm/WasmSignalHandlers.cpp
++++ b/js/src/wasm/WasmSignalHandlers.cpp
+@@ -243,17 +243,26 @@ using mozilla::DebugOnly;
+ // If you run into compile problems on a tier-3 platform, you can disable
the
+ // emulation here.
+
+ #if defined(__linux__) && defined(__arm__)
+ # define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+ #endif
+
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-# include <sys/user.h>
++struct user_vfp {
++ unsigned long long fpregs[32];
++ unsigned long fpscr;
++};
++
++struct user_vfp_exc {
++ unsigned long fpexc;
++ unsigned long fpinst;
++ unsigned long fpinst2;
++};
+ #endif
+
+ #if defined(ANDROID)
+ // Not all versions of the Android NDK define ucontext_t or mcontext_t.
+ // Detect this and provide custom but compatible definitions. Note that
these
+ // follow the GLibc naming convention to access register values from
+ // mcontext_t.
+ //
diff --git a/http/firefox-esr/patches/2012_allow-non-ascii-chars.patch
b/http/firefox-esr/patches/2012_allow-non-ascii-chars.patch
new file mode 100644
index 0000000..59937dd
--- /dev/null
+++ b/http/firefox-esr/patches/2012_allow-non-ascii-chars.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/666948
+
+and required for rust-1.33 patch
+
+--- a/python/mozbuild/mozbuild/controller/building.py
++++ b/python/mozbuild/mozbuild/controller/building.py
+@@ -571,7 +571,7 @@ class TerminalLoggingHandler(logging.Handler):
+ if self.footer:
+ self.footer.clear()
+
+- self.fh.write(msg)
++ self.fh.write(msg.encode("utf-8"))
+ self.fh.write('\n')
+
+ if self.footer:
diff --git a/http/firefox-esr/patches/6003_fix_syscall_wrappers_on_musl.patch
b/http/firefox-esr/patches/6003_fix_syscall_wrappers_on_musl.patch
new file mode 100644
index 0000000..3fbea01
--- /dev/null
+++ b/http/firefox-esr/patches/6003_fix_syscall_wrappers_on_musl.patch
@@ -0,0 +1,47 @@
+>From 0b1e174fa3acdde982a051ee0a030566ea8368cb Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel AT sholland.org>
+Date: Sun, 8 Jan 2017 19:19:23 -0600
+Subject: [PATCH 4/4] Fix syscall wrappers on musl
+
+musl defines p{read,write}64 to their non-suffixed equivalents to avoid
+duplication in its syscall wrappers. This breaks macro expansion here,
+leading to errors such as:
+
+In function size_t sys_pread64(int, void*, size_t, off_t):
+ error: '__NR_pread' was not declared in this scope
+
+The fix here is to undefine the p{read,write}64 macros, so the syscall
+expands to (e.g.) __NR_pread64 instead.
+
+Signed-off-by: Samuel Holland <samuel AT sholland.org>
+---
+ .../google-breakpad/src/third_party/lss/linux_syscall_support.h | 7
+++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git
a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h

b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+---
a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
++++
b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+@@ -161,16 +161,23 @@ extern "C" {
+ # undef __NR_pipe
+ #endif
+
+ #if defined(__ANDROID__)
+ // waitpid is blocked by seccomp on all architectures on recent Android.
+ # undef __NR_waitpid
+ #endif
+
++#ifdef pread64
++#undef pread64
++#endif
++#ifdef pwrite64
++#undef pwrite64
++#endif
++
+ /* As glibc often provides subtly incompatible data structures (and implicit
+ * wrapper functions that convert them), we provide our own kernel data
+ * structures for use by the system calls.
+ * These structures have been developed by using Linux 2.6.23 headers for
+ * reference. Note though, we do not care about exact API compatibility
+ * with the kernel, and in fact the kernel often does not have a single
+ * API that works across architectures. Instead, we try to mimic the glibc
+ * API where reasonable, and only guarantee ABI compatibility with the
diff --git a/http/firefox-esr/patches/6004_musl_memory_report.patch
b/http/firefox-esr/patches/6004_musl_memory_report.patch
new file mode 100644
index 0000000..cebaa99
--- /dev/null
+++ b/http/firefox-esr/patches/6004_musl_memory_report.patch
@@ -0,0 +1,22 @@
+From: Jory A. Pratt <anarchy AT gentoo.org>
+
+Only use system heap reporter with glibc
+
+--- a/xpcom/base/nsMemoryReporterManager.cpp
++++ b/xpcom/base/nsMemoryReporterManager.cpp
+@@ -642,6 +642,7 @@ static MOZ_MUST_USE nsresult
PrivateDistinguishedAmount(int64_t* aN) {
+ return NS_OK;
+ }
+
++#ifdef __GLIBC__
+ # define HAVE_SYSTEM_HEAP_REPORTER 1
+ // Windows can have multiple separate heaps. During testing there were
multiple
+ // heaps present but the non-default ones had sizes no more than a few 10s
of
+@@ -698,6 +699,7 @@ static MOZ_MUST_USE nsresult SystemHeapSize(int64_t*
aSizeOut) {
+ *aSizeOut = heapsSize;
+ return NS_OK;
+ }
++#endif
+
+ struct SegmentKind {
+ DWORD mState;
diff --git a/http/firefox-esr/patches/6006_musl_fix_tools.patch
b/http/firefox-esr/patches/6006_musl_fix_tools.patch
new file mode 100644
index 0000000..26293a8
--- /dev/null
+++ b/http/firefox-esr/patches/6006_musl_fix_tools.patch
@@ -0,0 +1,17 @@
+From: Jory A. Pratt <anarchy AT gentoo.org>
+
+getcontext is only avaliable on glibc systems
+
+--- a/tools/profiler/core/platform-linux-android.cpp
++++ b/tools/profiler/core/platform-linux-android.cpp
+@@ -497,8 +497,10 @@ static void PlatformInit(PSLockRef aLock) {}
+ ucontext_t sSyncUContext;
+
+ void Registers::SyncPopulate() {
++#if defined(__GLIBC__)
+ if (!getcontext(&sSyncUContext)) {
+ PopulateRegsFromContext(*this, &sSyncUContext);
+ }
++#endif
+ }
+ #endif
diff --git a/http/firefox-esr/patches/7000_sys_auxv_non_glibc.patch
b/http/firefox-esr/patches/7000_sys_auxv_non_glibc.patch
new file mode 100644
index 0000000..ffc6b85
--- /dev/null
+++ b/http/firefox-esr/patches/7000_sys_auxv_non_glibc.patch
@@ -0,0 +1,67 @@
+From: Jory A. Pratt <anarchy AT gentoo.org>
+
+sys/auvx.h avaliable on more then just glibc systems
+
+diff --git
a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c
b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c
+--- a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c
++++ b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c
+@@ -6,20 +6,17 @@
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+ #include <stdlib.h>
+ #include <string.h>
+ #include <features.h>
+-#ifndef __GLIBC_PREREQ
+-#define __GLIBC_PREREQ(a, b) 0
+-#endif
+-#if __GLIBC_PREREQ(2, 16)
++#if defined(__linux__)
+ #include <sys/auxv.h>
+ #else
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <link.h>
+ #endif
+ #include "system_wrappers/include/cpu_features_wrapper.h"
+@@ -27,17 +24,17 @@
+ #if defined(WEBRTC_ARCH_ARM_FAMILY)
+ #include <asm/hwcap.h>
+
+ uint64_t WebRtc_GetCPUFeaturesARM(void) {
+ uint64_t result = 0;
+ int architecture = 0;
+ unsigned long hwcap = 0;
+ const char* platform = NULL;
+-#if __GLIBC_PREREQ(2, 16)
++#if defined(__linux__)
+ hwcap = getauxval(AT_HWCAP);
+ platform = (const char*)getauxval(AT_PLATFORM);
+ #else
+ ElfW(auxv_t) auxv;
+ int fd = open("/proc/self/auxv", O_RDONLY);
+ if (fd >= 0) {
+ while (hwcap == 0 || platform == NULL) {
+ if (read(fd, &auxv, sizeof(auxv)) < (ssize_t)sizeof(auxv)) {
+@@ -51,17 +48,17 @@ uint64_t WebRtc_GetCPUFeaturesARM(void)
+ break;
+ case AT_PLATFORM:
+ platform = (const char*)auxv.a_un.a_val;
+ break;
+ }
+ }
+ close(fd);
+ }
+-#endif // __GLIBC_PREREQ(2,16)
++#endif // (__linux__)
+ #if defined(__aarch64__)
+ architecture = 8;
+ if ((hwcap & HWCAP_FP) != 0)
+ result |= kCPUFeatureVFPv3;
+ if ((hwcap & HWCAP_ASIMD) != 0)
+ result |= kCPUFeatureNEON;
+ #else
+ if (platform != NULL) {
diff --git a/http/firefox-esr/patches/7001_make-pgo-use-toolchain.patch
b/http/firefox-esr/patches/7001_make-pgo-use-toolchain.patch
new file mode 100644
index 0000000..bccc226
--- /dev/null
+++ b/http/firefox-esr/patches/7001_make-pgo-use-toolchain.patch
@@ -0,0 +1,32 @@
+# HG changeset patch
+# Parent 19684dd9010f6e104af6997b67baef6c4c633337
+
+diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix
+--- a/build/unix/mozconfig.unix
++++ b/build/unix/mozconfig.unix
+@@ -1,16 +1,25 @@
+ . "$topsrcdir/build/mozconfig.common"
+
+ TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+ if [ -n "$FORCE_GCC" ]; then
+ CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
+ CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
+
++ if [ -n "$MOZ_PGO" ]; then
++ if [ -z "$USE_ARTIFACT" ]; then
++ ac_add_options --enable-lto
++ fi
++ export AR="$topsrcdir/gcc/bin/gcc-ar"
++ export NM="$topsrcdir/gcc/bin/gcc-nm"
++ export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib"
++ fi
++
+ # We want to make sure we use binutils and other binaries in the
tooltool
+ # package.
+ mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
+ ac_add_options --with-clang-path=$MOZ_FETCHES_DIR/clang/bin/clang
+ else
+ CC="$MOZ_FETCHES_DIR/clang/bin/clang"
+ CXX="$MOZ_FETCHES_DIR/clang/bin/clang++"
+ export ENABLE_CLANG_PLUGIN=1
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index b4b640c..5d333e6 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -85,7 +85,7 @@ depends alsa-lib "--enable-alsa" &&
# '--disable-wave --disable-ogg --disable-webm
--disable-dash' \
# 'for audio/video support' &&

-optional_depends JACK \
+optional_depends JACK-DRIVER \
"--enable-jack" \
"--disable-jack" \
"use JACK for audio support" &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 9641479..a81cca1 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2020-09-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: JACK-DRIVER it is
+
2020-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: add --enable-debug to debug flags

diff --git a/libs/nspr/DETAILS b/libs/nspr/DETAILS
index 0385fcf..29b3692 100755
--- a/libs/nspr/DETAILS
+++ b/libs/nspr/DETAILS
@@ -1,6 +1,6 @@
SPELL=nspr
- VERSION=4.27
-
SOURCE_HASH=sha512:2be539e6fd5ed8987874147a2bacc3f0b7177cdfddbb1a4f9e5f93575de871584b05fb56ca4e1ba5f7e53074cd4069310658f1559de0f38def208b087b6e6dca
+ VERSION=4.28
+
SOURCE_HASH=sha512:5badee7bc4b43270b384e2f6ee0654be88b2fb4a5db1dfc46e441520bf66496105db80bced2234b73c18150eb6a6fe00f93cea1e2cfe809404bfd3e02de109c4
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=https://ftp.mozilla.org/pub/mozilla.org/$SPELL/releases/v$VERSION/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index e2428e8..95e52b0 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,6 @@
+2020-09-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 4.28
+
2020-07-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.27




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ab756cb0a2ff08320236d3f397de7a462c84f04b), Thomas Orgis, 09/08/2020

Archive powered by MHonArc 2.6.24.

Top of Page