[packages/firefox] unbreak geckodriver by avoiding perl class
atler
atler at pld-linux.org
Wed Jul 1 11:54:07 CEST 2020
commit f1e03bebbe8934eef0c4ced3515c380b6df7f1a5
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Jul 1 11:52:45 2020 +0200
unbreak geckodriver by avoiding perl class
see https://bugzilla.mozilla.org/show_bug.cgi?id=1649508
firefox.spec | 2 ++
geckodriver-regex.patch | 11 +++++++++++
2 files changed, 13 insertions(+)
---
diff --git a/firefox.spec b/firefox.spec
index 6f85079..b36bde6 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -244,6 +244,7 @@ Source191: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i68
Source192: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/zh-TW.xpi
# Source192-md5: 3837f29330593e310a87a9daa36157d5
+Patch0: geckodriver-regex.patch
Patch4: %{name}-prefs.patch
Patch5: %{name}-pld-bookmarks.patch
Patch6: %{name}-no-subshell.patch
@@ -2020,6 +2021,7 @@ unpack() {
%define __unzip unpack
%setup -q %(seq -f '-a %g' 100 192 | xargs)
+%patch0 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p2
diff --git a/geckodriver-regex.patch b/geckodriver-regex.patch
new file mode 100644
index 0000000..0b92e1d
--- /dev/null
+++ b/geckodriver-regex.patch
@@ -0,0 +1,11 @@
+--- firefox-78.0/testing/geckodriver/src/capabilities.rs.orig 2020-07-01 11:46:43.489401648 +0200
++++ firefox-78.0/testing/geckodriver/src/capabilities.rs 2020-07-01 11:47:03.525900589 +0200
+@@ -79,7 +79,7 @@
+
+ fn version_from_binary(&self, binary: &PathBuf) -> Option<String> {
+ let version_regexp =
+- Regex::new(r#"\d+\.\d+(?:[a-z]\d+)?"#).expect("Error parsing version regexp");
++ Regex::new(r#"[0-9]+\.[0-9]+(?:[a-z][0-9]+)?"#).expect("Error parsing version regexp");
+ let output = Command::new(binary)
+ .args(&["-version"])
+ .stdout(Stdio::piped())
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/firefox.git/commitdiff/f1e03bebbe8934eef0c4ced3515c380b6df7f1a5
More information about the pld-cvs-commit
mailing list