Unverified Commit 86a8472d authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #269800 from NixOS/revert-268772-pikepdf-8.7.1 

Revert "python311Packages.pikepdf: 8.4.0 -> 8.7.1"
parents adc53389 e705fd12

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

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


buildPythonPackage rec {

  pname = "ocrmypdf";

  version = "15.4.3";

  version = "15.4.0";



  disabled = pythonOlder "3.9";
@@ -47,7 +47,7 @@ buildPythonPackage rec { 
    postFetch = ''

      rm "$out/.git_archival.txt"

    '';

    hash = "sha256-mMop5BpODzorRgvGbpHCR80uKYT/CE2VEX8RF4Dh1hw=";

    hash = "sha256-cbKqisaRAeT8ljANbYiUDrptAoQmmIkMu1ya8O6nXvQ=";

  };



  SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/ocrmypdf/paths.patch

+5 −5
Original line number Diff line number Diff line 
diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py

index 94eec244..4bb15db9 100644

index 92b73a0a..9f04555c 100644

--- a/src/ocrmypdf/_exec/ghostscript.py

+++ b/src/ocrmypdf/_exec/ghostscript.py

@@ -31,7 +31,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset(

     ]

 )

@@ -58,7 +58,7 @@ log.addFilter(DuplicateFilter(log))

 

 

 # Ghostscript executable - gswin32c is not supported

-GS = 'gswin64c' if os.name == 'nt' else 'gs'

+GS = '@gs@'

 

 

 log = logging.getLogger(__name__)

 def version() -> Version:

diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py

index 5a34a95a..5ee1b333 100644

--- a/src/ocrmypdf/_exec/jbig2enc.py

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

+4 −6
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
, hypothesis

, pythonOlder

, jbig2dec

, deprecated

, deprecation

, lxml

, mupdf

, numpy

, packaging

, pillow

, psutil
@@ -25,7 +24,7 @@ 


buildPythonPackage rec {

  pname = "pikepdf";

  version = "8.7.1";

  version = "8.4.0";

  format = "pyproject";



  disabled = pythonOlder "3.8";
@@ -40,7 +39,7 @@ buildPythonPackage rec { 
    postFetch = ''

      rm "$out/.git_archival.txt"

    '';

    hash = "sha256-uAx3Egz/woJINpruDaZOyuAlbIZUMv93VNaFHLmUjCY=";

    hash = "sha256-48tb5bhmBdKVjMld07303qIi5C16yaf+5TpRPVC6EQk=";

  };



  patches = [
@@ -69,7 +68,6 @@ buildPythonPackage rec { 
  nativeCheckInputs = [

    attrs

    hypothesis

    numpy

    pytest-xdist

    psutil

    pytestCheckHook
@@ -78,7 +76,7 @@ buildPythonPackage rec { 
  ];



  propagatedBuildInputs = [

    deprecated

    deprecation

    lxml

    packaging

    pillow

pkgs/development/python-modules/pikepdf/paths.patch

+14 −14
Original line number Diff line number Diff line 
diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py

index d27c660..6796984 100644

index 2a170c6..5ee3ba1 100644

--- a/src/pikepdf/_methods.py

+++ b/src/pikepdf/_methods.py

@@ -72,7 +72,7 @@ def _mudraw(buffer, fmt) -> bytes:

@@ -80,7 +80,7 @@ def _mudraw(buffer, fmt) -> bytes:

         tmp_in.flush()

 

         proc = run(
@@ -12,10 +12,10 @@ index d27c660..6796984 100644 
             check=True,

         )

diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py

index f89b4f9..f187ebd 100644

index 28c596b..aff3565 100644

--- a/src/pikepdf/jbig2.py

+++ b/src/pikepdf/jbig2.py

@@ -63,7 +63,7 @@ class JBIG2Decoder(JBIG2DecoderInterface):

@@ -28,7 +28,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:

         output_path = Path(tmpdir) / "outfile"



         args = [
@@ -24,10 +24,10 @@ index f89b4f9..f187ebd 100644 
             "--embedded",

             "--format",

             "png",

@@ -90,7 +90,7 @@ class JBIG2Decoder(JBIG2DecoderInterface):

@@ -88,7 +88,7 @@ class JBIG2Decoder(JBIG2DecoderInterface):

     def _version(self) -> Version:

         try:

             proc = self._run(

             proc = run(

-                ['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii'

+                ['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii'

             )