update pdfarranger and add a patch to cope with new pikepdf
This commit is contained in:
sthen
parent
1d56034b78
commit
e95508470c
|
|
@ -1,6 +1,6 @@
|
|||
COMMENT = GUI tool to rearrange and modify PDF files
|
||||
|
||||
MODPY_EGG_VERSION = 1.8.2
|
||||
MODPY_EGG_VERSION = 1.9.0
|
||||
GH_ACCOUNT = pdfarranger
|
||||
GH_PROJECT = pdfarranger
|
||||
GH_TAGNAME = ${MODPY_EGG_VERSION}
|
||||
|
|
@ -12,8 +12,7 @@ PERMIT_PACKAGE = Yes
|
|||
|
||||
MODULES = lang/python \
|
||||
textproc/intltool
|
||||
|
||||
MODPY_SETUPTOOLS = Yes
|
||||
MODPY_PYBUILD = setuptools
|
||||
|
||||
# Tests write to HOME
|
||||
PORTHOME = ${WRKDIR}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (pdfarranger-1.8.2.tar.gz) = IE310ff3ojNvbXvp9hfHkMPERReH+xT3K6OMnt+22Eo=
|
||||
SIZE (pdfarranger-1.8.2.tar.gz) = 258995
|
||||
SHA256 (pdfarranger-1.9.0.tar.gz) = 3EFOIf3GFLN6Eai6cisN83qf/Wbhz1VNYlXQDRptep8=
|
||||
SIZE (pdfarranger-1.9.0.tar.gz) = 277249
|
||||
|
|
|
|||
39
print/pdfarranger/patches/patch-pdfarranger_exporter_py
Normal file
39
print/pdfarranger/patches/patch-pdfarranger_exporter_py
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
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
|
||||
|
|
@ -1,3 +1,10 @@
|
|||
#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
|
||||
|
|
@ -10,3 +17,12 @@ 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'],
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,26 +1,36 @@
|
|||
bin/pdfarranger
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}.dist-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}.dist-info/COPYING
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}.dist-info/METADATA
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}.dist-info/RECORD
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}.dist-info/WHEEL
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger-${MODPY_EGG_VERSION}.dist-info/top_level.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/__main__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}croputils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}croputils.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}exporter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}exporter.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}iconview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}iconview.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}pdfarranger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}pdfarranger.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}splitter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}splitter.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}undo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/${MODPY_PYCACHE}undo.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/config.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pdfarranger/core.py
|
||||
|
|
@ -42,11 +52,13 @@ share/icons/hicolor/symbolic/apps/com.github.jeromerobert.pdfarranger-symbolic.s
|
|||
share/locale/ca/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/ca@valencia/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/cs/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/da/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/de/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/el/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/es/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/fi/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/fr/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/he/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/hr/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/hu/LC_MESSAGES/pdfarranger.mo
|
||||
share/locale/id/LC_MESSAGES/pdfarranger.mo
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user