update to pdfarranger-1.9.1

This commit is contained in:
sthen 2022-10-03 22:11:30 +00:00
parent 6f98c271b9
commit 184ee30920
4 changed files with 3 additions and 58 deletions

View File

@ -1,6 +1,6 @@
COMMENT = GUI tool to rearrange and modify PDF files
MODPY_EGG_VERSION = 1.9.0
MODPY_EGG_VERSION = 1.9.1
GH_ACCOUNT = pdfarranger
GH_PROJECT = pdfarranger
GH_TAGNAME = ${MODPY_EGG_VERSION}

View File

@ -1,2 +1,2 @@
SHA256 (pdfarranger-1.9.0.tar.gz) = 3EFOIf3GFLN6Eai6cisN83qf/Wbhz1VNYlXQDRptep8=
SIZE (pdfarranger-1.9.0.tar.gz) = 277249
SHA256 (pdfarranger-1.9.1.tar.gz) = oNkSJtGZd8XhL9qsXB5l29BoXvddG+VF8aWVvwIMmJQ=
SIZE (pdfarranger-1.9.1.tar.gz) = 279138

View File

@ -1,39 +0,0 @@
From 6a53d54c7f3e19ca066ea7382f843ad093c80f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Robert?= <jeromerobert@gmx.com>
Date: Sat, 17 Sep 2022 19:42:02 +0200
Subject: [PATCH] Fix NotImplementedError with PikePDF 6
Index: pdfarranger/exporter.py
--- pdfarranger/exporter.py.orig
+++ pdfarranger/exporter.py
@@ -215,9 +215,12 @@ def _copy_n_transform(pdf_input, pdf_output, pages, qu
# if the page already exists in the output PDF, duplicate it
new_page = copied_pages.get((row.nfile, row.npage))
if new_page is None:
- # for backward compatibility with old pikepdf. With pikepdf > 3
- # new_page = current_page should be enough
- new_page = pdf_output.copy_foreign(current_page)
+ try:
+ # for backward compatibility with pikepdf <= 3
+ new_page = pdf_output.copy_foreign(current_page)
+ except NotImplementedError:
+ # This is pikepdf >= 6
+ new_page = current_page
# let pdf_output adopt new_page
pdf_output.pages.append(new_page)
new_page = pdf_output.pages[-1]
@@ -253,8 +256,12 @@ def export_doc(pdf_input, pages, mdata, exportmode, fi
return
outpdf = pikepdf.Pdf.new()
_set_meta(mdata, pdf_input, outpdf)
- # needed to add this, probably related to pikepdf < 2.7.0 workaround
- page = outpdf.copy_foreign(page)
+ try:
+ # needed to add this, probably related to pikepdf < 2.7.0 workaround
+ page = outpdf.copy_foreign(page)
+ except NotImplementedError:
+ # This is pikepdf >= 6
+ pass
# works without make_indirect as already applied to this page
outpdf.pages.append(page)
outname = file_out

View File

@ -1,10 +1,3 @@
#2:
From 6a53d54c7f3e19ca066ea7382f843ad093c80f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Robert?= <jeromerobert@gmx.com>
Date: Sat, 17 Sep 2022 19:42:02 +0200
Subject: [PATCH] Fix NotImplementedError with PikePDF 6
Index: setup.py
--- setup.py.orig
+++ setup.py
@ -17,12 +10,3 @@ Index: setup.py
('share/metainfo', ['data/com.github.jeromerobert.pdfarranger.metainfo.xml']),
]
@@ -51,7 +51,7 @@ setup(
entry_points={
'console_scripts': ['pdfarranger=pdfarranger.pdfarranger:main']
},
- install_requires=['pikepdf>=1.17.0,<6','python-dateutil>=2.4.0'],
+ install_requires=['pikepdf>=1.17.0','python-dateutil>=2.4.0'],
extras_require={
'image': ['img2pdf>=0.3.4'],
},