python/pyocr: 0.4.6 -> 0.4.7

Upstream changes:

  * Tesseract 4.00.00alpha:
    * Version parsing: Ignore suffix (so '4.00.00alpha' == (4, 0, 0))
    * Libtesseract: Load libtesseract.so.4 instead of libtesseract.so.3
      if available
  * Support for Tesseract 3.05.00:
    * Builders: Split field 'tess_conf' into 'tess_flags' and 'tess_conf'
    * Libtesseract: If available, use
                    TessBaseAPIDetectOrientationScript() instead of
                    TessBaseAPIDetectOS
  * Libtesseract:
    * Workaround: Prevents possible segfault in image_to_string() when
                  the target language is not available

Full upstream change log can be found at:

https://github.com/openpaperwork/pyocr/blob/b006123d1d002711b9/ChangeLog

The tesseract.patch for supporting Tesseract version 3.05.00 has been
applied upstream and we can safely drop it.

We now use substituteInPlace in conjunction with a patch to insert the
relevant store paths instead of sed, so it's less fragile whenever we
have upstream changes in handling of these paths.

I've tested this by reverting 48a941e29f and applying a build
fix patch of Cuneiform 1.1.0 from Arch Linux, because right now
Cuneiform is an experimental version that can't be fixed on behalf of
pyocr (the reason is that pyocr needs to get a list of languages, which
doesn't work in that version anymore).

In addition to that I've successfully built paperwork-backend which by
now is the one package which depends on pyocr. However, I didn't do
runtime tests of Paperwork.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @7c6f434c

pkgs/development/python-modules/pyocr/default.nix

@@ -4,30 +4,35 @@
 
 buildPythonPackage rec {
   name = "pyocr-${version}";
-  version = "0.4.6";
+  version = "0.4.7";
 
   # Don't fetch from PYPI because it doesn't contain tests.
   src = fetchFromGitHub {
     owner = "jflesch";
     repo = "pyocr";
     rev = version;
-    sha256 = "0amyhkkm400qzbw65ivyzrzxl2r7vxqgsgqm7ml95m7gwkwhnzz0";
+    sha256 = "1iw73r8yrgjf8g00yzpz62ymqbf89cqhyhl9g430srmsrq7mn2yd";
   };
 
-  patches = [ ./tesseract.patch ];
+  NIX_CUNEIFORM_CMD = "${cuneiform}/bin/cuneiform";
+  NIX_CUNEIFORM_DATA = "${cuneiform}/share/cuneiform";
+  NIX_LIBTESSERACT_PATH = "${tesseract}/lib/libtesseract.so";
+  NIX_TESSDATA_PREFIX = "${tesseract}/share/tessdata";
+  NIX_TESSERACT_CMD = "${tesseract}/bin/tesseract";
+
+  patches = [ ./paths.patch ];
 
   postPatch = ''
-    sed -i \
-      -e 's,^\(TESSERACT_CMD *= *\).*,\1"${tesseract}/bin/tesseract",' \
-      -e 's,^\(CUNEIFORM_CMD *= *\).*,\1"${cuneiform}/bin/cuneiform",' \
-      -e '/^CUNIFORM_POSSIBLE_PATHS *= *\[/,/^\]$/ {
-        c CUNIFORM_POSSIBLE_PATHS = ["${cuneiform}/share/cuneiform"]
-      }' src/pyocr/{tesseract,cuneiform}.py
+    substituteInPlace src/pyocr/cuneiform.py \
+      --subst-var NIX_CUNEIFORM_CMD \
+      --subst-var NIX_CUNEIFORM_CMD
 
-    sed -i -r \
-      -e 's,"libtesseract\.so\.3","${tesseract}/lib/libtesseract.so",' \
-      -e 's,^(TESSDATA_PREFIX *=).*,\1 "${tesseract}/share/tessdata",' \
-      src/pyocr/libtesseract/tesseract_raw.py
+    substituteInPlace src/pyocr/tesseract.py \
+      --subst-var NIX_TESSERACT_CMD
+
+    substituteInPlace src/pyocr/libtesseract/tesseract_raw.py \
+      --subst-var NIX_TESSDATA_PREFIX \
+      --subst-var NIX_LIBTESSERACT_PATH
 
     # Disable specific tests that are probably failing because of this issue:
     # https://github.com/jflesch/pyocr/issues/52