Version 1.9.2 is out, fixing some crashes due to python 3.6/3.7.
Introducing native Kitty image previews and a dired-filter inspired
filter stack.
https://ranger.github.io/changelog.html
Besides this, I replaced post-install with a setup.py patch and adjusted
to test suite changes:
- adjust shebang
- requires gmake
- pass HOME for write tests
- pass TERM for terminfo tests
- specify pylint version requirement as per Pipfile
- needs devel/astroid>=1.5.0 but our tree is still as 1.4.9
Due to the last point our test target does no finish but since it's a
minor issue and other tests pass, I'd like to handle this separately
once astroid has been updated.
Continues to work for me on amd64.
Feedback? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ranger/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 22 Feb 2018 16:51:50 -0000 1.7
+++ Makefile 1 Oct 2018 22:52:47 -0000
@@ -2,10 +2,11 @@
COMMENT = minimalistic console file manager
-MODPY_EGG_VERSION = 1.9.1
+MODPY_EGG_VERSION = 1.9.2
DISTNAME = ranger-${MODPY_EGG_VERSION}
-CATEGORIES = sysutils misc
+CATEGORIES = sysutils \
+ misc
HOMEPAGE = https://ranger.github.io/
@@ -14,20 +15,28 @@ MAINTAINER = Klemens Nanni <kn@openbsd.o
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = ${HOMEPAGE}
+MASTER_SITES = https://ranger.github.io/
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+MODPY_ADJ_FILES = tests/manpage_completion_test.py
# libarchive (bsdtar) used as an alternative to atool
RUN_DEPENDS = archivers/libarchive \
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'
TEST_DEPENDS = devel/flake8 \
- devel/pylint${MODPY_FLAVOR} \
+ devel/pylint${MODPY_FLAVOR}<2.0.0 \
devel/py-test${MODPY_FLAVOR}
-TEST_ENV = PYTHON=${MODPY_BIN}
+TEST_ENV = HOME=${WRKDIR} \
+ PYTHON=${MODPY_BIN} \
+ TERM=${TERM}
+
+# tests
+USE_GMAKE = Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/{doc/ranger.1,ranger/ext/img_display.py}
@@ -37,9 +46,5 @@ pre-test:
ln -sf ${LOCALBASE}/bin/${_p}${MODPY_BIN_SUFFIX} \
${WRKDIR}/bin/${_p}
.endfor
-
-post-install:
- mv ${PREFIX}/{share/man/man1,man}
- mv ${PREFIX}/share/{doc/ranger/examples,examples/ranger}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/ranger/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 22 Feb 2018 16:51:50 -0000 1.4
+++ distinfo 1 Oct 2018 21:56:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (ranger-1.9.1.tar.gz) = QEEbDdCLCr0mMjmXUbERNZeGrl8ebfBH9JZTy3qe39I=
-SIZE (ranger-1.9.1.tar.gz) = 245872
+SHA256 (ranger-1.9.2.tar.gz) = Dh0bHT94wiemz6eDgi6YWRynajXGQ9SBT0D3NRXWa4o=
+SIZE (ranger-1.9.2.tar.gz) = 265295
Index: patches/patch-doc_ranger_1
===================================================================
RCS file: /cvs/ports/sysutils/ranger/patches/patch-doc_ranger_1,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_ranger_1
--- patches/patch-doc_ranger_1 22 Feb 2018 16:51:50 -0000 1.2
+++ patches/patch-doc_ranger_1 1 Oct 2018 22:02:37 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-doc_ranger_1,v 1.2 2018/
Index: doc/ranger.1
--- doc/ranger.1.orig
+++ doc/ranger.1
-@@ -1521,7 +1521,7 @@ docstrings. Using this will disable the <F1> key on c
+@@ -1624,7 +1624,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.2
diff -u -p -r1.2 patch-ranger_ext_img_display_py
--- patches/patch-ranger_ext_img_display_py 22 Feb 2018 16:51:50 -0000
1.2
+++ patches/patch-ranger_ext_img_display_py 1 Oct 2018 22:02:35 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-ranger_ext_img_display_p
Index: ranger/ext/img_display.py
--- ranger/ext/img_display.py.orig
+++ ranger/ext/img_display.py
-@@ -28,11 +28,7 @@ from ranger.core.shared import FileManagerAware
+@@ -32,11 +32,7 @@ from ranger.core.shared import FileManagerAware
W3MIMGDISPLAY_ENV = "W3MIMGDISPLAY_PATH"
W3MIMGDISPLAY_OPTIONS = []
W3MIMGDISPLAY_PATHS = [
@@ -15,4 +15,4 @@ Index: ranger/ext/img_display.py
+ '${LOCALBASE}/libexec/w3m/w3mimgdisplay',
]
-
+ # Helper functions shared between the previewers (make them static methods of
the base class?)
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_py 1 Oct 2018 22:07:07 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -106,7 +106,7 @@ def main():
+ ('share/applications', [
+ 'doc/ranger.desktop',
+ ]),
+- ('share/man/man1', [
++ ('man/man1', [
+ 'doc/ranger.1',
+ 'doc/rifle.1',
+ ]),
+@@ -118,7 +118,7 @@ def main():
+ ]),
+ ('share/doc/ranger/config', findall('doc/config')),
+ ('share/doc/ranger/config/colorschemes',
findall('doc/config/colorschemes')),
+- ('share/doc/ranger/examples', findall('examples')),
++ ('share/examples/ranger', findall('examples')),
+ ('share/doc/ranger/tools', findall('doc/tools')),
+ ],
+ package_data={
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/ranger/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 22 Feb 2018 16:51:50 -0000 1.4
+++ pkg/PLIST 1 Oct 2018 22:08:03 -0000
@@ -56,6 +56,7 @@ lib/python${MODPY_VERSION}/site-packages
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
lib/python${MODPY_VERSION}/site-packages/ranger/core/${MODPY_PYCACHE}fm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/${MODPY_PYCACHE}linemode.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/${MODPY_PYCACHE}loader.${MODPY_PYC_MAGIC_TAG}pyc
@@ -65,6 +66,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ranger/core/${MODPY_PYCACHE}shared.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/${MODPY_PYCACHE}tab.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/actions.py
+lib/python${MODPY_VERSION}/site-packages/ranger/core/filter_stack.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/fm.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/linemode.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/loader.py
@@ -191,7 +193,7 @@ share/doc/ranger/
share/doc/ranger/CHANGELOG.md
share/doc/ranger/HACKING.md
share/doc/ranger/README.md
-share/doc/ranger/colorschemes.txt
+share/doc/ranger/colorschemes.md
share/doc/ranger/config/
share/doc/ranger/config/colorschemes/
share/doc/ranger/config/colorschemes/default.py
@@ -210,6 +212,7 @@ share/examples/ranger/
share/examples/ranger/README
share/examples/ranger/bash_automatic_cd.sh
share/examples/ranger/bash_subshell_notice.sh
+share/examples/ranger/plugin_avfs.py
share/examples/ranger/plugin_chmod_keybindings.py
share/examples/ranger/plugin_fasd_add.py
share/examples/ranger/plugin_file_filter.py
@@ -219,7 +222,9 @@ share/examples/ranger/plugin_linemode.py
share/examples/ranger/plugin_new_macro.py
share/examples/ranger/plugin_new_sorting_method.py
share/examples/ranger/plugin_pmount.py
+share/examples/ranger/plugin_pmount_dynamic.py
share/examples/ranger/rc_emacs.conf
share/examples/ranger/rifle_different_file_opener.conf
share/examples/ranger/rifle_sxiv.sh
share/examples/ranger/vim_file_chooser.vim
+@tag update-desktop-database
