Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] firefox: update to 69.0.
@ 2019-09-03 22:03 voidlinux-github
  2019-09-04 21:34 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-03 22:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

There is a new pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

[WIP] firefox: update to 69.0.
Todo:

- [ ] build and test on some architectures
- [ ] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 6128 bytes --]

From 29b22f1bce89430bdf08d58cd8a7260c6c756c27 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH] [WIP] firefox: update to 69.0.

[ci skip]
---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 16 +++++-
 4 files changed, 36 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..d6f66a6d91b 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -44,6 +44,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +66,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
@ 2019-09-04 21:34 ` voidlinux-github
  2019-09-04 21:34 ` voidlinux-github
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-04 21:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

[WIP] firefox: update to 69.0.
Todo:

- [ ] build and test on some architectures
- [ ] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 28825 bytes --]

From 29b22f1bce89430bdf08d58cd8a7260c6c756c27 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH 01/18] [WIP] firefox: update to 69.0.

[ci skip]
---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 16 +++++-
 4 files changed, 36 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..d6f66a6d91b 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -44,6 +44,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +66,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 

From 376bdb2830287bb5c8f6f5e91c6f7ee87caf5d21 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 3 Sep 2019 23:48:05 -0400
Subject: [PATCH 02/18] keybase: update to 4.4.0.

---
 srcpkgs/keybase/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index a505df25165..68d005699cd 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,6 +1,6 @@
 # Template file for 'keybase'
 pkgname=keybase
-version=4.3.2
+version=4.4.0
 revision=1
 wrksrc="client-${version}"
 build_style=go
@@ -13,7 +13,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://keybase.io/"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778
+checksum=9e4d7c8bbf087347fcdb5f150205560a56912848d30e2e0630c1c3469ec07b06
 
 post_install() {
 	vlicense LICENSE

From c59c1a827dbfa7b47aea2f2b1ee54d99f091030e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 3 Sep 2019 23:48:10 -0400
Subject: [PATCH 03/18] keybase-desktop: update to 4.4.0.

---
 srcpkgs/keybase-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 4296259c3d2..b3643122d9c 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'keybase-desktop'
 pkgname=keybase-desktop
-version=4.3.2
+version=4.4.0
 revision=1
 wrksrc="client-${version}"
 hostmakedepends="git nodejs-lts yarn"
@@ -10,7 +10,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="BSD-3-Clause"
 homepage="https://keybase.io"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778
+checksum=9e4d7c8bbf087347fcdb5f150205560a56912848d30e2e0630c1c3469ec07b06
 nostrip_files="Keybase"
 
 case "${XBPS_TARGET_MACHINE}" in

From c01cf8d51109b4cfefcf9dd65b7d233b18fe0bd0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:47:08 +0200
Subject: [PATCH 04/18] duktape: update to 2.4.0.

---
 common/shlibs            | 2 +-
 srcpkgs/duktape/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 01a26839a20..57f7025459d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2882,7 +2882,7 @@ libbrotlienc.so.1 brotli-1.0.2_1
 libfilteraudio.so filter_audio-0.0.1_1
 libgstreamermm-1.0.so.1 gstreamermm-1.8.0_1
 libmovit.so.8 movit-1.6.0_1
-libduktape.so.203 duktape-2.3.0_1
+libduktape.so.204 duktape-2.4.0_1
 libccgnu2-1.8.so.0 commoncpp2-1.8.1_1
 libccext2-1.8.so.0 commoncpp2-1.8.1_1
 libucommon.so.8 ucommon-7.0.0_1
diff --git a/srcpkgs/duktape/template b/srcpkgs/duktape/template
index a77c759199e..c7d5a957a18 100644
--- a/srcpkgs/duktape/template
+++ b/srcpkgs/duktape/template
@@ -1,6 +1,6 @@
 # Template file for 'duktape'
 pkgname=duktape
-version=2.3.0
+version=2.4.0
 revision=1
 build_style=gnu-makefile
 make_build_args="-f Makefile.sharedlibrary"
@@ -10,7 +10,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="MIT"
 homepage="http://duktape.org"
 distfiles="https://github.com/svaarala/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=ed6e2f3ab2061628a7aeee27ccff16538ba6a151480cccf2e846bd061e45afe8
+checksum=86a89307d1633b5cedb2c6e56dc86e92679fc34b05be551722d8cc69ab0771fc
 
 pre_build() {
 	sed -i 's|^CC.*||g' Makefile.sharedlibrary

From 5d215d9f15b94f745f77c9332bcfc7405557f858 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:47:23 +0200
Subject: [PATCH 05/18] edbrowse: rebuild for duktape-2.4.0.

---
 srcpkgs/edbrowse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template
index 03c8215e0ad..1152d01e3a4 100644
--- a/srcpkgs/edbrowse/template
+++ b/srcpkgs/edbrowse/template
@@ -1,7 +1,7 @@
 # Template file for 'edbrowse'
 pkgname=edbrowse
 version=3.7.5
-revision=1
+revision=2
 hostmakedepends="perl pkg-config"
 build_style=cmake
 makedepends="duktape-devel libcurl-devel libtidy5-devel pcre-devel

From e27bb242cdd36e692be4298722e37005b5dafe60 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:47:31 +0200
Subject: [PATCH 06/18] gerbera: rebuild for duktape-2.4.0.

---
 srcpkgs/gerbera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index e652eb37668..cdec13159fd 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
@@ -11,7 +11,7 @@ maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=89bbcebcf6beebb50b9453329b13e6a20e3e505dee5655486e90e1f085591f4a
+checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From 877b6b533efe004bb03cf672042663d116e8fd0e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:51:26 +0200
Subject: [PATCH 07/18] aws-cli: update to 1.16.231.

---
 srcpkgs/aws-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 125e1c9c79a..7d1e5b4bced 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
-version=1.16.169
+version=1.16.231
 revision=1
 archs=noarch
 wrksrc="aws-cli-${version}"
@@ -14,7 +14,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aws/aws-cli"
 distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz"
-checksum=eaec519dbb638d9aeaf9a9d451d011e64e0657cd71bf961a2c2544f175d00d2e
+checksum=959290cc2567de46cff26fa6bc59d0176da89ef3a2c78b500283cbf70a15614b
 
 post_install() {
 	vlicense LICENSE.txt

From e1bac5609edb35a87d42f8cfbdb82f06aa100412 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:51:38 +0200
Subject: [PATCH 08/18] mmark: update to 2.1.1.

---
 srcpkgs/mmark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index fb0e3dd8851..d32b1a4228b 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,6 +1,6 @@
 # Template file for 'mmark'
 pkgname=mmark
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=go
 go_import_path=github.com/mmarkdown/mmark
@@ -10,7 +10,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/mmarkdown/mmark/"
 distfiles="https://github.com/mmarkdown/mmark/archive/v${version}.tar.gz"
-checksum=094b56539960890319c657a098248adba577c53ec5b703a5b2525b68d15c2048
+checksum=c69bbeb263ca38c528016094fc299585fe8804db0c80f123c994cdec0c191716
 
 post_install() {
 	vlicense LICENSE

From 4522ccdbd85ea02cde090df59beba4a0ade7d855 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:52:41 +0200
Subject: [PATCH 09/18] jemalloc: update to 5.2.1.

---
 srcpkgs/jemalloc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jemalloc/template b/srcpkgs/jemalloc/template
index 1800fc5e15d..aba5e005696 100644
--- a/srcpkgs/jemalloc/template
+++ b/srcpkgs/jemalloc/template
@@ -1,6 +1,6 @@
 # Template file for 'jemalloc'
 pkgname=jemalloc
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=gnu-configure
 configure_args="je_cv_static_page_shift=12"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
 homepage="http://jemalloc.net/"
 #changelog="https://raw.githubusercontent.com/jemalloc/jemalloc/master/ChangeLog"
 distfiles="https://github.com/jemalloc/jemalloc/releases/download/${version}/jemalloc-${version}.tar.bz2"
-checksum=74be9f44a60d2a99398e706baa921e4efde82bf8fd16e5c0643c375c5851e3b4
+checksum=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6
 
 post_install() {
 	vlicense COPYING

From fb252687e4576cb7dfd84b39704db2cfa731ac99 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:53:30 +0200
Subject: [PATCH 10/18] poezio: update to 0.12.1.

---
 srcpkgs/poezio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/poezio/template b/srcpkgs/poezio/template
index 0e46c871203..56f8138bb5e 100644
--- a/srcpkgs/poezio/template
+++ b/srcpkgs/poezio/template
@@ -1,7 +1,7 @@
 # Template file for 'poezio'
 pkgname=poezio
-version=0.12
-revision=2
+version=0.12.1
+revision=1
 build_style=python3-module
 pycompile_module="poezio poezio_plugins poezio_themes"
 hostmakedepends="python3-setuptools pkg-config"
@@ -12,7 +12,7 @@ maintainer="Franklin Delehelle <franklin.delehelle@odena.eu>"
 license="Zlib"
 homepage="https://poez.io/"
 distfiles="${PYPI_SITE}/p/poezio/poezio-${version}.tar.gz"
-checksum=4d4aacfda98454719e017e56e7012d283de12b8f7400b51c1fe0d1dc841f231e
+checksum=d59dedf80d074074dd4f6798559a257853fa6ab064d992d7a203f11c8b2a9bd7
 
 pre_configure() {
 	sed -i "s|os.environ.get('CC', 'cc')|'${CC}'|" setup.py

From 5b78fbbb6dc5d4968e99ac43e9e12ba496062daa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:56:04 +0200
Subject: [PATCH 11/18] libgit2-0.27: removed, obsolete package.

---
 srcpkgs/libgit2-0.27/template | 28 ----------------------------
 srcpkgs/libgit2-0.27/update   |  3 ---
 2 files changed, 31 deletions(-)
 delete mode 100644 srcpkgs/libgit2-0.27/template
 delete mode 100644 srcpkgs/libgit2-0.27/update

diff --git a/srcpkgs/libgit2-0.27/template b/srcpkgs/libgit2-0.27/template
deleted file mode 100644
index c76c0d3ba1a..00000000000
--- a/srcpkgs/libgit2-0.27/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'libgit2-0.27'
-pkgname=libgit2-0.27
-version=0.27.8
-revision=2
-wrksrc="libgit2-${version}"
-build_style=cmake
-configure_args="-DTHREADSAFE=ON"
-hostmakedepends="python git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel libuv-devel"
-short_desc="Git linkable library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later WITH GCC-exception-2.0"
-homepage="https://libgit2.org"
-distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz"
-checksum=8313873d49dc01e8b880ec334d7430ae67496a89aaa8c6e7bbd3affb47a00c76
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		# Don't use qsort_r, see src/util.c
-		CFLAGS="-D__ANDROID_API__"
-		;;
-esac
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/include
-	rm -rf ${DESTDIR}/usr/lib/libgit2.so
-	rm -rf ${DESTDIR}/usr/lib/pkgconfig
-}
diff --git a/srcpkgs/libgit2-0.27/update b/srcpkgs/libgit2-0.27/update
deleted file mode 100644
index e80c8970aed..00000000000
--- a/srcpkgs/libgit2-0.27/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://github.com/libgit2/libgit2/tags"
-pattern='archive/v?\K[\d.]+(?=\.tar\.gz)'
-ignore="0.[123456789][12345689]*"

From 152d138f9154a44e77223554d7eade13bb2f1fcd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:59:18 +0200
Subject: [PATCH 12/18] man-db: update to 2.8.7.

---
 srcpkgs/man-db/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index a3cf6934df3..60b09450c2a 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,6 +1,6 @@
 # Template file for 'man-db'
 pkgname=man-db
-version=2.8.6.1
+version=2.8.7
 revision=1
 build_style=gnu-configure
 configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.nongnu.org/man-db/"
 distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=2c77a2bb9dbf06f72417a6f63063e204888a22a5020ff77334d304d55f813a28
+checksum=b9cd5bb996305d08bfe9e1114edc30b4c97be807093b88af8033ed1cf9beb326
 lib32disabled=yes
 
 alternatives="

From e53fdefa6c626791d5aa0add79c9e24a86119035 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 12:04:05 +0200
Subject: [PATCH 13/18] perl-strictures: update to 2.000006.

---
 srcpkgs/perl-strictures/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-strictures/template b/srcpkgs/perl-strictures/template
index 869fa00be6a..f682d3b3732 100644
--- a/srcpkgs/perl-strictures/template
+++ b/srcpkgs/perl-strictures/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-strictures'
 pkgname=perl-strictures
-version=2.000005
+version=2.000006
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -12,5 +12,6 @@ short_desc="Turn on strict and make most warnings fatal"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/strictures"
-distfiles="https://cpan.org/authors/id/E/ET/ETHER/strictures-${version}.tar.gz"
-checksum=960bdb9f82c8f09caebc417bce3fdf75b27de81f4408d0ba0b0a6d61ab86dd99
+distfiles="https4.1://cpan.org/authors/id/E/ET/ETHER/strictures-${version}.tar.gz"
+distfiles="${CPAN_SITE}/lib/HAARG/${pkgname/perl-/}-${version}.tar.gz"
+checksum=09d57974a6d1b2380c802870fed471108f51170da81458e2751859f2714f8d57

From d5ffdedf673a954b51a6d34bac53dd5ca8963552 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 12:04:13 +0200
Subject: [PATCH 14/18] mpg123: update to 1.25.12.

---
 srcpkgs/mpg123/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index 9453f09afd2..379c8ac191b 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,6 +1,6 @@
 # Template file for 'mpg123'
 pkgname=mpg123
-version=1.25.11
+version=1.25.12
 revision=1
 build_style=gnu-configure
 configure_args="--with-optimization=0 --with-default-audio=alsa
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.mpg123.org/"
 distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2"
-checksum=df063307faa27c7d9efe63d2139b1564cfc7cdbb7c6f449c89ef8faabfa0eab2
+checksum=1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1
 
 case "$XBPS_TARGET_MACHINE" in
 	# No LFS required with musl

From 037fa479328dbc1b7ac93d333eedeb2b1b30cdcb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 12:07:28 +0200
Subject: [PATCH 15/18] mercurial: update to 5.1.

---
 srcpkgs/mercurial/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 9ccfbf7a173..cb8e673162d 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.0.2
+version=5.1
 revision=1
 build_style=python2-module
 pycompile_module="hgdemandimport hgext hgext3rd mercurial"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=29b850792f1f054cece5b8de8e815dbbe266e1d11814c3755290c0879883c0f8
+checksum=6222d92d860e411e422b7dc58062132bc512fa52ec48a71143b40cab4be7c829
 
 post_install() {
 	vmkdir usr/share/man/man1

From c006bcb12457d4b6940ab488d3c11271d274e34a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 12:09:31 +0200
Subject: [PATCH 16/18] re2: update to 2019.09.01.

---
 srcpkgs/re2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template
index 3392eb66e2f..a173a971039 100644
--- a/srcpkgs/re2/template
+++ b/srcpkgs/re2/template
@@ -1,6 +1,6 @@
 # Template file for 're2'
 pkgname=re2
-version=2019.08.01
+version=2019.09.01
 revision=1
 wrksrc="${pkgname}-${version//./-}"
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/re2"
 distfiles="${homepage}/archive/${version//./-}.tar.gz"
-checksum=38bc0426ee15b5ed67957017fd18201965df0721327be13f60496f2b356e3e01
+checksum=b0382aa7369f373a0148218f2df5a6afd6bfa884ce4da2dfb576b979989e615e
 
 post_install() {
 	vlicense LICENSE

From 97b149bf020ca3dd198482ac98217ada150ecd2d Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH 17/18] firefox: update to 69.0.

---
 srcpkgs/firefox/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index d6f66a6d91b..87c81211fd0 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -32,9 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
 # 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)
@@ -126,10 +123,15 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
-	fi
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
+   fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"
 

From 68e7e4d8e7eb66fe6a2d4bc892f60f5443e4eddb Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 4 Sep 2019 23:32:03 +0200
Subject: [PATCH 18/18] firefox-i18n: update to 69.0.

[ci skip]
---
 srcpkgs/firefox-i18n/template | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a18f552af2c..ebd94fbc42c 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=68.0.2
+version=69.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -192,27 +192,27 @@ checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba
  92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e
  65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae
  774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa
- 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4
- 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551
- cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b
- b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613
- 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046
- d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc
- 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3
- a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b
- bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6
- c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9
- 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c
- c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef
- fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac
- c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836
- 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138
- 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203
- 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d
- d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c
- 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c
- d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904
- 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604
- b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea
- 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8
- 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799"
+ 2ac5b6fb05fcedb814da033d4a7a579bdc8e19bbc3dd3edbe08e709b5b6e311b
+ 86176fd8917153a67b4d5ae19a061fdcb18479fd0cbd1ffdf7f726450851f0ce
+ d86b03d4cfa9712fa593a63c00827552b4747530c426134d36bdf0f4ed587cdd
+ 83d33e85bab0271f86f4d37a95948832e2d00848976907b6b0dd9f075d188a0f
+ 27aac8e38302d92cef43b194fc155f903ef5ecdacac04dfbe18fd6f7fb544c84
+ b71f4fed7c00fc252424eaec5e1559ad957b808eba745e66e70a7f75fa7ca747
+ 43543c941e2976d3dd66eef023de7735f55deb7b2265c5c8a4bad43e2ea14af8
+ 09c9c634997a203286140231a873be5c25cd9c928970497b70c6b1f352fe1233
+ bf84a75b854f9bde124580a1de538b80a3e70ac5f1deacbe52a946d45d8b76fd
+ 674027a04ab4514a53dbd75e9d101b79e8c4fbcf8fc510ca915f043222126a65
+ 2f68ed32a10cb8a573343c5fda4833cc2832f58494de4c6abf724e2491c5e223
+ 0f4a049f8948ffc98acdad2540b86037d7e097d388254f39411290bed7386584
+ bca60f844f4c2290de67ca951186892eae2cb3afd1eee4a767b300123b8ae3e8
+ 693b875ed60ada718f6d232f1e419782a95be667ff6f5b6fd6f3e46ded7e536a
+ 0c38cb8b264c7a7fa529d9803b150ffec1038c031db1dda63fd327ec0e4452d3
+ a6f74c6e2eabab97f049f0df75219e62dcfe29561ce5b3e36a10f3b9235ecf82
+ 7113f3531359dc59549ea0d6dbf1b092d9bc0e98bd744622549b633b60988a5b
+ 72b6391e5102612ece89c2656a178542ce60ce98734ee0aba40bc5ef649ceebe
+ 8a8660aa9162ff0e7651fa11ce003f2ffa1b11e57a26163a5955f96118d69c5b
+ 52e8a8f03317c6642f3f2108bd8a81abcad641b9da599af16159e3619f228f5b
+ 0ad05b3a76b50bb7bfd1a111f04c1354af424aa83345a3ea308ddb969c812f8b
+ 4fab9b94d6b99369507970ddef43c2945e8058e8c950b6ffd8b1f3546aac680f
+ 9ee89b73c4f6812d426caa7cbad86d2e5c11328ce1b9b775405c81f156798382
+ 775a6b293da08b501cf754994c7708dd423a2d3848a22572e0e854ee34fcd178"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
  2019-09-04 21:34 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-04 21:34 ` voidlinux-github
  2019-09-04 21:37 ` voidlinux-github
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-04 21:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

[WIP] firefox: update to 69.0.
Todo:

- [ ] build and test on some architectures
- [ ] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 28825 bytes --]

From 29b22f1bce89430bdf08d58cd8a7260c6c756c27 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH 01/18] [WIP] firefox: update to 69.0.

[ci skip]
---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 16 +++++-
 4 files changed, 36 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..d6f66a6d91b 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -44,6 +44,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +66,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 

From 376bdb2830287bb5c8f6f5e91c6f7ee87caf5d21 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 3 Sep 2019 23:48:05 -0400
Subject: [PATCH 02/18] keybase: update to 4.4.0.

---
 srcpkgs/keybase/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index a505df25165..68d005699cd 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,6 +1,6 @@
 # Template file for 'keybase'
 pkgname=keybase
-version=4.3.2
+version=4.4.0
 revision=1
 wrksrc="client-${version}"
 build_style=go
@@ -13,7 +13,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://keybase.io/"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778
+checksum=9e4d7c8bbf087347fcdb5f150205560a56912848d30e2e0630c1c3469ec07b06
 
 post_install() {
 	vlicense LICENSE

From c59c1a827dbfa7b47aea2f2b1ee54d99f091030e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 3 Sep 2019 23:48:10 -0400
Subject: [PATCH 03/18] keybase-desktop: update to 4.4.0.

---
 srcpkgs/keybase-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 4296259c3d2..b3643122d9c 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'keybase-desktop'
 pkgname=keybase-desktop
-version=4.3.2
+version=4.4.0
 revision=1
 wrksrc="client-${version}"
 hostmakedepends="git nodejs-lts yarn"
@@ -10,7 +10,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="BSD-3-Clause"
 homepage="https://keybase.io"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778
+checksum=9e4d7c8bbf087347fcdb5f150205560a56912848d30e2e0630c1c3469ec07b06
 nostrip_files="Keybase"
 
 case "${XBPS_TARGET_MACHINE}" in

From c01cf8d51109b4cfefcf9dd65b7d233b18fe0bd0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:47:08 +0200
Subject: [PATCH 04/18] duktape: update to 2.4.0.

---
 common/shlibs            | 2 +-
 srcpkgs/duktape/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 01a26839a20..57f7025459d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2882,7 +2882,7 @@ libbrotlienc.so.1 brotli-1.0.2_1
 libfilteraudio.so filter_audio-0.0.1_1
 libgstreamermm-1.0.so.1 gstreamermm-1.8.0_1
 libmovit.so.8 movit-1.6.0_1
-libduktape.so.203 duktape-2.3.0_1
+libduktape.so.204 duktape-2.4.0_1
 libccgnu2-1.8.so.0 commoncpp2-1.8.1_1
 libccext2-1.8.so.0 commoncpp2-1.8.1_1
 libucommon.so.8 ucommon-7.0.0_1
diff --git a/srcpkgs/duktape/template b/srcpkgs/duktape/template
index a77c759199e..c7d5a957a18 100644
--- a/srcpkgs/duktape/template
+++ b/srcpkgs/duktape/template
@@ -1,6 +1,6 @@
 # Template file for 'duktape'
 pkgname=duktape
-version=2.3.0
+version=2.4.0
 revision=1
 build_style=gnu-makefile
 make_build_args="-f Makefile.sharedlibrary"
@@ -10,7 +10,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="MIT"
 homepage="http://duktape.org"
 distfiles="https://github.com/svaarala/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=ed6e2f3ab2061628a7aeee27ccff16538ba6a151480cccf2e846bd061e45afe8
+checksum=86a89307d1633b5cedb2c6e56dc86e92679fc34b05be551722d8cc69ab0771fc
 
 pre_build() {
 	sed -i 's|^CC.*||g' Makefile.sharedlibrary

From 5d215d9f15b94f745f77c9332bcfc7405557f858 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:47:23 +0200
Subject: [PATCH 05/18] edbrowse: rebuild for duktape-2.4.0.

---
 srcpkgs/edbrowse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template
index 03c8215e0ad..1152d01e3a4 100644
--- a/srcpkgs/edbrowse/template
+++ b/srcpkgs/edbrowse/template
@@ -1,7 +1,7 @@
 # Template file for 'edbrowse'
 pkgname=edbrowse
 version=3.7.5
-revision=1
+revision=2
 hostmakedepends="perl pkg-config"
 build_style=cmake
 makedepends="duktape-devel libcurl-devel libtidy5-devel pcre-devel

From e27bb242cdd36e692be4298722e37005b5dafe60 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:47:31 +0200
Subject: [PATCH 06/18] gerbera: rebuild for duktape-2.4.0.

---
 srcpkgs/gerbera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index e652eb37668..cdec13159fd 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
@@ -11,7 +11,7 @@ maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=89bbcebcf6beebb50b9453329b13e6a20e3e505dee5655486e90e1f085591f4a
+checksum=9c4509189eab6bff0fe183e1dd54ea8cb17d7fb0bc6e21bb5b1a8ccaaf6c60d9
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From 877b6b533efe004bb03cf672042663d116e8fd0e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:51:26 +0200
Subject: [PATCH 07/18] aws-cli: update to 1.16.231.

---
 srcpkgs/aws-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 125e1c9c79a..7d1e5b4bced 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
-version=1.16.169
+version=1.16.231
 revision=1
 archs=noarch
 wrksrc="aws-cli-${version}"
@@ -14,7 +14,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aws/aws-cli"
 distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz"
-checksum=eaec519dbb638d9aeaf9a9d451d011e64e0657cd71bf961a2c2544f175d00d2e
+checksum=959290cc2567de46cff26fa6bc59d0176da89ef3a2c78b500283cbf70a15614b
 
 post_install() {
 	vlicense LICENSE.txt

From e1bac5609edb35a87d42f8cfbdb82f06aa100412 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:51:38 +0200
Subject: [PATCH 08/18] mmark: update to 2.1.1.

---
 srcpkgs/mmark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index fb0e3dd8851..d32b1a4228b 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,6 +1,6 @@
 # Template file for 'mmark'
 pkgname=mmark
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=go
 go_import_path=github.com/mmarkdown/mmark
@@ -10,7 +10,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/mmarkdown/mmark/"
 distfiles="https://github.com/mmarkdown/mmark/archive/v${version}.tar.gz"
-checksum=094b56539960890319c657a098248adba577c53ec5b703a5b2525b68d15c2048
+checksum=c69bbeb263ca38c528016094fc299585fe8804db0c80f123c994cdec0c191716
 
 post_install() {
 	vlicense LICENSE

From 4522ccdbd85ea02cde090df59beba4a0ade7d855 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:52:41 +0200
Subject: [PATCH 09/18] jemalloc: update to 5.2.1.

---
 srcpkgs/jemalloc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jemalloc/template b/srcpkgs/jemalloc/template
index 1800fc5e15d..aba5e005696 100644
--- a/srcpkgs/jemalloc/template
+++ b/srcpkgs/jemalloc/template
@@ -1,6 +1,6 @@
 # Template file for 'jemalloc'
 pkgname=jemalloc
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=gnu-configure
 configure_args="je_cv_static_page_shift=12"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
 homepage="http://jemalloc.net/"
 #changelog="https://raw.githubusercontent.com/jemalloc/jemalloc/master/ChangeLog"
 distfiles="https://github.com/jemalloc/jemalloc/releases/download/${version}/jemalloc-${version}.tar.bz2"
-checksum=74be9f44a60d2a99398e706baa921e4efde82bf8fd16e5c0643c375c5851e3b4
+checksum=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6
 
 post_install() {
 	vlicense COPYING

From fb252687e4576cb7dfd84b39704db2cfa731ac99 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:53:30 +0200
Subject: [PATCH 10/18] poezio: update to 0.12.1.

---
 srcpkgs/poezio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/poezio/template b/srcpkgs/poezio/template
index 0e46c871203..56f8138bb5e 100644
--- a/srcpkgs/poezio/template
+++ b/srcpkgs/poezio/template
@@ -1,7 +1,7 @@
 # Template file for 'poezio'
 pkgname=poezio
-version=0.12
-revision=2
+version=0.12.1
+revision=1
 build_style=python3-module
 pycompile_module="poezio poezio_plugins poezio_themes"
 hostmakedepends="python3-setuptools pkg-config"
@@ -12,7 +12,7 @@ maintainer="Franklin Delehelle <franklin.delehelle@odena.eu>"
 license="Zlib"
 homepage="https://poez.io/"
 distfiles="${PYPI_SITE}/p/poezio/poezio-${version}.tar.gz"
-checksum=4d4aacfda98454719e017e56e7012d283de12b8f7400b51c1fe0d1dc841f231e
+checksum=d59dedf80d074074dd4f6798559a257853fa6ab064d992d7a203f11c8b2a9bd7
 
 pre_configure() {
 	sed -i "s|os.environ.get('CC', 'cc')|'${CC}'|" setup.py

From 5b78fbbb6dc5d4968e99ac43e9e12ba496062daa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:56:04 +0200
Subject: [PATCH 11/18] libgit2-0.27: removed, obsolete package.

---
 srcpkgs/libgit2-0.27/template | 28 ----------------------------
 srcpkgs/libgit2-0.27/update   |  3 ---
 2 files changed, 31 deletions(-)
 delete mode 100644 srcpkgs/libgit2-0.27/template
 delete mode 100644 srcpkgs/libgit2-0.27/update

diff --git a/srcpkgs/libgit2-0.27/template b/srcpkgs/libgit2-0.27/template
deleted file mode 100644
index c76c0d3ba1a..00000000000
--- a/srcpkgs/libgit2-0.27/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'libgit2-0.27'
-pkgname=libgit2-0.27
-version=0.27.8
-revision=2
-wrksrc="libgit2-${version}"
-build_style=cmake
-configure_args="-DTHREADSAFE=ON"
-hostmakedepends="python git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel libuv-devel"
-short_desc="Git linkable library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later WITH GCC-exception-2.0"
-homepage="https://libgit2.org"
-distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz"
-checksum=8313873d49dc01e8b880ec334d7430ae67496a89aaa8c6e7bbd3affb47a00c76
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		# Don't use qsort_r, see src/util.c
-		CFLAGS="-D__ANDROID_API__"
-		;;
-esac
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/include
-	rm -rf ${DESTDIR}/usr/lib/libgit2.so
-	rm -rf ${DESTDIR}/usr/lib/pkgconfig
-}
diff --git a/srcpkgs/libgit2-0.27/update b/srcpkgs/libgit2-0.27/update
deleted file mode 100644
index e80c8970aed..00000000000
--- a/srcpkgs/libgit2-0.27/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://github.com/libgit2/libgit2/tags"
-pattern='archive/v?\K[\d.]+(?=\.tar\.gz)'
-ignore="0.[123456789][12345689]*"

From 152d138f9154a44e77223554d7eade13bb2f1fcd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 11:59:18 +0200
Subject: [PATCH 12/18] man-db: update to 2.8.7.

---
 srcpkgs/man-db/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index a3cf6934df3..60b09450c2a 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,6 +1,6 @@
 # Template file for 'man-db'
 pkgname=man-db
-version=2.8.6.1
+version=2.8.7
 revision=1
 build_style=gnu-configure
 configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.nongnu.org/man-db/"
 distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=2c77a2bb9dbf06f72417a6f63063e204888a22a5020ff77334d304d55f813a28
+checksum=b9cd5bb996305d08bfe9e1114edc30b4c97be807093b88af8033ed1cf9beb326
 lib32disabled=yes
 
 alternatives="

From e53fdefa6c626791d5aa0add79c9e24a86119035 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 12:04:05 +0200
Subject: [PATCH 13/18] perl-strictures: update to 2.000006.

---
 srcpkgs/perl-strictures/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-strictures/template b/srcpkgs/perl-strictures/template
index 869fa00be6a..f682d3b3732 100644
--- a/srcpkgs/perl-strictures/template
+++ b/srcpkgs/perl-strictures/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-strictures'
 pkgname=perl-strictures
-version=2.000005
+version=2.000006
 revision=1
 archs=noarch
 wrksrc="${pkgname/perl-/}-${version}"
@@ -12,5 +12,6 @@ short_desc="Turn on strict and make most warnings fatal"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/strictures"
-distfiles="https://cpan.org/authors/id/E/ET/ETHER/strictures-${version}.tar.gz"
-checksum=960bdb9f82c8f09caebc417bce3fdf75b27de81f4408d0ba0b0a6d61ab86dd99
+distfiles="https4.1://cpan.org/authors/id/E/ET/ETHER/strictures-${version}.tar.gz"
+distfiles="${CPAN_SITE}/lib/HAARG/${pkgname/perl-/}-${version}.tar.gz"
+checksum=09d57974a6d1b2380c802870fed471108f51170da81458e2751859f2714f8d57

From d5ffdedf673a954b51a6d34bac53dd5ca8963552 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 12:04:13 +0200
Subject: [PATCH 14/18] mpg123: update to 1.25.12.

---
 srcpkgs/mpg123/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index 9453f09afd2..379c8ac191b 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,6 +1,6 @@
 # Template file for 'mpg123'
 pkgname=mpg123
-version=1.25.11
+version=1.25.12
 revision=1
 build_style=gnu-configure
 configure_args="--with-optimization=0 --with-default-audio=alsa
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.mpg123.org/"
 distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2"
-checksum=df063307faa27c7d9efe63d2139b1564cfc7cdbb7c6f449c89ef8faabfa0eab2
+checksum=1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1
 
 case "$XBPS_TARGET_MACHINE" in
 	# No LFS required with musl

From 037fa479328dbc1b7ac93d333eedeb2b1b30cdcb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 12:07:28 +0200
Subject: [PATCH 15/18] mercurial: update to 5.1.

---
 srcpkgs/mercurial/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 9ccfbf7a173..cb8e673162d 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.0.2
+version=5.1
 revision=1
 build_style=python2-module
 pycompile_module="hgdemandimport hgext hgext3rd mercurial"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=29b850792f1f054cece5b8de8e815dbbe266e1d11814c3755290c0879883c0f8
+checksum=6222d92d860e411e422b7dc58062132bc512fa52ec48a71143b40cab4be7c829
 
 post_install() {
 	vmkdir usr/share/man/man1

From c006bcb12457d4b6940ab488d3c11271d274e34a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Sep 2019 12:09:31 +0200
Subject: [PATCH 16/18] re2: update to 2019.09.01.

---
 srcpkgs/re2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template
index 3392eb66e2f..a173a971039 100644
--- a/srcpkgs/re2/template
+++ b/srcpkgs/re2/template
@@ -1,6 +1,6 @@
 # Template file for 're2'
 pkgname=re2
-version=2019.08.01
+version=2019.09.01
 revision=1
 wrksrc="${pkgname}-${version//./-}"
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/re2"
 distfiles="${homepage}/archive/${version//./-}.tar.gz"
-checksum=38bc0426ee15b5ed67957017fd18201965df0721327be13f60496f2b356e3e01
+checksum=b0382aa7369f373a0148218f2df5a6afd6bfa884ce4da2dfb576b979989e615e
 
 post_install() {
 	vlicense LICENSE

From 97b149bf020ca3dd198482ac98217ada150ecd2d Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH 17/18] firefox: update to 69.0.

---
 srcpkgs/firefox/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index d6f66a6d91b..87c81211fd0 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -32,9 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
 # 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)
@@ -126,10 +123,15 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
-	fi
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
+   fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"
 

From 68e7e4d8e7eb66fe6a2d4bc892f60f5443e4eddb Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 4 Sep 2019 23:32:03 +0200
Subject: [PATCH 18/18] firefox-i18n: update to 69.0.

[ci skip]
---
 srcpkgs/firefox-i18n/template | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a18f552af2c..ebd94fbc42c 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=68.0.2
+version=69.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -192,27 +192,27 @@ checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba
  92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e
  65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae
  774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa
- 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4
- 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551
- cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b
- b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613
- 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046
- d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc
- 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3
- a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b
- bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6
- c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9
- 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c
- c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef
- fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac
- c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836
- 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138
- 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203
- 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d
- d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c
- 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c
- d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904
- 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604
- b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea
- 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8
- 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799"
+ 2ac5b6fb05fcedb814da033d4a7a579bdc8e19bbc3dd3edbe08e709b5b6e311b
+ 86176fd8917153a67b4d5ae19a061fdcb18479fd0cbd1ffdf7f726450851f0ce
+ d86b03d4cfa9712fa593a63c00827552b4747530c426134d36bdf0f4ed587cdd
+ 83d33e85bab0271f86f4d37a95948832e2d00848976907b6b0dd9f075d188a0f
+ 27aac8e38302d92cef43b194fc155f903ef5ecdacac04dfbe18fd6f7fb544c84
+ b71f4fed7c00fc252424eaec5e1559ad957b808eba745e66e70a7f75fa7ca747
+ 43543c941e2976d3dd66eef023de7735f55deb7b2265c5c8a4bad43e2ea14af8
+ 09c9c634997a203286140231a873be5c25cd9c928970497b70c6b1f352fe1233
+ bf84a75b854f9bde124580a1de538b80a3e70ac5f1deacbe52a946d45d8b76fd
+ 674027a04ab4514a53dbd75e9d101b79e8c4fbcf8fc510ca915f043222126a65
+ 2f68ed32a10cb8a573343c5fda4833cc2832f58494de4c6abf724e2491c5e223
+ 0f4a049f8948ffc98acdad2540b86037d7e097d388254f39411290bed7386584
+ bca60f844f4c2290de67ca951186892eae2cb3afd1eee4a767b300123b8ae3e8
+ 693b875ed60ada718f6d232f1e419782a95be667ff6f5b6fd6f3e46ded7e536a
+ 0c38cb8b264c7a7fa529d9803b150ffec1038c031db1dda63fd327ec0e4452d3
+ a6f74c6e2eabab97f049f0df75219e62dcfe29561ce5b3e36a10f3b9235ecf82
+ 7113f3531359dc59549ea0d6dbf1b092d9bc0e98bd744622549b633b60988a5b
+ 72b6391e5102612ece89c2656a178542ce60ce98734ee0aba40bc5ef649ceebe
+ 8a8660aa9162ff0e7651fa11ce003f2ffa1b11e57a26163a5955f96118d69c5b
+ 52e8a8f03317c6642f3f2108bd8a81abcad641b9da599af16159e3619f228f5b
+ 0ad05b3a76b50bb7bfd1a111f04c1354af424aa83345a3ea308ddb969c812f8b
+ 4fab9b94d6b99369507970ddef43c2945e8058e8c950b6ffd8b1f3546aac680f
+ 9ee89b73c4f6812d426caa7cbad86d2e5c11328ce1b9b775405c81f156798382
+ 775a6b293da08b501cf754994c7708dd423a2d3848a22572e0e854ee34fcd178"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
                   ` (2 preceding siblings ...)
  2019-09-04 21:37 ` voidlinux-github
@ 2019-09-04 21:37 ` voidlinux-github
  2019-09-04 21:41 ` voidlinux-github
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-04 21:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

[WIP] firefox: update to 69.0.
Todo:

- [ ] build and test on some architectures
- [ ] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 11303 bytes --]

From 7260002b9d3795fce9b215c2b0aa329077e2cb3d Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH 1/2] firefox: update to 69.0.

---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 32 ++++++++----
 4 files changed, 45 insertions(+), 70 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..87c81211fd0 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -32,9 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
 # 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)
@@ -44,6 +41,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +63,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -114,10 +123,15 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
-	fi
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
+   fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"
 

From 58a7874e091a26e9932819aecabc0263faec1fe0 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 4 Sep 2019 23:32:03 +0200
Subject: [PATCH 2/2] firefox-i18n: update to 69.0.

[ci skip]
---
 srcpkgs/firefox-i18n/template | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a18f552af2c..ebd94fbc42c 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=68.0.2
+version=69.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -192,27 +192,27 @@ checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba
  92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e
  65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae
  774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa
- 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4
- 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551
- cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b
- b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613
- 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046
- d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc
- 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3
- a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b
- bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6
- c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9
- 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c
- c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef
- fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac
- c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836
- 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138
- 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203
- 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d
- d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c
- 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c
- d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904
- 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604
- b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea
- 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8
- 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799"
+ 2ac5b6fb05fcedb814da033d4a7a579bdc8e19bbc3dd3edbe08e709b5b6e311b
+ 86176fd8917153a67b4d5ae19a061fdcb18479fd0cbd1ffdf7f726450851f0ce
+ d86b03d4cfa9712fa593a63c00827552b4747530c426134d36bdf0f4ed587cdd
+ 83d33e85bab0271f86f4d37a95948832e2d00848976907b6b0dd9f075d188a0f
+ 27aac8e38302d92cef43b194fc155f903ef5ecdacac04dfbe18fd6f7fb544c84
+ b71f4fed7c00fc252424eaec5e1559ad957b808eba745e66e70a7f75fa7ca747
+ 43543c941e2976d3dd66eef023de7735f55deb7b2265c5c8a4bad43e2ea14af8
+ 09c9c634997a203286140231a873be5c25cd9c928970497b70c6b1f352fe1233
+ bf84a75b854f9bde124580a1de538b80a3e70ac5f1deacbe52a946d45d8b76fd
+ 674027a04ab4514a53dbd75e9d101b79e8c4fbcf8fc510ca915f043222126a65
+ 2f68ed32a10cb8a573343c5fda4833cc2832f58494de4c6abf724e2491c5e223
+ 0f4a049f8948ffc98acdad2540b86037d7e097d388254f39411290bed7386584
+ bca60f844f4c2290de67ca951186892eae2cb3afd1eee4a767b300123b8ae3e8
+ 693b875ed60ada718f6d232f1e419782a95be667ff6f5b6fd6f3e46ded7e536a
+ 0c38cb8b264c7a7fa529d9803b150ffec1038c031db1dda63fd327ec0e4452d3
+ a6f74c6e2eabab97f049f0df75219e62dcfe29561ce5b3e36a10f3b9235ecf82
+ 7113f3531359dc59549ea0d6dbf1b092d9bc0e98bd744622549b633b60988a5b
+ 72b6391e5102612ece89c2656a178542ce60ce98734ee0aba40bc5ef649ceebe
+ 8a8660aa9162ff0e7651fa11ce003f2ffa1b11e57a26163a5955f96118d69c5b
+ 52e8a8f03317c6642f3f2108bd8a81abcad641b9da599af16159e3619f228f5b
+ 0ad05b3a76b50bb7bfd1a111f04c1354af424aa83345a3ea308ddb969c812f8b
+ 4fab9b94d6b99369507970ddef43c2945e8058e8c950b6ffd8b1f3546aac680f
+ 9ee89b73c4f6812d426caa7cbad86d2e5c11328ce1b9b775405c81f156798382
+ 775a6b293da08b501cf754994c7708dd423a2d3848a22572e0e854ee34fcd178"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
  2019-09-04 21:34 ` [PR PATCH] [Updated] " voidlinux-github
  2019-09-04 21:34 ` voidlinux-github
@ 2019-09-04 21:37 ` voidlinux-github
  2019-09-04 21:37 ` voidlinux-github
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-04 21:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

[WIP] firefox: update to 69.0.
Todo:

- [ ] build and test on some architectures
- [ ] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 11303 bytes --]

From 7260002b9d3795fce9b215c2b0aa329077e2cb3d Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH 1/2] firefox: update to 69.0.

---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 32 ++++++++----
 4 files changed, 45 insertions(+), 70 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..87c81211fd0 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -32,9 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
 # 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)
@@ -44,6 +41,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +63,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -114,10 +123,15 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
-	fi
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
+   fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"
 

From 58a7874e091a26e9932819aecabc0263faec1fe0 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 4 Sep 2019 23:32:03 +0200
Subject: [PATCH 2/2] firefox-i18n: update to 69.0.

[ci skip]
---
 srcpkgs/firefox-i18n/template | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a18f552af2c..ebd94fbc42c 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=68.0.2
+version=69.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -192,27 +192,27 @@ checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba
  92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e
  65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae
  774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa
- 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4
- 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551
- cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b
- b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613
- 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046
- d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc
- 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3
- a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b
- bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6
- c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9
- 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c
- c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef
- fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac
- c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836
- 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138
- 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203
- 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d
- d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c
- 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c
- d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904
- 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604
- b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea
- 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8
- 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799"
+ 2ac5b6fb05fcedb814da033d4a7a579bdc8e19bbc3dd3edbe08e709b5b6e311b
+ 86176fd8917153a67b4d5ae19a061fdcb18479fd0cbd1ffdf7f726450851f0ce
+ d86b03d4cfa9712fa593a63c00827552b4747530c426134d36bdf0f4ed587cdd
+ 83d33e85bab0271f86f4d37a95948832e2d00848976907b6b0dd9f075d188a0f
+ 27aac8e38302d92cef43b194fc155f903ef5ecdacac04dfbe18fd6f7fb544c84
+ b71f4fed7c00fc252424eaec5e1559ad957b808eba745e66e70a7f75fa7ca747
+ 43543c941e2976d3dd66eef023de7735f55deb7b2265c5c8a4bad43e2ea14af8
+ 09c9c634997a203286140231a873be5c25cd9c928970497b70c6b1f352fe1233
+ bf84a75b854f9bde124580a1de538b80a3e70ac5f1deacbe52a946d45d8b76fd
+ 674027a04ab4514a53dbd75e9d101b79e8c4fbcf8fc510ca915f043222126a65
+ 2f68ed32a10cb8a573343c5fda4833cc2832f58494de4c6abf724e2491c5e223
+ 0f4a049f8948ffc98acdad2540b86037d7e097d388254f39411290bed7386584
+ bca60f844f4c2290de67ca951186892eae2cb3afd1eee4a767b300123b8ae3e8
+ 693b875ed60ada718f6d232f1e419782a95be667ff6f5b6fd6f3e46ded7e536a
+ 0c38cb8b264c7a7fa529d9803b150ffec1038c031db1dda63fd327ec0e4452d3
+ a6f74c6e2eabab97f049f0df75219e62dcfe29561ce5b3e36a10f3b9235ecf82
+ 7113f3531359dc59549ea0d6dbf1b092d9bc0e98bd744622549b633b60988a5b
+ 72b6391e5102612ece89c2656a178542ce60ce98734ee0aba40bc5ef649ceebe
+ 8a8660aa9162ff0e7651fa11ce003f2ffa1b11e57a26163a5955f96118d69c5b
+ 52e8a8f03317c6642f3f2108bd8a81abcad641b9da599af16159e3619f228f5b
+ 0ad05b3a76b50bb7bfd1a111f04c1354af424aa83345a3ea308ddb969c812f8b
+ 4fab9b94d6b99369507970ddef43c2945e8058e8c950b6ffd8b1f3546aac680f
+ 9ee89b73c4f6812d426caa7cbad86d2e5c11328ce1b9b775405c81f156798382
+ 775a6b293da08b501cf754994c7708dd423a2d3848a22572e0e854ee34fcd178"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
                   ` (4 preceding siblings ...)
  2019-09-04 21:41 ` voidlinux-github
@ 2019-09-04 21:41 ` voidlinux-github
  2019-09-04 21:44 ` voidlinux-github
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-04 21:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

[WIP] firefox: update to 69.0.
Todo:

- [ ] build and test on some architectures
- [x] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 11292 bytes --]

From fb8f634b9aa836e9585b1663364f503a6629023b Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH 1/2] firefox: update to 69.0.

---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 30 ++++++++---
 4 files changed, 44 insertions(+), 69 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..f2094eff6a7 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -32,9 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
 # 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)
@@ -44,6 +41,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +63,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -114,9 +123,14 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
 	fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"

From a5c96cf73f034fdbe56203c357d89c4baf2c9e77 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 4 Sep 2019 23:32:03 +0200
Subject: [PATCH 2/2] firefox-i18n: update to 69.0.

[ci skip]
---
 srcpkgs/firefox-i18n/template | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a18f552af2c..ebd94fbc42c 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=68.0.2
+version=69.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -192,27 +192,27 @@ checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba
  92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e
  65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae
  774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa
- 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4
- 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551
- cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b
- b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613
- 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046
- d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc
- 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3
- a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b
- bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6
- c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9
- 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c
- c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef
- fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac
- c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836
- 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138
- 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203
- 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d
- d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c
- 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c
- d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904
- 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604
- b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea
- 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8
- 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799"
+ 2ac5b6fb05fcedb814da033d4a7a579bdc8e19bbc3dd3edbe08e709b5b6e311b
+ 86176fd8917153a67b4d5ae19a061fdcb18479fd0cbd1ffdf7f726450851f0ce
+ d86b03d4cfa9712fa593a63c00827552b4747530c426134d36bdf0f4ed587cdd
+ 83d33e85bab0271f86f4d37a95948832e2d00848976907b6b0dd9f075d188a0f
+ 27aac8e38302d92cef43b194fc155f903ef5ecdacac04dfbe18fd6f7fb544c84
+ b71f4fed7c00fc252424eaec5e1559ad957b808eba745e66e70a7f75fa7ca747
+ 43543c941e2976d3dd66eef023de7735f55deb7b2265c5c8a4bad43e2ea14af8
+ 09c9c634997a203286140231a873be5c25cd9c928970497b70c6b1f352fe1233
+ bf84a75b854f9bde124580a1de538b80a3e70ac5f1deacbe52a946d45d8b76fd
+ 674027a04ab4514a53dbd75e9d101b79e8c4fbcf8fc510ca915f043222126a65
+ 2f68ed32a10cb8a573343c5fda4833cc2832f58494de4c6abf724e2491c5e223
+ 0f4a049f8948ffc98acdad2540b86037d7e097d388254f39411290bed7386584
+ bca60f844f4c2290de67ca951186892eae2cb3afd1eee4a767b300123b8ae3e8
+ 693b875ed60ada718f6d232f1e419782a95be667ff6f5b6fd6f3e46ded7e536a
+ 0c38cb8b264c7a7fa529d9803b150ffec1038c031db1dda63fd327ec0e4452d3
+ a6f74c6e2eabab97f049f0df75219e62dcfe29561ce5b3e36a10f3b9235ecf82
+ 7113f3531359dc59549ea0d6dbf1b092d9bc0e98bd744622549b633b60988a5b
+ 72b6391e5102612ece89c2656a178542ce60ce98734ee0aba40bc5ef649ceebe
+ 8a8660aa9162ff0e7651fa11ce003f2ffa1b11e57a26163a5955f96118d69c5b
+ 52e8a8f03317c6642f3f2108bd8a81abcad641b9da599af16159e3619f228f5b
+ 0ad05b3a76b50bb7bfd1a111f04c1354af424aa83345a3ea308ddb969c812f8b
+ 4fab9b94d6b99369507970ddef43c2945e8058e8c950b6ffd8b1f3546aac680f
+ 9ee89b73c4f6812d426caa7cbad86d2e5c11328ce1b9b775405c81f156798382
+ 775a6b293da08b501cf754994c7708dd423a2d3848a22572e0e854ee34fcd178"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
                   ` (3 preceding siblings ...)
  2019-09-04 21:37 ` voidlinux-github
@ 2019-09-04 21:41 ` voidlinux-github
  2019-09-04 21:41 ` voidlinux-github
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-04 21:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

[WIP] firefox: update to 69.0.
Todo:

- [ ] build and test on some architectures
- [x] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 11292 bytes --]

From fb8f634b9aa836e9585b1663364f503a6629023b Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH 1/2] firefox: update to 69.0.

---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 30 ++++++++---
 4 files changed, 44 insertions(+), 69 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..f2094eff6a7 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -32,9 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
 # 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
 
 case $XBPS_TARGET_MACHINE in
 	armv6*)
@@ -44,6 +41,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +63,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -114,9 +123,14 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
 	fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"

From a5c96cf73f034fdbe56203c357d89c4baf2c9e77 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 4 Sep 2019 23:32:03 +0200
Subject: [PATCH 2/2] firefox-i18n: update to 69.0.

[ci skip]
---
 srcpkgs/firefox-i18n/template | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a18f552af2c..ebd94fbc42c 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=68.0.2
+version=69.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -192,27 +192,27 @@ checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba
  92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e
  65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae
  774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa
- 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4
- 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551
- cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b
- b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613
- 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046
- d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc
- 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3
- a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b
- bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6
- c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9
- 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c
- c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef
- fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac
- c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836
- 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138
- 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203
- 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d
- d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c
- 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c
- d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904
- 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604
- b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea
- 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8
- 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799"
+ 2ac5b6fb05fcedb814da033d4a7a579bdc8e19bbc3dd3edbe08e709b5b6e311b
+ 86176fd8917153a67b4d5ae19a061fdcb18479fd0cbd1ffdf7f726450851f0ce
+ d86b03d4cfa9712fa593a63c00827552b4747530c426134d36bdf0f4ed587cdd
+ 83d33e85bab0271f86f4d37a95948832e2d00848976907b6b0dd9f075d188a0f
+ 27aac8e38302d92cef43b194fc155f903ef5ecdacac04dfbe18fd6f7fb544c84
+ b71f4fed7c00fc252424eaec5e1559ad957b808eba745e66e70a7f75fa7ca747
+ 43543c941e2976d3dd66eef023de7735f55deb7b2265c5c8a4bad43e2ea14af8
+ 09c9c634997a203286140231a873be5c25cd9c928970497b70c6b1f352fe1233
+ bf84a75b854f9bde124580a1de538b80a3e70ac5f1deacbe52a946d45d8b76fd
+ 674027a04ab4514a53dbd75e9d101b79e8c4fbcf8fc510ca915f043222126a65
+ 2f68ed32a10cb8a573343c5fda4833cc2832f58494de4c6abf724e2491c5e223
+ 0f4a049f8948ffc98acdad2540b86037d7e097d388254f39411290bed7386584
+ bca60f844f4c2290de67ca951186892eae2cb3afd1eee4a767b300123b8ae3e8
+ 693b875ed60ada718f6d232f1e419782a95be667ff6f5b6fd6f3e46ded7e536a
+ 0c38cb8b264c7a7fa529d9803b150ffec1038c031db1dda63fd327ec0e4452d3
+ a6f74c6e2eabab97f049f0df75219e62dcfe29561ce5b3e36a10f3b9235ecf82
+ 7113f3531359dc59549ea0d6dbf1b092d9bc0e98bd744622549b633b60988a5b
+ 72b6391e5102612ece89c2656a178542ce60ce98734ee0aba40bc5ef649ceebe
+ 8a8660aa9162ff0e7651fa11ce003f2ffa1b11e57a26163a5955f96118d69c5b
+ 52e8a8f03317c6642f3f2108bd8a81abcad641b9da599af16159e3619f228f5b
+ 0ad05b3a76b50bb7bfd1a111f04c1354af424aa83345a3ea308ddb969c812f8b
+ 4fab9b94d6b99369507970ddef43c2945e8058e8c950b6ffd8b1f3546aac680f
+ 9ee89b73c4f6812d426caa7cbad86d2e5c11328ce1b9b775405c81f156798382
+ 775a6b293da08b501cf754994c7708dd423a2d3848a22572e0e854ee34fcd178"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
                   ` (6 preceding siblings ...)
  2019-09-04 21:44 ` voidlinux-github
@ 2019-09-04 21:44 ` voidlinux-github
  2019-09-04 22:08 ` voidlinux-github
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-04 21:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

[WIP] firefox: update to 69.0.
Todo:

- [ ] build and test on some architectures
- [x] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 11390 bytes --]

From b65e9589d631aacc68df0afd96ac78b7f8211c90 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH 1/2] firefox: update to 69.0.

---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 32 ++++++++----
 4 files changed, 44 insertions(+), 71 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..50562e2eb01 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -31,11 +31,6 @@ conflicts="firefox-esr>=0"
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
-# 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
 case $XBPS_TARGET_MACHINE in
 	armv6*)
 		broken="required NEON extensions are not supported on armv6"
@@ -44,6 +39,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +61,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -114,9 +121,14 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
 	fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"

From 833c026f7b81cbc00d235a361e82b199153e7267 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 4 Sep 2019 23:32:03 +0200
Subject: [PATCH 2/2] firefox-i18n: update to 69.0.

[ci skip]
---
 srcpkgs/firefox-i18n/template | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a18f552af2c..ebd94fbc42c 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=68.0.2
+version=69.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -192,27 +192,27 @@ checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba
  92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e
  65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae
  774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa
- 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4
- 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551
- cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b
- b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613
- 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046
- d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc
- 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3
- a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b
- bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6
- c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9
- 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c
- c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef
- fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac
- c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836
- 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138
- 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203
- 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d
- d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c
- 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c
- d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904
- 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604
- b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea
- 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8
- 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799"
+ 2ac5b6fb05fcedb814da033d4a7a579bdc8e19bbc3dd3edbe08e709b5b6e311b
+ 86176fd8917153a67b4d5ae19a061fdcb18479fd0cbd1ffdf7f726450851f0ce
+ d86b03d4cfa9712fa593a63c00827552b4747530c426134d36bdf0f4ed587cdd
+ 83d33e85bab0271f86f4d37a95948832e2d00848976907b6b0dd9f075d188a0f
+ 27aac8e38302d92cef43b194fc155f903ef5ecdacac04dfbe18fd6f7fb544c84
+ b71f4fed7c00fc252424eaec5e1559ad957b808eba745e66e70a7f75fa7ca747
+ 43543c941e2976d3dd66eef023de7735f55deb7b2265c5c8a4bad43e2ea14af8
+ 09c9c634997a203286140231a873be5c25cd9c928970497b70c6b1f352fe1233
+ bf84a75b854f9bde124580a1de538b80a3e70ac5f1deacbe52a946d45d8b76fd
+ 674027a04ab4514a53dbd75e9d101b79e8c4fbcf8fc510ca915f043222126a65
+ 2f68ed32a10cb8a573343c5fda4833cc2832f58494de4c6abf724e2491c5e223
+ 0f4a049f8948ffc98acdad2540b86037d7e097d388254f39411290bed7386584
+ bca60f844f4c2290de67ca951186892eae2cb3afd1eee4a767b300123b8ae3e8
+ 693b875ed60ada718f6d232f1e419782a95be667ff6f5b6fd6f3e46ded7e536a
+ 0c38cb8b264c7a7fa529d9803b150ffec1038c031db1dda63fd327ec0e4452d3
+ a6f74c6e2eabab97f049f0df75219e62dcfe29561ce5b3e36a10f3b9235ecf82
+ 7113f3531359dc59549ea0d6dbf1b092d9bc0e98bd744622549b633b60988a5b
+ 72b6391e5102612ece89c2656a178542ce60ce98734ee0aba40bc5ef649ceebe
+ 8a8660aa9162ff0e7651fa11ce003f2ffa1b11e57a26163a5955f96118d69c5b
+ 52e8a8f03317c6642f3f2108bd8a81abcad641b9da599af16159e3619f228f5b
+ 0ad05b3a76b50bb7bfd1a111f04c1354af424aa83345a3ea308ddb969c812f8b
+ 4fab9b94d6b99369507970ddef43c2945e8058e8c950b6ffd8b1f3546aac680f
+ 9ee89b73c4f6812d426caa7cbad86d2e5c11328ce1b9b775405c81f156798382
+ 775a6b293da08b501cf754994c7708dd423a2d3848a22572e0e854ee34fcd178"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
                   ` (5 preceding siblings ...)
  2019-09-04 21:41 ` voidlinux-github
@ 2019-09-04 21:44 ` voidlinux-github
  2019-09-04 21:44 ` voidlinux-github
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-04 21:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

[WIP] firefox: update to 69.0.
Todo:

- [ ] build and test on some architectures
- [x] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 11390 bytes --]

From b65e9589d631aacc68df0afd96ac78b7f8211c90 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH 1/2] firefox: update to 69.0.

---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 32 ++++++++----
 4 files changed, 44 insertions(+), 71 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..50562e2eb01 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -31,11 +31,6 @@ conflicts="firefox-esr>=0"
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
-# 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
 case $XBPS_TARGET_MACHINE in
 	armv6*)
 		broken="required NEON extensions are not supported on armv6"
@@ -44,6 +39,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +61,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -114,9 +121,14 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
 	fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"

From 833c026f7b81cbc00d235a361e82b199153e7267 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 4 Sep 2019 23:32:03 +0200
Subject: [PATCH 2/2] firefox-i18n: update to 69.0.

[ci skip]
---
 srcpkgs/firefox-i18n/template | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a18f552af2c..ebd94fbc42c 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=68.0.2
+version=69.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"
@@ -192,27 +192,27 @@ checksum="2ea325dae9dfd9725a533d7a4630b9326d408ab9a4b925b70468d28a2d45d2ba
  92967023816682d0991bdf50e08eb9a199a45c95b848b5aeceefc0906d267a1e
  65e4a1bac6db7d51f67d3d522ffa5104031619fc5a427e446de90a959cf1b5ae
  774d4102558b9744c141dbb6b89915beee1401c7997caafc5e84c3d3431505aa
- 2c8af1b518a1ab9470a2a8a6b2728a107ae92043dfe63a0bfbfb1423e11561b4
- 772c0e432e5e2a07ce0f7f150a0e999e291490e1c8b1d7a47085c231e1bfb551
- cb144fe7128393e757eb0e89fbfa1a64a98d75645563ef23538c81ea2395c54b
- b1fc0e8abe44a489728a5d35a7e30b2c189b3afee57ccf1ca3d457863bcaf613
- 3672383cd1054cbc082c7b2ea423461af6088f80784b72ab0c961f648dcb6046
- d13c1b0ffb1325352b0abd42dba05d3932814dcbbf01049d8e3e96c35ca4cecc
- 5197f27b5f1a6fda42dfdd23ab26e7852e6055d949b3421a604107f07d9ffab3
- a931a967980d2c85436a24035eb2da0de6996fcfcf2013b1b2c7481a5e3de81b
- bf136d69e10bb4300753e1bde4a4287837ab1576669c51f679bf37d8de4961e6
- c265e73b9bc51156e04f69073d10dd4ea82f70bdfbd4d1246648a4158f9887f9
- 840fc9402492c653f07709d04ffe8e33b96e6c7a8873fe14ec6d382f9650769c
- c0e795d692d62262a8e300e2ae573873b21538d79a9ad0bb3fd5c12486e12cef
- fa1ce8c4e3c8d0c25817766e9eb1897a055d032d4a6b69b9bf83a07d1d9234ac
- c3bbcd6f00dfe6e8c086489a03797366dcddca55326269d32239f5a1a5466836
- 638fa687bd1f367b88a983c66a3644cbef2d86608bb17cf8a71f1fa149156138
- 1098aeed113c1050e1ba6b42ae22fb547912a8fd864b56ba44e561a60ea19203
- 7dcb700b1bf6ae29a2c76362337bd5b34f8951b5fbcd5316e892c81e5434092d
- d4deb3fc82619bf21f5e30fa488724da3ac17d0b3002661f95345a4fdfa5342c
- 7121d04c37484902cd0c68a7fd2c68af25b43d5a71872cff65e408845029885c
- d02e0982655a560b547629a9635abb0e491163ea7eb443d454f9e09ff0a05904
- 0bfe3a70d2b393973eb5c097191a38ecfe57cdd61000dc5b1d01acc8ac700604
- b4824070be3c764c0e1be0baea8baf5cc4700732bdf4f7a5f946f81227caceea
- 3f8ec0fb6428fcf7eeba212165e4c5d4d61b865e3e26780e2a893704e1a169d8
- 093fe238df44efe1491c952454142222662c4c58ea953d558d7a3b344ead0799"
+ 2ac5b6fb05fcedb814da033d4a7a579bdc8e19bbc3dd3edbe08e709b5b6e311b
+ 86176fd8917153a67b4d5ae19a061fdcb18479fd0cbd1ffdf7f726450851f0ce
+ d86b03d4cfa9712fa593a63c00827552b4747530c426134d36bdf0f4ed587cdd
+ 83d33e85bab0271f86f4d37a95948832e2d00848976907b6b0dd9f075d188a0f
+ 27aac8e38302d92cef43b194fc155f903ef5ecdacac04dfbe18fd6f7fb544c84
+ b71f4fed7c00fc252424eaec5e1559ad957b808eba745e66e70a7f75fa7ca747
+ 43543c941e2976d3dd66eef023de7735f55deb7b2265c5c8a4bad43e2ea14af8
+ 09c9c634997a203286140231a873be5c25cd9c928970497b70c6b1f352fe1233
+ bf84a75b854f9bde124580a1de538b80a3e70ac5f1deacbe52a946d45d8b76fd
+ 674027a04ab4514a53dbd75e9d101b79e8c4fbcf8fc510ca915f043222126a65
+ 2f68ed32a10cb8a573343c5fda4833cc2832f58494de4c6abf724e2491c5e223
+ 0f4a049f8948ffc98acdad2540b86037d7e097d388254f39411290bed7386584
+ bca60f844f4c2290de67ca951186892eae2cb3afd1eee4a767b300123b8ae3e8
+ 693b875ed60ada718f6d232f1e419782a95be667ff6f5b6fd6f3e46ded7e536a
+ 0c38cb8b264c7a7fa529d9803b150ffec1038c031db1dda63fd327ec0e4452d3
+ a6f74c6e2eabab97f049f0df75219e62dcfe29561ce5b3e36a10f3b9235ecf82
+ 7113f3531359dc59549ea0d6dbf1b092d9bc0e98bd744622549b633b60988a5b
+ 72b6391e5102612ece89c2656a178542ce60ce98734ee0aba40bc5ef649ceebe
+ 8a8660aa9162ff0e7651fa11ce003f2ffa1b11e57a26163a5955f96118d69c5b
+ 52e8a8f03317c6642f3f2108bd8a81abcad641b9da599af16159e3619f228f5b
+ 0ad05b3a76b50bb7bfd1a111f04c1354af424aa83345a3ea308ddb969c812f8b
+ 4fab9b94d6b99369507970ddef43c2945e8058e8c950b6ffd8b1f3546aac680f
+ 9ee89b73c4f6812d426caa7cbad86d2e5c11328ce1b9b775405c81f156798382
+ 775a6b293da08b501cf754994c7708dd423a2d3848a22572e0e854ee34fcd178"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
                   ` (7 preceding siblings ...)
  2019-09-04 21:44 ` voidlinux-github
@ 2019-09-04 22:08 ` voidlinux-github
  2019-09-05 15:11 ` voidlinux-github
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-04 22:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/14195#issuecomment-528109766

Comment:
Tested on x86_64-musl and i686.
Setting a search engine on i686 is still broken (#13671). 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
                   ` (8 preceding siblings ...)
  2019-09-04 22:08 ` voidlinux-github
@ 2019-09-05 15:11 ` voidlinux-github
  2019-09-05 18:01 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-05 15:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

New comment by zdtcd on void-packages repository

https://github.com/void-linux/void-packages/pull/14195#issuecomment-528417505

Comment:
Please use the firefox-i18n update from #14220 

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
                   ` (9 preceding siblings ...)
  2019-09-05 15:11 ` voidlinux-github
@ 2019-09-05 18:01 ` voidlinux-github
  2019-09-05 18:01 ` voidlinux-github
  2019-09-05 18:03 ` [PR PATCH] [Merged]: " voidlinux-github
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-05 18:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

firefox: update to 69.0.
Todo:

- [x] build and test on some architectures
- [x] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 7170 bytes --]

From 9ab3f8666db846efb4517db6175f34e94dd0e910 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH] firefox: update to 69.0.

[ci skip]
---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 32 ++++++++----
 4 files changed, 44 insertions(+), 71 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..50562e2eb01 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -31,11 +31,6 @@ conflicts="firefox-esr>=0"
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
-# 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
 case $XBPS_TARGET_MACHINE in
 	armv6*)
 		broken="required NEON extensions are not supported on armv6"
@@ -44,6 +39,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +61,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -114,9 +121,14 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
 	fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Updated] firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
                   ` (10 preceding siblings ...)
  2019-09-05 18:01 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-05 18:01 ` voidlinux-github
  2019-09-05 18:03 ` [PR PATCH] [Merged]: " voidlinux-github
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-05 18:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages firefox-69
https://github.com/void-linux/void-packages/pull/14195

firefox: update to 69.0.
Todo:

- [x] build and test on some architectures
- [x] adopt latest changes from thunderbird template

A patch file from https://github.com/void-linux/void-packages/pull/14195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-69-14195.patch --]
[-- Type: text/x-diff, Size: 7170 bytes --]

From 9ab3f8666db846efb4517db6175f34e94dd0e910 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 3 Sep 2019 23:53:57 +0200
Subject: [PATCH] firefox: update to 69.0.

[ci skip]
---
 srcpkgs/firefox/patches/fix-musl.patch        | 11 ----
 .../patches/initialize_sched_param.patch      | 22 ++++++++
 .../firefox/patches/ppc64le-bug-1512162.patch | 50 -------------------
 srcpkgs/firefox/template                      | 32 ++++++++----
 4 files changed, 44 insertions(+), 71 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-musl.patch
 create mode 100644 srcpkgs/firefox/patches/initialize_sched_param.patch
 delete mode 100644 srcpkgs/firefox/patches/ppc64le-bug-1512162.patch

diff --git a/srcpkgs/firefox/patches/fix-musl.patch b/srcpkgs/firefox/patches/fix-musl.patch
deleted file mode 100644
index c1cb99bf651..00000000000
--- a/srcpkgs/firefox/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
-+++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch
new file mode 100644
index 00000000000..ee593c3c217
--- /dev/null
+++ b/srcpkgs/firefox/patches/initialize_sched_param.patch
@@ -0,0 +1,22 @@
+source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8
+
+commit a1443a02667c649cb72873a45b98fffbd2eac5a8
+Author: Paul Adenot <paul@paul.cx>
+Date:   Mon Aug 19 15:00:39 2019 +0200
+
+    initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc
+
+diff --git a/src/rt_linux.rs b/src/rt_linux.rs
+index d8c0114..fbb4fde 100644
+--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-09-03 22:57:00.197152845 +0200
++++ third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-09-03 23:05:42.219159018 +0200
+@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32,
+ {
+     let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
+     let pthread_id = unsafe { libc::pthread_self() };
++    let mut param = unsafe { std::mem::zeroed::<libc::sched_param>() };
+     let mut policy = 0;
+-    let mut param = libc::sched_param { sched_priority: 0 };
+ 
+     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
+         error!("pthread_getschedparam error {}", pthread_id);
diff --git a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch b/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
deleted file mode 100644
index ec38f2262be..00000000000
--- a/srcpkgs/firefox/patches/ppc64le-bug-1512162.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- js/xpconnect/src/XPCWrappedNative.cpp
-+++ js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1152,16 +1152,20 @@ bool XPCWrappedNative::CallMethod(XPCCal
-   if (NS_FAILED(rv)) {
-     return Throw(rv, ccx);
-   }
- 
-   JS::Rooted<CallMethodHelper> helper(ccx, /* init = */ ccx);
-   return helper.get().Call();
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::Call() {
-   mCallContext.SetRetVal(JS::UndefinedValue());
- 
-   mCallContext.GetContext()->SetPendingException(nullptr);
- 
-   if (mVTableIndex == 0) {
-     return QueryInterfaceFastPath();
-   }
-@@ -1310,16 +1314,20 @@ bool CallMethodHelper::GetOutParamSource
-         return false;
-       }
-     }
-   }
- 
-   return true;
- }
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+// Work around a compiler bug on ppc64le (bug 1512162).
-+__attribute__ ((noinline,noclone))
-+#endif
- bool CallMethodHelper::GatherAndConvertResults() {
-   // now we iterate through the native params to gather and convert results
-   uint8_t paramCount = mMethodInfo->GetParamCount();
-   for (uint8_t i = 0; i < paramCount; i++) {
-     const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-     if (!paramInfo.IsOut()) {
-       continue;
-     }
-
-
-
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 82d454d0f68..50562e2eb01 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=68.0.2
+version=69.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
+checksum=413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
 
 lib32disabled=yes
 
@@ -31,11 +31,6 @@ conflicts="firefox-esr>=0"
 build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
-# 19:55.85 /usr/bin/ld: failed to set dynamic section sizes: memory exhausted
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-	nodebug=yes
-fi
-
 case $XBPS_TARGET_MACHINE in
 	armv6*)
 		broken="required NEON extensions are not supported on armv6"
@@ -44,6 +39,13 @@ case $XBPS_TARGET_MACHINE in
 	ppc*) broken="ftbfs in several places" ;;
 esac
 
+# we need this because cargo verifies checksums of all files in vendor
+# crates when it builds and gives us no way to override or update the
+# file sanely... so just clear out the file list
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
+}
+
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -59,6 +61,11 @@ post_extract() {
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
 }
+
+post_patch() {
+	_clear_vendor_checksums audio_thread_priority
+}
+
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
@@ -114,9 +121,14 @@ do_build() {
 		;;
 	esac
 
-	if [ "$XBPS_WORDSIZE" -eq 32 ]; then
-		# ENOMEM
-		echo "ac_add_options --disable-debug-symbols" >>.mozconfig
+	# work around large debug symbols on 32-bit hosts
+	if [ "$XBPS_WORDSIZE" = "32" ]; then
+		export CFLAGS="${CFLAGS/-g/-g1}"
+		export CXXFLAGS="${CXXFLAGS/-g/-g1}"
+		export LDFLAGS+=" -Wl,--no-keep-memory"
+		# patch the rust debug level, this is hardcoded
+		sed -i "s/debug_info = '2'/debug_info = '1'/" \
+		build/moz.configure/toolchain.configure
 	fi
 
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PR PATCH] [Merged]: firefox: update to 69.0.
  2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
                   ` (11 preceding siblings ...)
  2019-09-05 18:01 ` voidlinux-github
@ 2019-09-05 18:03 ` voidlinux-github
  12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-05 18:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

There's a merged pull request on the void-packages repository

firefox: update to 69.0.
https://github.com/void-linux/void-packages/pull/14195

Description:
Todo:

- [x] build and test on some architectures
- [x] adopt latest changes from thunderbird template

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2019-09-05 18:03 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-03 22:03 [PR PATCH] [WIP] firefox: update to 69.0 voidlinux-github
2019-09-04 21:34 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-04 21:34 ` voidlinux-github
2019-09-04 21:37 ` voidlinux-github
2019-09-04 21:37 ` voidlinux-github
2019-09-04 21:41 ` voidlinux-github
2019-09-04 21:41 ` voidlinux-github
2019-09-04 21:44 ` voidlinux-github
2019-09-04 21:44 ` voidlinux-github
2019-09-04 22:08 ` voidlinux-github
2019-09-05 15:11 ` voidlinux-github
2019-09-05 18:01 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-05 18:01 ` voidlinux-github
2019-09-05 18:03 ` [PR PATCH] [Merged]: " voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).