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
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).