3
0
Fork 0
forked from mirrors/nixpkgs

python3Packages.pikepdf: 5.4.2 -> 6.0.2

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
This commit is contained in:
Florian Brandes 2022-09-21 23:41:41 +02:00
parent 0132cbf58d
commit 0a14c08223
2 changed files with 15 additions and 26 deletions

View file

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "5.4.2";
version = "6.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -39,7 +39,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-b4QUn+wfkk6Yx74ViBg6yaE1+bXtxidoyXYgBaJ9iiM=";
hash = "sha256-rwMSmARUrScG2nmiYBSkcq0NuUMhn0pHOPvgdKZbH7w=";
};
patches = [
@ -51,10 +51,8 @@ buildPythonPackage rec {
];
postPatch = ''
sed -i 's|\S*/opt/homebrew.*|pass|' setup.py
substituteInPlace setup.py \
--replace setuptools_scm_git_archive ""
--replace "shims_enabled = not cflags_defined" "shims_enabled = False"
'';
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -12,33 +12,24 @@ index 2a170c6..5ee3ba1 100644
check=True,
)
diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py
index be390a1..3818ec3 100644
index 28c596b..aff3565 100644
--- a/src/pikepdf/jbig2.py
+++ b/src/pikepdf/jbig2.py
@@ -31,7 +31,7 @@ def extract_jbig2(
@@ -28,7 +28,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:
output_path = Path(tmpdir) / "outfile"
args = [
- "jbig2dec",
+ "@jbig2dec@",
"--embedded",
"--format",
"png",
@@ -64,7 +64,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:
output_path = Path(tmpdir) / "outfile"
args = [
- "jbig2dec",
+ "@jbig2dec@",
"--embedded",
"--format",
"png",
@@ -100,7 +100,7 @@ def extract_jbig2_bytes(
def _check_jbig2dec_available() -> None: # pragma: no cover
try:
- proc = run(['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii')
+ proc = run(['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii')
except (CalledProcessError, FileNotFoundError) as e:
raise DependencyError("jbig2dec - not installed or not found") from e
else:
@@ -88,7 +88,7 @@ class JBIG2Decoder(JBIG2DecoderInterface):
def _version(self) -> Version:
try:
proc = run(
- ['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii'
+ ['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii'
)
except (CalledProcessError, FileNotFoundError) as e:
raise DependencyError("jbig2dec - not installed or not found") from e