Sat Nov 11 20:25:56 2017 UTC ()
geckodriver: fix issue with finding firefox fallback binary


(tnn)
diff -r1.1 -r1.2 pkgsrc/www/geckodriver/Makefile
diff -r1.1 -r1.2 pkgsrc/www/geckodriver/distinfo
diff -r0 -r1.1 pkgsrc/www/geckodriver/patches/patch-vendor_mozrunner_src_runner.rs
cvs diff -r1.1 -r1.2 pkgsrc/www/geckodriver/Makefile (expand / switch to unified diff)

--- pkgsrc/www/geckodriver/Makefile 2017/11/08 14:36:34 1.1
+++ pkgsrc/www/geckodriver/Makefile 2017/11/11 20:25:56 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2017/11/08 14:36:34 tnn Exp $ 1# $NetBSD: Makefile,v 1.2 2017/11/11 20:25:56 tnn Exp $
2 2
3DISTNAME= geckodriver-0.19.1 3DISTNAME= geckodriver-0.19.1
 4PKGREVISION= 1
4CATEGORIES= www 5CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_GITHUB:=mozilla/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mozilla/}
6GITHUB_PROJECT= geckodriver 7GITHUB_PROJECT= geckodriver
7GITHUB_TAG= v${PKGVERSION_NOREV} 8GITHUB_TAG= v${PKGVERSION_NOREV}
8 9
9MAINTAINER= tnn@NetBSD.org 10MAINTAINER= tnn@NetBSD.org
10HOMEPAGE= https://github.com/mozilla/geckodriver/ 11HOMEPAGE= https://github.com/mozilla/geckodriver/
11COMMENT= W3C WebDriver-compatible proxy for Gecko-based browsers 12COMMENT= W3C WebDriver-compatible proxy for Gecko-based browsers
12LICENSE= mpl-1.1 13LICENSE= mpl-1.1
13 14
14DEPENDS+= rust-[0-9]*:../../lang/rust 15DEPENDS+= rust-[0-9]*:../../lang/rust
15 16
16CARGO_CRATE_DEPENDS+= \ 17CARGO_CRATE_DEPENDS+= \
cvs diff -r1.1 -r1.2 pkgsrc/www/geckodriver/distinfo (expand / switch to unified diff)

--- pkgsrc/www/geckodriver/distinfo 2017/11/08 14:36:34 1.1
+++ pkgsrc/www/geckodriver/distinfo 2017/11/11 20:25:56 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.1 2017/11/08 14:36:34 tnn Exp $ 1$NetBSD: distinfo,v 1.2 2017/11/11 20:25:56 tnn Exp $
2 2
3SHA1 (advapi32-sys-0.1.2.crate) = 7401392119f5441f522c1dd92eff980b220d2e44 3SHA1 (advapi32-sys-0.1.2.crate) = 7401392119f5441f522c1dd92eff980b220d2e44
4RMD160 (advapi32-sys-0.1.2.crate) = c4e3f087f4cd61df70a2d7e1be0056b563ff74e4 4RMD160 (advapi32-sys-0.1.2.crate) = c4e3f087f4cd61df70a2d7e1be0056b563ff74e4
5SHA512 (advapi32-sys-0.1.2.crate) = 98a1d2cb6cbd8a3ea53abefd97a991d4e5788d32127017c680c78b414d59f70bba179df1cc21d6fbd08fa9c951eb267d6e3f078b52baf530bef4e22c8ddc9c26 5SHA512 (advapi32-sys-0.1.2.crate) = 98a1d2cb6cbd8a3ea53abefd97a991d4e5788d32127017c680c78b414d59f70bba179df1cc21d6fbd08fa9c951eb267d6e3f078b52baf530bef4e22c8ddc9c26
6Size (advapi32-sys-0.1.2.crate) = 7052 bytes 6Size (advapi32-sys-0.1.2.crate) = 7052 bytes
7SHA1 (aho-corasick-0.6.2.crate) = 695fac68033e10279cd962dc646edeb99357c2d7 7SHA1 (aho-corasick-0.6.2.crate) = 695fac68033e10279cd962dc646edeb99357c2d7
8RMD160 (aho-corasick-0.6.2.crate) = c8c1c00abf3332b65499d15fe4ac64cf7e6ce68b 8RMD160 (aho-corasick-0.6.2.crate) = c8c1c00abf3332b65499d15fe4ac64cf7e6ce68b
9SHA512 (aho-corasick-0.6.2.crate) = 81a013deb96b88ddcd1ddaa10c09075feb97078c59e3fb6a49807a5004effbb523e4572fbe297fe96678f86e2529cc8afa919d3b8f3c9cf44fdee97290904229 9SHA512 (aho-corasick-0.6.2.crate) = 81a013deb96b88ddcd1ddaa10c09075feb97078c59e3fb6a49807a5004effbb523e4572fbe297fe96678f86e2529cc8afa919d3b8f3c9cf44fdee97290904229
10Size (aho-corasick-0.6.2.crate) = 24901 bytes 10Size (aho-corasick-0.6.2.crate) = 24901 bytes
11SHA1 (backtrace-0.3.2.crate) = 2fc03b674e42491e0fd989e5f7ee1448bec55704 11SHA1 (backtrace-0.3.2.crate) = 2fc03b674e42491e0fd989e5f7ee1448bec55704
12RMD160 (backtrace-0.3.2.crate) = ed8b79d600379d18db4f605e32347598cb6b79c7 12RMD160 (backtrace-0.3.2.crate) = ed8b79d600379d18db4f605e32347598cb6b79c7
13SHA512 (backtrace-0.3.2.crate) = 74d7d77da8a42e8c2b6cdc7205c41d52c1299a503583ac26dc4f98703f43d2fd4f6e76b34c68dfa0cbc5a0d239ee1bd0144a35fef6274fb4fdf8c732a141e1e8 13SHA512 (backtrace-0.3.2.crate) = 74d7d77da8a42e8c2b6cdc7205c41d52c1299a503583ac26dc4f98703f43d2fd4f6e76b34c68dfa0cbc5a0d239ee1bd0144a35fef6274fb4fdf8c732a141e1e8
14Size (backtrace-0.3.2.crate) = 23785 bytes 14Size (backtrace-0.3.2.crate) = 23785 bytes
@@ -346,13 +346,14 @@ SHA512 (winapi-0.2.8.crate) = 115e6f027c @@ -346,13 +346,14 @@ SHA512 (winapi-0.2.8.crate) = 115e6f027c
346Size (winapi-0.2.8.crate) = 455145 bytes 346Size (winapi-0.2.8.crate) = 455145 bytes
347SHA1 (winapi-build-0.1.1.crate) = d74a38737db81113e3876a570830b716b64c10a2 347SHA1 (winapi-build-0.1.1.crate) = d74a38737db81113e3876a570830b716b64c10a2
348RMD160 (winapi-build-0.1.1.crate) = f1b6c5812fd6613c6e67e22c5f961963ae3ac5f2 348RMD160 (winapi-build-0.1.1.crate) = f1b6c5812fd6613c6e67e22c5f961963ae3ac5f2
349SHA512 (winapi-build-0.1.1.crate) = 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 349SHA512 (winapi-build-0.1.1.crate) = 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
350Size (winapi-build-0.1.1.crate) = 669 bytes 350Size (winapi-build-0.1.1.crate) = 669 bytes
351SHA1 (winreg-0.3.5.crate) = 7aea23f9ba9f577bcb1b3d0e55f907f4802baef5 351SHA1 (winreg-0.3.5.crate) = 7aea23f9ba9f577bcb1b3d0e55f907f4802baef5
352RMD160 (winreg-0.3.5.crate) = 2cafc01d8d475be009a6b26acacf87554fa4175f 352RMD160 (winreg-0.3.5.crate) = 2cafc01d8d475be009a6b26acacf87554fa4175f
353SHA512 (winreg-0.3.5.crate) = 661b11cede3041e3eb342e806ff44911e73138943be2dc1dd1daf619d43724c64188bcc51af57fe712f214c8d32f247cfbd44f571e66256c6a2340e146ff4997 353SHA512 (winreg-0.3.5.crate) = 661b11cede3041e3eb342e806ff44911e73138943be2dc1dd1daf619d43724c64188bcc51af57fe712f214c8d32f247cfbd44f571e66256c6a2340e146ff4997
354Size (winreg-0.3.5.crate) = 13718 bytes 354Size (winreg-0.3.5.crate) = 13718 bytes
355SHA1 (zip-0.1.19.crate) = 2ef141a2840bab15e9c20ccad9ee12790024c891 355SHA1 (zip-0.1.19.crate) = 2ef141a2840bab15e9c20ccad9ee12790024c891
356RMD160 (zip-0.1.19.crate) = d5149a98f19dcad4b2dd8e757eede9e7f960526d 356RMD160 (zip-0.1.19.crate) = d5149a98f19dcad4b2dd8e757eede9e7f960526d
357SHA512 (zip-0.1.19.crate) = ac04524caf2d0b0c6dbc9105aa9cd3796504d5f5faef15a84b552a1bdba115de4805ca2d71d6b48cbaa5803c0d748e502efd087b6ad081de6673ac53cbed50c4 357SHA512 (zip-0.1.19.crate) = ac04524caf2d0b0c6dbc9105aa9cd3796504d5f5faef15a84b552a1bdba115de4805ca2d71d6b48cbaa5803c0d748e502efd087b6ad081de6673ac53cbed50c4
358Size (zip-0.1.19.crate) = 17251 bytes 358Size (zip-0.1.19.crate) = 17251 bytes
 359SHA1 (patch-vendor_mozrunner_src_runner.rs) = d5dee072ccf08b6a8109f94a1f3df5d5a4de0240
File Added: pkgsrc/www/geckodriver/patches/Attic/patch-vendor_mozrunner_src_runner.rs
$NetBSD: patch-vendor_mozrunner_src_runner.rs,v 1.1 2017/11/11 20:25:56 tnn Exp $

Make the fallback method for finding the default browser behave like Linux.

--- ../vendor/mozrunner-0.5.0/src/runner.rs.orig	2017-09-11 14:07:59.000000000 +0000
+++ ../vendor/mozrunner-0.5.0/src/runner.rs
@@ -318,10 +318,11 @@ pub mod platform {
 
 #[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows")))]
 pub mod platform {
+    use super::find_binary;
     use std::path::PathBuf;
 
     pub fn firefox_default_path() -> Option<PathBuf> {
-        None
+        find_binary("firefox")
     }
 
     pub fn arg_prefix_char(c: char) -> bool {