Merge pull request #305616 from dotlambda/python3Packages.ocrmypdf
python311Packages.ocrmypdf: 16.1.2 -> 16.2.0
This commit is contained in:
commit
3443d8c40c
|
@ -9,6 +9,7 @@
|
|||
, jbig2enc
|
||||
, packaging
|
||||
, pdfminer-six
|
||||
, pillow-heif
|
||||
, pikepdf
|
||||
, pillow
|
||||
, pluggy
|
||||
|
@ -18,19 +19,17 @@
|
|||
, pythonOlder
|
||||
, rich
|
||||
, reportlab
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, substituteAll
|
||||
, tesseract
|
||||
, tqdm
|
||||
, typing-extensions
|
||||
, unpaper
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ocrmypdf";
|
||||
version = "16.1.2";
|
||||
version = "16.2.0";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
|
@ -46,10 +45,11 @@ buildPythonPackage rec {
|
|||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-nZvfkfO5u3iuN0g/KITWbhYCRAJngEOKCW48z6IEPMI=";
|
||||
hash = "sha256-sqhuQ+no6UymxbVtDtWiYQK8kKpO1y37NxLDmRT1LEQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-pillow-heif.patch
|
||||
(substituteAll {
|
||||
src = ./paths.patch;
|
||||
gs = lib.getExe ghostscript;
|
||||
|
@ -60,30 +60,31 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
build-system = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
deprecation
|
||||
img2pdf
|
||||
packaging
|
||||
pdfminer-six
|
||||
pillow-heif
|
||||
pikepdf
|
||||
pillow
|
||||
pluggy
|
||||
reportlab
|
||||
rich
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
reportlab
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index d045458f..efa9161d 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -16,7 +16,7 @@ dependencies = [
|
||||
"img2pdf>=0.5",
|
||||
"packaging>=20",
|
||||
"pdfminer.six>=20220319",
|
||||
- "pi-heif", # Heif image format - maintainers: if this is removed, it will NOT break
|
||||
+ "pillow-heif", # Heif image format - maintainers: if this is removed, it will NOT break
|
||||
"pikepdf>=8.10.1",
|
||||
"Pillow>=10.0.1",
|
||||
"pluggy>=1",
|
||||
diff --git a/src/ocrmypdf/_pipeline.py b/src/ocrmypdf/_pipeline.py
|
||||
index 043a78a0..522197b1 100644
|
||||
--- a/src/ocrmypdf/_pipeline.py
|
||||
+++ b/src/ocrmypdf/_pipeline.py
|
||||
@@ -42,7 +42,7 @@ from ocrmypdf.pdfinfo import Colorspace, Encoding, PageInfo, PdfInfo
|
||||
from ocrmypdf.pluginspec import OrientationConfidence
|
||||
|
||||
try:
|
||||
- from pi_heif import register_heif_opener
|
||||
+ from pillow_heif import register_heif_opener
|
||||
except ImportError:
|
||||
|
||||
def register_heif_opener():
|
|
@ -57,8 +57,12 @@ buildPythonPackage rec {
|
|||
x265
|
||||
];
|
||||
|
||||
# clang-16: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument]
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
|
||||
env = {
|
||||
# clang-16: error: argument unused during compilation: '-fno-strict-overflow'
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
|
||||
|
||||
RELEASE_FULL_FLAG = 1;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pillow
|
||||
|
|
Loading…
Reference in New Issue