Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] firefox: update to 81.0.
@ 2020-09-23 12:16 Duncaen
  2020-09-23 14:10 ` [PR PATCH] [Updated] " Duncaen
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Duncaen @ 2020-09-23 12:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Duncaen/void-packages firefox-81
https://github.com/void-linux/void-packages/pull/25049

firefox: update to 81.0.
x86_64-glibc works, currently building for aarch64 and then building x86_64-musl which I can test.

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

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

From 1aa492eb4d7dc52fd3e0b581d364ce8b952b30c6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 23 Sep 2020 14:09:05 +0200
Subject: [PATCH] firefox: update to 81.0.

[ci skip]
---
 srcpkgs/firefox/patches/rust-glslopt.patch | 21 ++++++++++++++-------
 srcpkgs/firefox/template                   |  6 ++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/firefox/patches/rust-glslopt.patch b/srcpkgs/firefox/patches/rust-glslopt.patch
index 3717caa2290..22591d985d5 100644
--- a/srcpkgs/firefox/patches/rust-glslopt.patch
+++ b/srcpkgs/firefox/patches/rust-glslopt.patch
@@ -1,13 +1,20 @@
 overwrite HOST_* flags to get rid of -MF
 
---- third_party/rust/glslopt/build.rs	2020-06-03 01:37:31.000000000 +0200
-+++ third_party/rust/glslopt/build.rs	2020-06-04 10:57:16.418469546 +0200
-@@ -28,6 +28,8 @@
-     env::remove_var(format!("CXXFLAGS_{}", &target));
-     env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
-     env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_")));
+--- third_party/rust/glslopt/build.rs	Wed Sep 23 13:19:28 2020
++++ third_party/rust/glslopt/build.rs	Wed Sep 23 13:19:17 2020
+@@ -1,3 +1,4 @@
++use std::env;
+ use cc;
+ 
+ /// Adds the required definitions to build mesa/glsl-optimizer for the
+--- third_party/rust/glslopt/build.rs	Wed Sep 23 12:52:54 2020
++++ third_party/rust/glslopt/build.rs	Wed Sep 23 12:58:32 2020
+@@ -27,6 +27,8 @@
+ }
+ 
+ fn main() {
 +    env::set_var("HOST_CFLAGS", "-O2");
 +    env::set_var("HOST_CXXFLAGS", "-O2");
- 
      configure(&mut cc::Build::new())
          .warnings(false)
+         .include("glsl-optimizer/include")
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index e71515cbc06..248ce896d87 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=80.0.1
+version=81.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=596b085e32a2d683ba960e161ea65c6271f90f576d4bf956e0d48e83af992c21
+checksum=9328745012178aee5a4f47c833539f7872cc6e0f20a853568a313e60cabd1ec8
 
 lib32disabled=yes
 
@@ -153,6 +153,7 @@ do_build() {
 	export MOZ_MAKE_FLAGS="${makejobs}"
 	export MOZ_NOSPAM=1
 	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
+	export MACH_USE_SYSTEM_PYTHON=1
 
 	export AS=$CC
 
@@ -173,6 +174,7 @@ ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' '
 	./mach build
 }
 do_install() {
+	export MACH_USE_SYSTEM_PYTHON=1
 	DESTDIR="$DESTDIR" ./mach install
 
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/firefox/browser/defaults/preferences

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-09-24 16:46 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-23 12:16 [PR PATCH] firefox: update to 81.0 Duncaen
2020-09-23 14:10 ` [PR PATCH] [Updated] " Duncaen
2020-09-23 15:57 ` Duncaen
2020-09-23 16:50 ` Duncaen
2020-09-24 15:01 ` zdykstra
2020-09-24 15:49 ` Piraty
2020-09-24 16:46 ` [PR PATCH] [Closed]: " ericonr
2020-09-24 16:46 ` ericonr

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