commit bdaf4ba41d2e3b9ecec55d4f18adbb71088dcfd2 · pyrox.dev/nixpkgs

+2 -2

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

···

       31
       31
        
       

     

       32
       32
        
       buildPythonPackage rec {

     

       33
       33
        
         pname = "ocrmypdf";

     

       34
       34
       -
         version = "15.3.1";

     

       34
       34
       +
         version = "15.4.0";

     

       35
       35
        
       

     

       36
       36
        
         disabled = pythonOlder "3.9";

     

       37
       37
        
       

     
···

       47
       47
        
           postFetch = ''

     

       48
       48
        
             rm "$out/.git_archival.txt"

     

       49
       49
        
           '';

     

       50
       50
       -
           hash = "sha256-Yngx9hH/4yftClNqM/yyrOCPH0+4Bl9GIEGjawLdy0s=";

     

       50
       50
       +
           hash = "sha256-cbKqisaRAeT8ljANbYiUDrptAoQmmIkMu1ya8O6nXvQ=";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

+19 -19

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

···

       1
       1
        
       diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py

     

       2
       2
       -
       index e28d23e9..183cd918 100644

     

       2
       2
       +
       index 92b73a0a..9f04555c 100644

     

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

     

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

     

       5
       5
       -
       @@ -67,7 +67,7 @@ log.addFilter(DuplicateFilter(log))

     

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

     

       6
       6
        
        

     

       7
       7
        
        

     

       8
       8
        
        # Ghostscript executable - gswin32c is not supported

     
···

       12
       12
        
        

     

       13
       13
        
        def version() -> Version:

     

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

     

       15
       15
       -
       index 28d3dd1c..477a7d6c 100644

     

       15
       15
       +
       index 5a34a95a..5ee1b333 100644

     

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

     

       17
       17
        
       +++ b/src/ocrmypdf/_exec/jbig2enc.py

     

       18
       18
        
       @@ -14,7 +14,7 @@ from ocrmypdf.subprocess import get_version, run

     
···

       26
       26
        
        def available():

     

       27
       27
        
       @@ -27,7 +27,7 @@ def available():

     

       28
       28
        
        

     

       29
       29
       -
        def convert_group(*, cwd, infiles, out_prefix, threshold):

     

       29
       29
       +
        def convert_group(cwd, infiles, out_prefix, threshold):

     

       30
       30
        
            args = [

     

       31
       31
        
       -        'jbig2',

     

       32
       32
        
       +        '@jbig2@',

     

       33
       33
        
                '-b',

     

       34
       34
        
                out_prefix,

     

       35
       35
        
                '--symbol-mode',  # symbol mode (lossy)

     

       36
       36
       -
       @@ -50,7 +50,7 @@ def convert_group_mp(args):

     

       36
       36
       +
       @@ -44,7 +44,7 @@ def convert_group(cwd, infiles, out_prefix, threshold):

     

       37
       37
        
        

     

       38
       38
        
        

     

       39
       39
       -
        def convert_single(*, cwd, infile, outfile, threshold):

     

       39
       39
       +
        def convert_single(cwd, infile, outfile, threshold):

     

       40
       40
        
       -    args = ['jbig2', '--pdf', '-t', str(threshold), infile]

     

       41
       41
        
       +    args = ['@jbig2@', '--pdf', '-t', str(threshold), infile]

     

       42
       42
        
            with open(outfile, 'wb') as fstdout:

     

       43
       43
        
                proc = run(args, cwd=cwd, stdout=fstdout, stderr=PIPE)

     

       44
       44
        
            proc.check_returncode()

     

       45
       45
        
       diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py

     

       46
       46
       -
       index 8425caec..a027f041 100644

     

       46
       46
       +
       index 5b8600d0..fcad771b 100644

     

       47
       47
        
       --- a/src/ocrmypdf/_exec/pngquant.py

     

       48
       48
        
       +++ b/src/ocrmypdf/_exec/pngquant.py

     

       49
       49
       -
       @@ -18,7 +18,7 @@ from ocrmypdf.subprocess import get_version, run

     

       49
       49
       +
       @@ -15,7 +15,7 @@ from ocrmypdf.subprocess import get_version, run

     

       50
       50
        
        

     

       51
       51
        
        

     

       52
       52
        
        def version() -> Version:

     
···

       55
       55
        
        

     

       56
       56
        
        

     

       57
       57
        
        def available():

     

       58
       58
       -
       @@ -45,7 +45,7 @@ def input_as_png(input_file: Path):

     

       59
       59
       -
        def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max: int):

     

       60
       60
       -
            with input_as_png(input_file) as input_stream:

     

       58
       58
       +
       @@ -37,7 +37,7 @@ def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max:

     

       59
       59
       +
            """

     

       60
       60
       +
            with open(input_file, 'rb') as input_stream:

     

       61
       61
        
                args = [

     

       62
       62
        
       -            'pngquant',

     

       63
       63
        
       +            '@pngquant@',

     
···

       65
       65
        
                    '--skip-if-larger',

     

       66
       66
        
                    '--quality',

     

       67
       67
        
       diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py

     

       68
       68
       -
       index 4eac3470..61315d14 100644

     

       68
       68
       +
       index fab92bb1..78b634a7 100644

     

       69
       69
        
       --- a/src/ocrmypdf/_exec/tesseract.py

     

       70
       70
        
       +++ b/src/ocrmypdf/_exec/tesseract.py

     

       71
       71
       -
       @@ -114,7 +114,7 @@ class TesseractVersion(Version):

     

       71
       71
       +
       @@ -95,7 +95,7 @@ class TesseractVersion(Version):

     

       72
       72
        
        

     

       73
       73
        
        

     

       74
       74
        
        def version() -> Version:

     
···

       77
       77
        
        

     

       78
       78
        
        

     

       79
       79
        
        def has_thresholding() -> bool:

     

       80
       80
       -
       @@ -132,7 +132,7 @@ def get_languages() -> set[str]:

     

       80
       80
       +
       @@ -113,7 +113,7 @@ def get_languages() -> set[str]:

     

       81
       81
        
                msg += output

     

       82
       82
        
                return msg

     

       83
       83
        
        

     
···

       86
       86
        
            try:

     

       87
       87
        
                proc = run(

     

       88
       88
        
                    args_tess,

     

       89
       89
       -
       @@ -154,7 +154,7 @@ def get_languages() -> set[str]:

     

       89
       89
       +
       @@ -135,7 +135,7 @@ def get_languages() -> set[str]:

     

       90
       90
        
        

     

       91
       91
        
        

     

       92
       92
        
        def tess_base_args(langs: list[str], engine_mode: int | None) -> list[str]:

     
···

       96
       96
        
                args.extend(['-l', '+'.join(langs)])

     

       97
       97
        
            if engine_mode is not None:

     

       98
       98
        
       diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py

     

       99
       99
       -
       index 2944b4f4..55a36140 100644

     

       99
       99
       +
       index 493d9b3a..578c2dda 100644

     

       100
       100
        
       --- a/src/ocrmypdf/_exec/unpaper.py

     

       101
       101
        
       +++ b/src/ocrmypdf/_exec/unpaper.py

     

       102
       102
       -
       @@ -69,7 +69,7 @@ class UnpaperImageTooLargeError(Exception):

     

       102
       102
       +
       @@ -70,7 +70,7 @@ class UnpaperImageTooLargeError(Exception):

     

       103
       103
        
        

     

       104
       104
        
        

     

       105
       105
        
        def version() -> Version:

     
···

       107
       107
        
       +    return Version(get_version('@unpaper@'))

     

       108
       108
        
        

     

       109
       109
        
        

     

       110
       110
       -
        SUPPORTED_MODES = {'1', 'L', 'RGB'}

     

       111
       111
       -
       @@ -123,7 +123,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]:

     

       110
       110
       +
        @contextmanager

     

       111
       111
       +
       @@ -92,7 +92,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]:

     

       112
       112
        
        def run_unpaper(

     

       113
       113
        
            input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: list[str]

     

       114
       114
        
        ) -> None: