<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/16a54a4d6cefe4e2761acb91e82a61357c5fd3ce">https://github.com/macports/macports-ports/commit/16a54a4d6cefe4e2761acb91e82a61357c5fd3ce</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 16a54a4d6cefe4e2761acb91e82a61357c5fd3ce
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat May 25 08:36:33 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> py-mupdf: update to 1.24.2
</span>---
python/py-mupdf/Portfile | 13 +++++---
python/py-mupdf/files/patch-build.diff | 54 +++++++++++++++++++++-------------
2 files changed, 42 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-mupdf/Portfile b/python/py-mupdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cac4259c816..0b9bab523aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup python 1.0
</span> name py-mupdf
# Keep synchronized with port:mupdf.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup pymupdf PyMuPDF 1.23.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup pymupdf PyMuPDF 1.24.2
</span> github.tarball_from archive
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,9 @@ long_description PyMuPDF adds Python bindings and abstractions to MuPDF, a \
</span>
homepage https://pymupdf.readthedocs.io/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d08fe823f29b7cb5860a00d733973ea8fa685e97 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c3fa40951d2f1455c944898df09cbb42a8f0dfb80f8ff7b70ae678426d3c7a0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14640909
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e505b63b8c7a1323a3d6e38f3ffffe5901273645 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b93ac217a9141503129901a4e86a88a54a21bbfc01d720ce36d986710881a960 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 30495875
</span> python.versions 38 39 310 311 312
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +48,11 @@ if {${name} ne ${subport}} {
</span>
patchfiles patch-build.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # link.h: error: redefinition of typedef ‘fz_link’
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # document.h: error: redefinition of typedef ‘pdf_document’
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *gcc-4.0 *gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.env-append \
PYMUPDF_SETUP_MUPDF_BUILD= \
PYMUPDF_SETUP_IMPLEMENTATIONS=a \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-mupdf/files/patch-build.diff b/python/py-mupdf/files/patch-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 739c9b41775..1209a32586e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-mupdf/files/patch-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-mupdf/files/patch-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pipcl.py pipcl.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 26109b0c2520..7aaa111a07af 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pipcl.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pipcl.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1449,12 +1449,13 @@ def build_extension(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pipcl.py 2024-04-18 02:21:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pipcl.py 2024-05-25 07:40:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1533,12 +1533,13 @@
</span> if optimise:
general_flags += ' -O2 -DNDEBUG'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> + loadable_module_flag = '-shared'
if darwin():
- # MacOS's linker does not like `-z origin`.
- rpath_flag = "-Wl,-rpath,@loader_path/"
+ rpath_flag = ''
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Avoid `Undefined symbols for ... "_PyArg_UnpackTuple" ...'.
general_flags += ' -undefined dynamic_lookup'
+ loadable_module_flag = '-bundle'
elif pyodide():
# Setting `-Wl,-rpath,'$ORIGIN',-z,origin` gives:
# emcc: warning: ignoring unsupported linker flag: `-rpath` [-Wlinkflags]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1511,7 +1512,7 @@ def build_extension(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1595,7 +1596,7 @@
</span> command = f'''
{command}
-fPIC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +25,7 @@ index 26109b0c2520..7aaa111a07af 100644
</span> {general_flags.strip()}
{pythonflags.includes}
{includes_text}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1845,6 +1846,7 @@ def macos_patch( library, *sublibraries):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1962,6 +1963,7 @@
</span> List of paths of shared libraries; these have typically been
specified with `-l` when `library` was created.
'''
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,22 +33,12 @@ index 26109b0c2520..7aaa111a07af 100644
</span> log2( f'macos_patch(): library={library} sublibraries={sublibraries}')
if not darwin():
return
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pyproject.toml pyproject.toml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6c14e94fbb57..7cf8fe3db701 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyproject.toml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyproject.toml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [build-system]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--requires = ["libclang", "swig", "setuptools"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+requires = ["setuptools"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See pep-517.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git setup.py setup.py
index 4563dc197d7f..d5f1c4ccb1d7 100755
--- setup.py
+++ setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1105,7 +1105,7 @@ def _extension_flags( mupdf_local, mupdf_build_dir, build_type):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1005,7 +1005,7 @@
</span> libraries = f'{mupdf_local}\\platform\\{infix}\\{wp.cpu.windows_subdir}{build_type_infix}\\{libs}'
compiler_extra = ''
else:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,3 +47,27 @@ index 4563dc197d7f..d5f1c4ccb1d7 100755
</span> defines = None
compiler_extra += (
' -Wall'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1169,23 +1169,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret.append('setuptools')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libclang = os.environ.get('PYMUPDF_SETUP_LIBCLANG')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if libclang:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print(f'Overriding to use {libclang=}.')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret.append(libclang)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif openbsd:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print(f'OpenBSD: libclang not available via pip; assuming `pkg_add py3-llvm`.')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif darwin and platform.machine() == 'arm64':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print(f'MacOS/arm64: forcing use of libclang 16.0.6 because 18.1.1 known to fail with `clang.cindex.TranslationUnitLoadError: Error parsing translation unit.`')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret.append('libclang==16.0.6')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret.append('libclang')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if msys2:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print(f'msys2: pip install of swig does not build; assuming `pacman -S swig`.')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif openbsd:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print(f'OpenBSD: pip install of swig does not build; assuming `pkg_add swig`.')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret.append( 'swig')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ret
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>