Lots of fixes, full changelog at https://ranger.github.io/changelog.html
Tests still partially fail due to outdated py-astroid, but I've adjusted
the comment; shellcheck is being used as well now.
Keeps working for me as in: I can quickly browse files, common formats
such as pdf, jpg, mkv, etc. are opened just fine with mupdf, sxiv and
mpv.
Patches only changed in offsets, but I added comments for clarity.
Feedack? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ranger/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 12 Jul 2019 21:15:36 -0000 1.10
+++ Makefile 2 Jan 2020 04:58:48 -0000
@@ -2,9 +2,8 @@
COMMENT = minimalistic console file manager
-MODPY_EGG_VERSION = 1.9.2
+MODPY_EGG_VERSION = 1.9.3
DISTNAME = ranger-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = sysutils misc
@@ -26,11 +25,12 @@ RUN_DEPENDS = archivers/libarchive \
devel/desktop-file-utils \
shells/bash \
textproc/py-chardet${MODPY_FLAVOR}
-# XXX: ranger/gui/widgets/console.py test depends on devel/py-astroid>=1.5.0:
-# AttributeError: 'TreeRebuilder3k' object has no attribute 'visit_joinedstr'
+# XXX: tests fail with "RuntimeError: generator raised StopIteration", probably
+# needs devel/py-astroid>=1.5.0 but we have 1.4.9p2
TEST_DEPENDS = devel/flake8 \
devel/pylint${MODPY_FLAVOR}<2.0.0 \
- devel/py-test${MODPY_FLAVOR}
+ devel/py-test${MODPY_FLAVOR} \
+ devel/shellcheck
TEST_ENV = HOME=${WRKDIR} \
PYTHON=${MODPY_BIN} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/ranger/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 2 Oct 2018 10:11:53 -0000 1.5
+++ distinfo 1 Jan 2020 22:41:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (ranger-1.9.2.tar.gz) = Dh0bHT94wiemz6eDgi6YWRynajXGQ9SBT0D3NRXWa4o=
-SIZE (ranger-1.9.2.tar.gz) = 265295
+SHA256 (ranger-1.9.3.tar.gz) = zgiKBMkcJSY6lnXcXENRS37Bs4yOpD2anQCSP/bN0lE=
+SIZE (ranger-1.9.3.tar.gz) = 280363
Index: patches/patch-doc_ranger_1
===================================================================
RCS file: /cvs/ports/sysutils/ranger/patches/patch-doc_ranger_1,v
retrieving revision 1.3
diff -u -p -r1.3 patch-doc_ranger_1
--- patches/patch-doc_ranger_1 2 Oct 2018 10:11:53 -0000 1.3
+++ patches/patch-doc_ranger_1 2 Jan 2020 04:37:32 -0000
@@ -1,9 +1,11 @@
$OpenBSD: patch-doc_ranger_1,v 1.3 2018/10/02 10:11:53 kn Exp $
+Fix w3mimgdisplay path.
+
Index: doc/ranger.1
--- doc/ranger.1.orig
+++ doc/ranger.1
-@@ -1624,7 +1624,7 @@ docstrings. Using this will disable the <F1> key on c
+@@ -1917,7 +1917,7 @@ docstrings. Using this will disable the <F1> key on c
.IP "W3MIMGDISPLAY_PATH" 8
.IX Item "W3MIMGDISPLAY_PATH"
By changing this variable, you can change the path of the executable file for
Index: patches/patch-ranger_ext_img_display_py
===================================================================
RCS file: /cvs/ports/sysutils/ranger/patches/patch-ranger_ext_img_display_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ranger_ext_img_display_py
--- patches/patch-ranger_ext_img_display_py 2 Oct 2018 10:11:53 -0000
1.3
+++ patches/patch-ranger_ext_img_display_py 2 Jan 2020 04:38:18 -0000
@@ -1,9 +1,11 @@
$OpenBSD: patch-ranger_ext_img_display_py,v 1.3 2018/10/02 10:11:53 kn Exp $
+Fix w3mimgdisplay path.
+
Index: ranger/ext/img_display.py
--- ranger/ext/img_display.py.orig
+++ ranger/ext/img_display.py
-@@ -32,11 +32,7 @@ from ranger.core.shared import FileManagerAware
+@@ -35,11 +35,7 @@ from ranger.core.shared import FileManagerAware
W3MIMGDISPLAY_ENV = "W3MIMGDISPLAY_PATH"
W3MIMGDISPLAY_OPTIONS = []
W3MIMGDISPLAY_PATHS = [
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/sysutils/ranger/patches/patch-setup_py,v
retrieving revision 1.5
diff -u -p -r1.5 patch-setup_py
--- patches/patch-setup_py 2 Oct 2018 10:32:01 -0000 1.5
+++ patches/patch-setup_py 2 Jan 2020 04:37:49 -0000
@@ -1,5 +1,7 @@
$OpenBSD: patch-setup_py,v 1.5 2018/10/02 10:32:01 kn Exp $
+Fix MANPATH and examples.
+
Index: setup.py
--- setup.py.orig
+++ setup.py
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/ranger/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 2 Oct 2018 10:32:01 -0000 1.5
+++ pkg/PLIST 1 Jan 2020 22:56:09 -0000
@@ -3,17 +3,17 @@ bin/ranger
bin/rifle
lib/python${MODPY_VERSION}/site-packages/ranger/
lib/python${MODPY_VERSION}/site-packages/ranger/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ranger/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ranger/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ranger/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/api/
lib/python${MODPY_VERSION}/site-packages/ranger/api/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ranger/api/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ranger/api/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ranger/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/api/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/api/commands.py
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/${MODPY_PYCACHE}jungle.${MODPY_PYC_MAGIC_TAG}pyc
@@ -25,7 +25,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/solarized.py
lib/python${MODPY_VERSION}/site-packages/ranger/config/
lib/python${MODPY_VERSION}/site-packages/ranger/config/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ranger/config/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ranger/config/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ranger/config/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/config/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/config/${MODPY_PYCACHE}commands_sample.${MODPY_PYC_MAGIC_TAG}pyc
@@ -35,7 +35,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger/config/rifle.conf
lib/python${MODPY_VERSION}/site-packages/ranger/container/
lib/python${MODPY_VERSION}/site-packages/ranger/container/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ranger/container/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ranger/container/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ranger/container/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/container/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/container/${MODPY_PYCACHE}directory.${MODPY_PYC_MAGIC_TAG}pyc
@@ -53,7 +53,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger/container/tags.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/
lib/python${MODPY_VERSION}/site-packages/ranger/core/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ranger/core/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ranger/core/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ranger/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/${MODPY_PYCACHE}filter_stack.${MODPY_PYC_MAGIC_TAG}pyc
@@ -80,13 +80,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger/data/scope.sh
lib/python${MODPY_VERSION}/site-packages/ranger/ext/
lib/python${MODPY_VERSION}/site-packages/ranger/ext/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}accumulator.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}cached_function.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}curses_interrupt_handler.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}direction.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}get_executables.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}human_readable.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}img_display.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}iter_tools.${MODPY_PYC_MAGIC_TAG}pyc
@@ -99,6 +100,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}popen_forked.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}relative_symlink.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}rifle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}safe_path.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}shell_escape.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}shutil_generatorized.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc
@@ -109,6 +111,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger/ext/curses_interrupt_handler.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/direction.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/get_executables.py
+lib/python${MODPY_VERSION}/site-packages/ranger/ext/hash.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/human_readable.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/img_display.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/iter_tools.py
@@ -121,13 +124,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger/ext/popen_forked.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/relative_symlink.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/rifle.py
+lib/python${MODPY_VERSION}/site-packages/ranger/ext/safe_path.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/shell_escape.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/shutil_generatorized.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/signals.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/spawn.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/${MODPY_PYCACHE}bzr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
@@ -142,7 +146,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger/ext/widestring.py
lib/python${MODPY_VERSION}/site-packages/ranger/gui/
lib/python${MODPY_VERSION}/site-packages/ranger/gui/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ranger/gui/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ranger/gui/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ranger/gui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/gui/${MODPY_PYCACHE}ansi.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/gui/${MODPY_PYCACHE}bar.${MODPY_PYC_MAGIC_TAG}pyc
@@ -164,7 +168,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger/gui/ui.py
lib/python${MODPY_VERSION}/site-packages/ranger/gui/widgets/
lib/python${MODPY_VERSION}/site-packages/ranger/gui/widgets/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ranger/gui/widgets/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ranger/gui/widgets/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/ranger/gui/widgets/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/gui/widgets/${MODPY_PYCACHE}browsercolumn.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/gui/widgets/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}pyc
@@ -187,7 +191,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger_fm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
@man man/man1/ranger.1
@man man/man1/rifle.1
-share/applications/
share/applications/ranger.desktop
share/doc/ranger/
share/doc/ranger/CHANGELOG.md
@@ -210,8 +213,7 @@ share/doc/ranger/tools/print_colors.py
share/doc/ranger/tools/print_keys.py
share/examples/ranger/
share/examples/ranger/README
-share/examples/ranger/bash_automatic_cd.sh
-share/examples/ranger/bash_subshell_notice.sh
+share/examples/ranger/fish_automatic_cd.fish
share/examples/ranger/plugin_avfs.py
share/examples/ranger/plugin_chmod_keybindings.py
share/examples/ranger/plugin_fasd_add.py
@@ -226,5 +228,7 @@ share/examples/ranger/plugin_pmount_dyna
share/examples/ranger/rc_emacs.conf
share/examples/ranger/rifle_different_file_opener.conf
share/examples/ranger/rifle_sxiv.sh
+share/examples/ranger/shell_automatic_cd.sh
+share/examples/ranger/shell_subshell_notice.sh
share/examples/ranger/vim_file_chooser.vim
@tag update-desktop-database
