[arch-commits] Commit in ranger/repos/community-any (3 files)

[Jakob Gruber]

    Date: Wednesday, August 22, 2018 @ 19:23:03
  Author: schuay
Revision: 373298

archrelease: copy trunk to community-any

Added:
  ranger/repos/community-any/PKGBUILD
    (from rev 373297, ranger/trunk/PKGBUILD)
  ranger/repos/community-any/replace-stopiteration-with-bare-return.patch
    (from rev 373297, ranger/trunk/replace-stopiteration-with-bare-return.patch)
Deleted:
  ranger/repos/community-any/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   85 +++++++++++++------------
 replace-stopiteration-with-bare-return.patch |   21 ++++++
 2 files changed, 66 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-22 19:22:52 UTC (rev 373297)
+++ PKGBUILD	2018-08-22 19:23:03 UTC (rev 373298)
@@ -1,40 +0,0 @@
-# Maintainer: schuay <jakob.gruber at gmail.com>
-# Previous maintainer: Roman Zimbelmann <romanz at lavabit.com>
-
-pkgname=ranger
-pkgver=1.9.1
-pkgrel=2
-pkgdesc='A simple, vim-like file manager'
-arch=('any')
-url='https://ranger.github.io'
-license=('GPL')
-depends=('python')
-optdepends=(
-    'atool: for previews of archives'
-    'elinks: for previews of html pages'
-    'ffmpegthumbnailer: for video previews'
-    'highlight: for syntax highlighting of code'
-    'libcaca: for ASCII-art image previews'
-    'lynx: for previews of html pages'
-    'mediainfo: for viewing information about media files'
-    'odt2txt: for OpenDocument texts'
-    'perl-image-exiftool: for viewing information about media files'
-    'poppler: for pdf previews'
-    'python-chardet: in case of encoding detection problems'
-    'sudo: to use the "run as root"-feature'
-    'transmission-cli: for viewing bittorrent information'
-    'w3m: for previews of images and html pages')
-conflicts=('ranger-git')
-source=("http://ranger.github.io/${pkgname}-${pkgver}.tar.gz"
-        "http://ranger.github.io/${pkgname}-${pkgver}.tar.gz.sig")
-sha256sums=('40411b0dd08b0abd2632399751b111359786ae5f1e6df047f49653cb7a9edfd2'
-            'SKIP')
-validpgpkeys=('1E9B36EC051FF6F7FFC969A7F08CE1E200FB5CDF') # huterich
-
-package() { 
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Replace "python" with the python binary you want ranger to use!
-  # (python 2.6 and >=3.1 supported, below 2.6 will certainly not work.)
-  python setup.py -q install --root="${pkgdir}" --optimize=1
-}

Copied: ranger/repos/community-any/PKGBUILD (from rev 373297, ranger/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-08-22 19:23:03 UTC (rev 373298)
@@ -0,0 +1,45 @@
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Previous maintainer: Roman Zimbelmann <romanz at lavabit.com>
+
+pkgname=ranger
+pkgver=1.9.1
+pkgrel=2
+pkgdesc='A simple, vim-like file manager'
+arch=('any')
+url='https://ranger.github.io'
+license=('GPL')
+depends=('python')
+optdepends=(
+    'atool: for previews of archives'
+    'elinks: for previews of html pages'
+    'ffmpegthumbnailer: for video previews'
+    'highlight: for syntax highlighting of code'
+    'libcaca: for ASCII-art image previews'
+    'lynx: for previews of html pages'
+    'mediainfo: for viewing information about media files'
+    'odt2txt: for OpenDocument texts'
+    'perl-image-exiftool: for viewing information about media files'
+    'poppler: for pdf previews'
+    'python-chardet: in case of encoding detection problems'
+    'sudo: to use the "run as root"-feature'
+    'transmission-cli: for viewing bittorrent information'
+    'w3m: for previews of images and html pages')
+conflicts=('ranger-git')
+source=("http://ranger.github.io/${pkgname}-${pkgver}.tar.gz"
+        "http://ranger.github.io/${pkgname}-${pkgver}.tar.gz.sig"
+        "replace-stopiteration-with-bare-return.patch")
+sha256sums=('40411b0dd08b0abd2632399751b111359786ae5f1e6df047f49653cb7a9edfd2'
+            'SKIP'
+            '116d6a29139acb7d5216ced45cfcc9faa27ab66acc6aecf4306d9adc7059b872')
+validpgpkeys=('1E9B36EC051FF6F7FFC969A7F08CE1E200FB5CDF') # huterich
+
+package() { 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # https://github.com/ranger/ranger/pull/1244
+  patch -Np1 < "${srcdir}/replace-stopiteration-with-bare-return.patch"
+
+  # Replace "python" with the python binary you want ranger to use!
+  # (python 2.6 and >=3.1 supported, below 2.6 will certainly not work.)
+  python setup.py -q install --root="${pkgdir}" --optimize=1
+}

Copied: ranger/repos/community-any/replace-stopiteration-with-bare-return.patch (from rev 373297, ranger/trunk/replace-stopiteration-with-bare-return.patch)
===================================================================
--- replace-stopiteration-with-bare-return.patch	                        (rev 0)
+++ replace-stopiteration-with-bare-return.patch	2018-08-22 19:23:03 UTC (rev 373298)
@@ -0,0 +1,21 @@
+diff --git a/ranger/gui/widgets/pager.py b/ranger/gui/widgets/pager.py
+index 9afbfd15..d64d4ac1 100644
+--- a/ranger/gui/widgets/pager.py
++++ b/ranger/gui/widgets/pager.py
+@@ -234,7 +234,7 @@ class Pager(Widget):  # pylint: disable=too-many-instance-attributes
+     def _generate_lines(self, starty, startx):
+         i = starty
+         if not self.source:
+-            raise StopIteration
++            return
+         while True:
+             try:
+                 line = self._get_line(i).expandtabs(4)
+@@ -244,5 +244,5 @@ class Pager(Widget):  # pylint: disable=too-many-instance-attributes
+                     line = line[startx:self.wid + startx]
+                 yield line.rstrip().replace('\r\n', '\n')
+             except IndexError:
+-                raise StopIteration
++                return
+             i += 1
+