[PR PATCH] Firefox esr 68.2.0

[PR PATCH] Firefox esr 68.2.0

[voidlinux-github]

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

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

https://github.com/zdtcd/void-packages firefox-esr
https://github.com/void-linux/void-packages/pull/15753

Firefox esr 68.2.0
Built for:
- [x] x86_64
- [ ] x86_64-musl
- [ ] aarch64-musl
- [ ] i686

Tested with:
- [x] x86_64
- [ ] x86_64-musl

---
I'm trying to remove the conflict between firefox and firefox-esr

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

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

From 908cfe897251104cdeddc189ec86fa01dc31e8b3 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 22 Oct 2019 08:21:59 +0700
Subject: [PATCH 1/2] firefox-esr: update to 68.2.0.

---
 .../firefox-esr/patches/rust-cssparser.patch  | 90 -------------------
 srcpkgs/firefox-esr/template                  |  9 +-
 2 files changed, 5 insertions(+), 94 deletions(-)
 delete mode 100644 srcpkgs/firefox-esr/patches/rust-cssparser.patch

diff --git a/srcpkgs/firefox-esr/patches/rust-cssparser.patch b/srcpkgs/firefox-esr/patches/rust-cssparser.patch
deleted file mode 100644
index 1ebef87c014..00000000000
--- a/srcpkgs/firefox-esr/patches/rust-cssparser.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-backport of:
-
-From 3c98d22c5de3b696bf1fde2b6c90069812312aa6 Mon Sep 17 00:00:00 2001
-From: Simon Sapin <simon.sapin@exyr.org>
-Date: Tue, 23 Apr 2019 13:47:25 +0200
-Subject: [PATCH] Fix a future-compat warning
-
-```
-warning[E0506]: cannot assign to `self.input.cached_token` because it is borrowed
-   --> src/parser.rs:591:17
-    |
-566 |     pub fn next_including_whitespace_and_comments(&mut self) -> Result<&Token<'i>, BasicParseError<'i>> {
-    |                                                   - let's call the lifetime of this reference `'1`
-...
-579 |             Some(ref cached_token)
-    |                  ---------------- borrow of `self.input.cached_token` occurs here
-...
-591 |                 self.input.cached_token = Some(CachedToken {
-    |                 ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.input.cached_token` occurs here
-...
-603 |         Ok(token)
-    |         --------- returning this value requires that `self.input.cached_token.0` is borrowed for `'1`
-    |
-    = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
-    = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
-```
----
- src/parser.rs | 50 +++++++++++++++++++++++++++-----------------------
- 1 file changed, 27 insertions(+), 23 deletions(-)
-
-diff --git a/src/parser.rs b/src/parser.rs
-index 51f441e4..7cef117c 100644
---- third_party/rust/cssparser/src/parser.rs
-+++ third_party/rust/cssparser/src/parser.rs
-@@ -555,28 +555,34 @@
-         }
- 
-         let token_start_position = self.input.tokenizer.position();
--        let token;
--        match self.input.cached_token {
--            Some(ref cached_token)
--            if cached_token.start_position == token_start_position => {
--                self.input.tokenizer.reset(&cached_token.end_state);
--                match cached_token.token {
--                    Token::Function(ref name) => self.input.tokenizer.see_function(name),
--                    _ => {}
--                }
--                token = &cached_token.token
-+        let using_cached_token = self
-+            .input
-+            .cached_token
-+            .as_ref()
-+            .map_or(false, |cached_token| {
-+                cached_token.start_position == token_start_position
-+            });
-+        let token = if using_cached_token {
-+            let cached_token = self.input.cached_token.as_ref().unwrap();
-+            self.input.tokenizer.reset(&cached_token.end_state);
-+            match cached_token.token {
-+                Token::Function(ref name) => self.input.tokenizer.see_function(name),
-+                _ => {}
-             }
--            _ => {
--                let new_token = self.input.tokenizer.next()
--                    .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
--                self.input.cached_token = Some(CachedToken {
--                    token: new_token,
--                    start_position: token_start_position,
--                    end_state: self.input.tokenizer.state(),
--                });
--                token = self.input.cached_token_ref()
--            }
--        }
-+            &cached_token.token
-+        } else {
-+            let new_token = self
-+                .input
-+                .tokenizer
-+                .next()
-+                .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
-+            self.input.cached_token = Some(CachedToken {
-+                token: new_token,
-+                start_position: token_start_position,
-+                end_state: self.input.tokenizer.state(),
-+            });
-+            self.input.cached_token_ref()
-+        };
- 
-         if let Some(block_type) = BlockType::opening(token) {
-             self.at_start_of = Some(block_type);
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index c7a4de0221c..5a61c46144b 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=68.1.0
-revision=3
+version=68.2.0
+revision=1
 wrksrc="firefox-${version}"
 build_helper="rust"
 short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)"
@@ -12,7 +12,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac
+checksum=85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38
 
 lib32disabled=yes
 hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
@@ -24,7 +24,8 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if startup_notification startup-notification-devel)
  $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if sndio sndio-devel)"
-depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme"
+# grep min_nss_version= old-configure
+depends="nss>=3.44.2 desktop-file-utils hicolor-icon-theme"
 conflicts="firefox>=0"
 
 build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio"

From 170d5edb52e6e33edb8360b6d18303d3cb4ae362 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 22 Oct 2019 08:22:06 +0700
Subject: [PATCH 2/2] firefox-esr-i18n: update to 68.2.0.

[skip ci]
---
 srcpkgs/firefox-esr-i18n/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index b4e17fb16f0..ba52f6c73a6 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=68.1.0
+version=68.2.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"

Re: [WIP] Firefox esr 68.2.0

[voidlinux-github]

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

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/15753#issuecomment-546047045

Comment:
I haven't tested it but `-D_FILE_OFFSET_BITS=64` should probably be removed. See https://github.com/void-linux/void-packages/issues/13671.

Re: [WIP] Firefox esr 68.2.0

[voidlinux-github]

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

New comment by zdtcd on void-packages repository

https://github.com/void-linux/void-packages/pull/15753#issuecomment-546863218

Comment:
> I haven't tested it but `-D_FILE_OFFSET_BITS=64` should probably be removed. See #13671.

Testing this. Was busy with patching firefox for armv7hf-musl

Re: [PR PATCH] [Updated] [WIP] Firefox esr 68.2.0

[voidlinux-github]

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

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

https://github.com/zdtcd/void-packages firefox-esr
https://github.com/void-linux/void-packages/pull/15753

[WIP] Firefox esr 68.2.0
Built for:
- [x] x86_64
- [x] x86_64-musl
- [x] aarch64
- [x] aarch64-musl
- [x] i686 (Testing without `-D_FILE_OFFSET_BITS=64`)
- [x] armv7hf
- [x] armv7hf-musl

Tested with:
- [x] x86_64
- [x] x86_64-musl

---
I'm trying to remove the conflict between firefox and firefox-esr

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

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

From 96aa2257b90e7a1285a01bc9d1e5699052c01c5e Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 22 Oct 2019 08:21:59 +0700
Subject: [PATCH 1/2] firefox-esr: update to 68.2.0.

---
 srcpkgs/firefox-esr/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index c7a4de0221c..76145fa8a86 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=68.1.0
-revision=3
+version=68.2.0
+revision=1
 wrksrc="firefox-${version}"
 build_helper="rust"
 short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)"
@@ -12,7 +12,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac
+checksum=85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38
 
 lib32disabled=yes
 hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
@@ -110,10 +110,6 @@ do_build() {
 	mkdir -p third_party/rust/libloading/.deps
 
 	case "$XBPS_TARGET_MACHINE" in
-	i686*)
-		export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		;;
 	armv7*)
 		export CFLAGS+=" -mfpu=neon -Wno-psabi"
 		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"

From 300ada18204ba93982adeaabd1878eb358f630ad Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 28 Oct 2019 18:27:23 +0700
Subject: [PATCH 2/2] firefox-esr-i18n: update to 68.2.0.

[skip ci]
---
 srcpkgs/firefox-esr-i18n/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index b4e17fb16f0..ba52f6c73a6 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=68.1.0
+version=68.2.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"

Re: [PR PATCH] [Updated] [WIP] Firefox esr 68.2.0

[voidlinux-github]

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

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

https://github.com/zdtcd/void-packages firefox-esr
https://github.com/void-linux/void-packages/pull/15753

[WIP] Firefox esr 68.2.0
Built for:
- [x] x86_64
- [x] x86_64-musl
- [x] aarch64
- [x] aarch64-musl
- [x] i686 (Testing without `-D_FILE_OFFSET_BITS=64`)
- [x] armv7hf
- [x] armv7hf-musl

Tested with:
- [x] x86_64
- [x] x86_64-musl

---
I'm trying to remove the conflict between firefox and firefox-esr

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

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

From 96aa2257b90e7a1285a01bc9d1e5699052c01c5e Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 22 Oct 2019 08:21:59 +0700
Subject: [PATCH 1/2] firefox-esr: update to 68.2.0.

---
 srcpkgs/firefox-esr/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index c7a4de0221c..76145fa8a86 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=68.1.0
-revision=3
+version=68.2.0
+revision=1
 wrksrc="firefox-${version}"
 build_helper="rust"
 short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)"
@@ -12,7 +12,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac
+checksum=85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38
 
 lib32disabled=yes
 hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
@@ -110,10 +110,6 @@ do_build() {
 	mkdir -p third_party/rust/libloading/.deps
 
 	case "$XBPS_TARGET_MACHINE" in
-	i686*)
-		export CFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64"
-		;;
 	armv7*)
 		export CFLAGS+=" -mfpu=neon -Wno-psabi"
 		export CXXFLAGS+=" -mfpu=neon -Wno-psabi"

From 300ada18204ba93982adeaabd1878eb358f630ad Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 28 Oct 2019 18:27:23 +0700
Subject: [PATCH 2/2] firefox-esr-i18n: update to 68.2.0.

[skip ci]
---
 srcpkgs/firefox-esr-i18n/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index b4e17fb16f0..ba52f6c73a6 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=68.1.0
+version=68.2.0
 revision=1
 build_style=meta
 homepage="https://www.mozilla.org/firefox/"

Re: [PR PATCH] [Merged]: firefox esr 68.2.0

[voidlinux-github]

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

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

firefox esr 68.2.0
https://github.com/void-linux/void-packages/pull/15753

Description:
Built for:
- [x] x86_64
- [x] x86_64-musl
- [x] aarch64
- [x] aarch64-musl
- [x] i686
- [x] armv7hf
- [x] armv7hf-musl

Tested with:
- [x] x86_64
- [x] x86_64-musl

---
I'm trying to remove the conflict between firefox and firefox-esr