From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Firefox esr 68.2.0
Date: Thu, 24 Oct 2019 13:02:51 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15753@inbox.vuxu.org> (raw)
[-- 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/"
next reply other threads:[~2019-10-24 11:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 11:02 voidlinux-github [this message]
2019-10-24 18:34 ` [WIP] " voidlinux-github
2019-10-28 9:29 ` voidlinux-github
2019-10-28 11:27 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-28 11:27 ` voidlinux-github
2019-10-29 5:38 ` [PR PATCH] [Merged]: firefox " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15753@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).