PyMuPDF 1.25.3__tar.gz → 1.25.5__tar.gz

{pymupdf-1.25.3 → pymupdf-1.25.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyMuPDF
-Version: 1.25.3
+Version: 1.25.5
 Summary: A high performance Python library for data extraction, analysis, conversion & manipulation of PDF (and other) documents.
 Description-Content-Type: text/markdown
 Author: Artifex

{pymupdf-1.25.3 → pymupdf-1.25.5}/changes.txt

@@ -2,6 +2,43 @@ Change Log
 ==========
 
 
+**Changes in version 1.25.5 (2025-03-31)**
+
+* Fixed issues:
+
+  * **Fixed** `4372 <https://github.com/pymupdf/PyMuPDF/issues/4372>`_: Text insertion fails due to missing /Resources object
+  * **Fixed** `4400 <https://github.com/pymupdf/PyMuPDF/issues/4400>`_: Infinite loop in fill_textbox
+  * **Fixed** `4403 <https://github.com/pymupdf/PyMuPDF/issues/4403>`_: Unable to get_text() - layer/clip nesting too deep
+  * **Fixed** `4415 <https://github.com/pymupdf/PyMuPDF/issues/4415>`_: PDF page is mirrored, origin is at bottom-left
+
+* Other:
+
+  * Use MuPDF-1.25.6.
+  * Fixed MuPDF SEGV on MacOS with particular fonts.
+  * Fixed `Annot.get_textpage()`'s `clip` arg.
+  * Fixed Python-3.14 (pre-release) build error.
+
+
+**Changes in version 1.25.4 (2025-03-14)**
+
+* Use MuPDF-1.25.5.
+
+* Fixed issues:
+
+  * **Fixed** `4079 <https://github.com/pymupdf/PyMuPDF/issues/4079>`_: Unexpected result for apply_redactions()
+  * **Fixed** `4224 <https://github.com/pymupdf/PyMuPDF/issues/4224>`_: MuPDF error: format error: negative code in 1d faxd
+  * **Fixed** `4303 <https://github.com/pymupdf/PyMuPDF/issues/4303>`_: page.get_image_info() returns outdated cached results after replacing image
+  * **Fixed** `4309 <https://github.com/pymupdf/PyMuPDF/issues/4309>`_: FzErrorFormat Error When Deleting First Page
+  * **Fixed** `4336 <https://github.com/pymupdf/PyMuPDF/issues/4336>`_: Major Performance Regression: pix.color_count is 150x slower in version 1.25.3 compared to 1.23.8
+  * **Fixed** `4341 <https://github.com/pymupdf/PyMuPDF/issues/4341>`_: Invalid label retrieval when /Kids is an array of multiple /Nums
+
+* Other:
+
+  * Fixed handling of duplicate widget names when joining PDFs (PR #4347).
+  * Improved Pyodide build.
+  * Avoid SWIG-related build errors with Python-3.13 by disabling PY_LIMITED_API.
+
+
 **Changes in version 1.25.3 (2025-02-06)**
 
 * Use MuPDF-1.25.4.
@@ -9,7 +46,7 @@ Change Log
 * Fixed issues:
 
   * **Fixed** `4139 <https://github.com/pymupdf/PyMuPDF/issues/4139>`_: Text color numbers change between 1.24.14 and 1.25.0
-  * **Fixed** `4141 <https://github.com/pymupdf/PyMuPDF/issues/4141>`_: Some insertion methods fails for pages without a /Resouces object
+  * **Fixed** `4141 <https://github.com/pymupdf/PyMuPDF/issues/4141>`_: Some insertion methods fails for pages without a /Resources object
   * **Fixed** `4180 <https://github.com/pymupdf/PyMuPDF/issues/4180>`_: Search problems
   * **Fixed** `4182 <https://github.com/pymupdf/PyMuPDF/issues/4182>`_: Text coordinate extraction error
   * **Fixed** `4245 <https://github.com/pymupdf/PyMuPDF/issues/4245>`_: Highlighting issue distorted on recent versions
@@ -20,10 +57,11 @@ Change Log
   * In annotations:
     * Added support for subtype FreeTextCallout.
     * Added support for rich text.
-  * Added miter_limit arg to insert_text*() to allow supression of spikes caused by long miters.
+  * Added miter_limit arg to insert_text*() to allow suppression of spikes caused by long miters.
   * Add Widget Support to `Document.insert_pdf()`.
   * Add `bibi` to span dicts.
   * Add `synthetic' to char dict.
+  * Fixed Pyodide builds.
 
 
 **Changes in version 1.25.2 (2025-01-17)**
@@ -65,9 +103,13 @@ Change Log
 
   * **Fixed** `4026 <https://github.com/pymupdf/PyMuPDF/issues/4026>`_: page.get_text('blocks') output two piece of very similar text with different bbox
   * **Fixed** `4004 <https://github.com/pymupdf/PyMuPDF/issues/4004>`_: Segmentation Fault When Updating PDF Form Field Value
+  * **Fixed** `3887 <https://github.com/pymupdf/PyMuPDF/issues/3887>`_: Subset Fonts problem using Fallback Font
+  * **Fixed** `3886 <https://github.com/pymupdf/PyMuPDF/issues/3886>`_: Another issue with destroying PDF when inserting html
   * **Fixed** `3751 <https://github.com/pymupdf/PyMuPDF/issues/3751>`_: apply_redactions causes part of the page content to be hidden / transparent
 
 
+.. codespell:ignore-begin
+
 **Changes in version 1.24.14 (2024-11-19)**
 
 * Use MuPDF-1.24.11.
@@ -2624,3 +2666,5 @@ Changes in version 1.9.1 compared to version 1.8.0 are the following:
 * Incremental saves for changes are possible now using the call pattern *doc.save(doc.name, incremental=True)*.
 * A PDF's metadata can now be deleted, set or changed by document method *set_metadata()*. Supports incremental saves.
 * A PDF's bookmarks (or table of contents) can now be deleted, set or changed with the entries of a list using document method *set_toc(list)*. Supports incremental saves.
+
+.. codespell:ignore-end

{pymupdf-1.25.3 → pymupdf-1.25.5}/scripts/sysinstall.py

@@ -118,6 +118,8 @@ def main():
         log(f'{sys.executable=}')
         log(f'{platform.python_version()=}')
         log(f'{__file__=}')
+        log(f'{os.environ.get("PYMUDF_SCRIPTS_SYSINSTALL_ARGS_PRE")=}')
+        log(f'{os.environ.get("PYMUDF_SCRIPTS_SYSINSTALL_ARGS_POST")=}')
         log(f'{sys.argv=}')
         log(f'{sysconfig.get_path("platlib")=}')
         run_command(f'python -V', check=0)
@@ -152,7 +154,9 @@ def main():
     
     # Parse command-line.
     #
-    args = iter(sys.argv[1:])
+    env_args_pre = shlex.split(os.environ.get('PYMUDF_SCRIPTS_SYSINSTALL_ARGS_PRE', ''))
+    env_args_post = shlex.split(os.environ.get('PYMUDF_SCRIPTS_SYSINSTALL_ARGS_POST', ''))
+    args = iter(env_args_pre + sys.argv[1:] + env_args_post)
     while 1:
         try:
             arg = next(args)
@@ -240,6 +244,9 @@ def main():
     command += f' HAVE_LEPTONICA=yes'
     command += f' HAVE_TESSERACT=yes'
     command += f' USE_SYSTEM_LIBS=yes'
+    # We need latest zxingcpp so system version not ok.
+    command += f' USE_SYSTEM_ZXINGCPP=no'
+    command += f' barcode=yes'
     command += f' VENV_FLAG={"--venv" if pip == "venv" else ""}'
     if mupdf_so_mode:
         command += f' SO_INSTALL_MODE={mupdf_so_mode}'
@@ -291,7 +298,7 @@ def main():
         run(f'{sudo}rm -r {p}/site-packages/pymupdf.py || true')
         run(f'{sudo}rm -r {p}/site-packages/fitz || true')
         run(f'{sudo}rm -r {p}/site-packages/fitz.py || true')
-        run(f'{sudo}rm -r {p}/site-packages/PyMuPDF-*.dist-info || true')
+        run(f'{sudo}rm -r {p}/site-packages/pymupdf-*.dist-info || true')
         run(f'{sudo}rm -r {root_prefix}/bin/pymupdf || true')
         if pip == 'venv':
             run(f'{sudo}{venv_name}/bin/python -m installer --destdir {root} --prefix {prefix} {wheel}')

{pymupdf-1.25.3 → pymupdf-1.25.5}/scripts/test.py

@@ -94,10 +94,16 @@ Options:
         Whether to rebuild mupdf when we build PyMuPDF. Default is 1.
     --gdb 0|1
         Run tests under gdb. Requires user interaction.
+    --pytest-prefix <command>
+        Use specified prefix when running pytest. E.g. `gdb --args`.
     --pybind 0|1
         Experimental, for investigating
         https://github.com/pymupdf/PyMuPDF/issues/3869. Runs run basic code
         inside C++ pybind. Requires `sudo apt install pybind11-dev` or similar.
+    --pymupdf-pypi <name>
+        Do not build PyMuPDF, instead install with `pip install <name>`. For
+        example allows testing of a specific version with `--pymupdf-pypi
+        pymupdf==x.y.z`.
     --system-site-packages 0|1
         If 1, use `--system-site-packages` when creating venv. Defaults is 0.
     --timeout <seconds>
@@ -123,6 +129,11 @@ Commands:
         `pyodide build`. This runs our setup.py with CC etc set up
         to create Pyodide binaries in a wheel called, for example,
         `PyMuPDF-1.23.2-cp311-none-emscripten_3_1_32_wasm32.whl`.
+        
+        It seems that sys.version must match the Python version inside emsdk;
+        as of 2025-02-14 this is 3.12. Otherwise we get build errors such as:
+            [wasm-validator error in function 723] unexpected false: all used features should be allowed, on ...
+            
 
 Environment:
     PYMUDF_SCRIPTS_TEST_options
@@ -159,6 +170,9 @@ def main(argv):
     if len(argv) == 1:
         show_help()
         return
+    
+    log(f'{sys.executable=}')
+    log(f'{sys.version=}')
 
     build_isolation = None
     valgrind = False
@@ -173,6 +187,7 @@ def main(argv):
     implementations = 'r'
     test_names = list()
     venv = 2
+    pytest_prefix = None
     pybind = False
     pytest_options = None
     timeout = None
@@ -180,6 +195,7 @@ def main(argv):
     system_site_packages = False
     pyodide_build_version = None
     packages = False
+    pymupdf_pypi = None
     
     options = os.environ.get('PYMUDF_SCRIPTS_TEST_options', '')
     options = shlex.split(options)
@@ -209,7 +225,7 @@ def main(argv):
             implementations = next(args)
         elif arg in ('--mupdf', '-m'):
             mupdf = next(args)
-            if not mupdf.startswith('git:') and mupdf != '-':
+            if not mupdf.startswith('git:') and '://' not in mupdf and mupdf != '-':
                 assert os.path.isdir(mupdf), f'Not a directory: {mupdf=}.'
                 mupdf = os.path.abspath(mupdf)
             os.environ['PYMUPDF_SETUP_MUPDF_BUILD'] = mupdf
@@ -223,6 +239,8 @@ def main(argv):
             value = next(args)
             assert value in ('0', '1'), f'`-s` must be followed by `0` or `1`, not {value=}.'
             os.environ['PYMUPDF_SETUP_PY_LIMITED_API'] = value
+        elif arg == '--pytest-prefix':
+            pytest_prefix = next(args)
         elif arg == '--pybind':
             pybind = int(next(args))
         elif arg == '--system-site-packages':
@@ -245,6 +263,8 @@ def main(argv):
             valgrind_args = next(args)
         elif arg == '--pyodide-build-version':
             pyodide_build_version = next(args)
+        elif arg == '--pymupdf-pypi':
+            pymupdf_pypi = next(args)
         else:
             assert 0, f'Unrecognised option: {arg=}.'
     
@@ -276,14 +296,17 @@ def main(argv):
         return
 
     def do_build(wheel=False):
-        build(
-                build_type=build_type,
-                build_isolation=build_isolation,
-                venv_quick=venv_quick,
-                build_mupdf=build_mupdf,
-                build_flavour=build_flavour,
-                wheel=wheel,
-                )
+        if pymupdf_pypi:
+            run(f'pip install --force-reinstall {pymupdf_pypi}')
+        else:
+            build(
+                    build_type=build_type,
+                    build_isolation=build_isolation,
+                    venv_quick=venv_quick,
+                    build_mupdf=build_mupdf,
+                    build_flavour=build_flavour,
+                    wheel=wheel,
+                    )
     def do_test():
         test(
                 implementations=implementations,
@@ -294,6 +317,7 @@ def main(argv):
                 pytest_options=pytest_options,
                 timeout=timeout,
                 gdb=gdb,
+                pytest_prefix=pytest_prefix,
                 test_fitz=test_fitz,
                 pytest_k=pytest_k,
                 pybind=pybind,
@@ -474,7 +498,10 @@ def build_pyodide_wheel(pyodide_build_version=None):
     #
     env_extra['PYMUPDF_SETUP_MUPDF_TESSERACT'] = '0'
     setup = pyodide_setup(pymupdf_dir, pyodide_build_version=pyodide_build_version)
-    command = f'{setup} && pyodide build --exports pyinit'
+    command = f'{setup} && echo "### Running pyodide build" && pyodide build --exports whole_archive'
+    
+    command = command.replace(' && ', '\n && ')
+    
     run(command, env_extra=env_extra)
     
     # Copy wheel into `wheelhouse/` so it is picked up as a workflow
@@ -499,23 +526,35 @@ def pyodide_setup(
         clean:
             If true we create an entirely new environment. Otherwise
             we reuse any existing emsdk repository and venv.
+        pyodide_build_version:
+            Version of Python package pyodide-build; if None we use latest
+            available version.
+            2025-02-13: pyodide_build_version='0.29.3' works.
+    
+    The returned command does the following:
     
-    * Clone emsdk repository to `pipcl_emsdk` if not already present.
-    * Create and activate a venv `pipcl_venv_pyodide` if not already present.
+    * Checkout latest emsdk from https://github.com/emscripten-core/emsdk.git:
+      * Clone emsdk repository to `emsdk` if not already present.
+      * Run `git pull -r` inside emsdk checkout.
+    * Create venv `venv_pyodide_<python_version>` if not already present.
+    * Activate venv `venv_pyodide_<python_version>`.
     * Install/upgrade package `pyodide-build`.
     * Run emsdk install scripts and enter emsdk environment.
-    * Replace emsdk/upstream/bin/wasm-opt
-      (https://github.com/pyodide/pyodide/issues/4048).
     
     Example usage in a build function:
     
-        command = pipcl_wasm.pyodide_setup()
+        command = pyodide_setup()
         command += ' && pyodide build --exports pyinit'
         subprocess.run(command, shell=1, check=1)
     '''
+    
+    pv = platform.python_version_tuple()[:2]
+    assert pv == ('3', '12'), f'Pyodide builds need to be run with Python-3.12 but current Python is {platform.python_version()}.'
     command = f'cd {directory}'
     
-    # Clone emsdk.
+    # Clone/update emsdk. We always use the latest emsdk with `git pull`.
+    #
+    # 2025-02-13: this works: 2514ec738de72cebbba7f4fdba0cf2fabcb779a5
     #
     dir_emsdk = 'emsdk'
     if clean:
@@ -524,106 +563,40 @@ def pyodide_setup(
         # important to remove it here.
         shutil.rmtree('.pyodide-xbuildenv', ignore_errors=1)
     if not os.path.exists(f'{directory}/{dir_emsdk}'):
-        command += f' && echo "### cloning emsdk.git"'
+        command += f' && echo "### Cloning emsdk.git"'
         command += f' && git clone https://github.com/emscripten-core/emsdk.git {dir_emsdk}'
+    command += f' && echo "### Updating checkout {dir_emsdk}"'
+    command += f' && (cd {dir_emsdk} && git pull -r)'
+    command += f' && echo "### Checkout {dir_emsdk} is:"'
+    command += f' && (cd {dir_emsdk} && git show -s --oneline)'
     
     # Create and enter Python venv.
     #
-    # 2024-10-11: we only work with python-3.11; later versions fail with
-    # pyodide-build==0.23.4 because `distutils` not available.
-    if pyodide_build_version:
-        python = sys.executable
-        a, b = sys.version_info[:2]
-        venv_pyodide = f'venv_pyodide_{a}.{b}'
-    else:
-        pyodide_build_version = '0.23.4'
-        venv_pyodide = 'venv_pyodide_3.11'
-        python = sys.executable
-        if sys.version_info[:2] != (3, 11):
-            log(f'Forcing use of python-3.11 because {sys.version=} is not 3.11.')
-            python = 'python3.11'
+    python = sys.executable
+    venv_pyodide = f'venv_pyodide_{sys.version_info[0]}.{sys.version_info[1]}'
+    
     if not os.path.exists( f'{directory}/{venv_pyodide}'):
-        command += f' && echo "### creating venv {venv_pyodide}"'
+        command += f' && echo "### Creating venv {venv_pyodide}"'
         command += f' && {python} -m venv {venv_pyodide}'
     command += f' && . {venv_pyodide}/bin/activate'
-    command += f' && echo "### running pip install ..."'
-    command += f' && python -m pip install --upgrade pip wheel pyodide-build=={pyodide_build_version}'
-    #command += f' && python -m pip install --upgrade pip wheel pyodide-build'
+    command += f' && echo "### Installing Python packages."'
+    command += f' && python -m pip install --upgrade pip wheel pyodide-build'
+    if pyodide_build_version:
+        command += f'=={pyodide_build_version}'
     
     # Run emsdk install scripts and enter emsdk environment.
     #
     command += f' && cd {dir_emsdk}'
     command += ' && PYODIDE_EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version)'
-    command += ' && echo "### running ./emsdk install"'
+    command += ' && echo "### PYODIDE_EMSCRIPTEN_VERSION is: $PYODIDE_EMSCRIPTEN_VERSION"'
+    command += ' && echo "### Running ./emsdk install"'
     command += ' && ./emsdk install ${PYODIDE_EMSCRIPTEN_VERSION}'
-    command += ' && echo "### running ./emsdk activate"'
+    command += ' && echo "### Running ./emsdk activate"'
     command += ' && ./emsdk activate ${PYODIDE_EMSCRIPTEN_VERSION}'
-    command += ' && echo "### running ./emsdk_env.sh"'
+    command += ' && echo "### Running ./emsdk_env.sh"'
     command += ' && . ./emsdk_env.sh'   # Need leading `./` otherwise weird 'Not found' error.
     
-    if pyodide_build_version:
-        command += ' && echo "### Not patching emsdk"'
-    else:
-        # Make our returned command replace emsdk/upstream/bin/wasm-opt
-        # with a script that does nothing, otherwise the linker
-        # command fails after it has created the output file. See:
-        # https://github.com/pyodide/pyodide/issues/4048
-        #
-        
-        def write( text, path):
-            with open( path, 'w') as f:
-                f.write( text)
-            os.chmod( path, 0o755)
-        
-        # Create a script that our command runs, that overwrites
-        # `emsdk/upstream/bin/wasm-opt`, hopefully in a way that is
-        # idempotent.
-        #
-        # The script moves the original wasm-opt to wasm-opt-0.
-        #
-        write(
-                textwrap.dedent('''
-                    #! /usr/bin/env python3
-                    import os
-                    p = 'upstream/bin/wasm-opt'
-                    p0 = 'upstream/bin/wasm-opt-0'
-                    p1 = '../wasm-opt-1'
-                    if os.path.exists( p0):
-                        print(f'### {__file__}: {p0!r} already exists so not overwriting from {p!r}.')
-                    else:
-                        s = os.stat( p)
-                        assert s.st_size > 15000000, f'File smaller ({s.st_size}) than expected: {p!r}'
-                        print(f'### {__file__}: Moving {p!r} -> {p0!r}.')
-                        os.rename( p, p0)
-                    print(f'### {__file__}: Moving {p1!r} -> {p!r}.')
-                    os.rename( p1, p)
-                    '''
-                    ).strip(),
-                f'{directory}/wasm-opt-replace.py',
-                )
-        
-        # Create a wasm-opt script that basically does nothing, except
-        # defers to the original script when run with `--version`.
-        #
-        write(
-                textwrap.dedent('''
-                    #!/usr/bin/env python3
-                    import os
-                    import sys
-                    import subprocess
-                    if sys.argv[1:] == ['--version']:
-                        root = os.path.dirname(__file__)
-                        subprocess.run(f'{root}/wasm-opt-0 --version', shell=1, check=1)
-                    else:
-                        print(f'{__file__}: Doing nothing. {sys.argv=}')
-                    '''
-                    ).strip(),
-                f'{directory}/wasm-opt-1',
-                )
-        command += ' && ../wasm-opt-replace.py'
-    
     command += ' && cd ..'
-    
     return command
 
 
@@ -636,6 +609,7 @@ def test(
         pytest_options=None,
         timeout=None,
         gdb=False,
+        pytest_prefix=None,
         test_fitz=True,
         pytest_k=None,
         pybind=False,
@@ -657,6 +631,8 @@ def test(
             See top-level option `-p`.
         gdb:
             See top-level option `--gdb`.
+        pytest_prefix:
+            See top-level option `--pytest-prefix`.
         test_fitz:
             See top-level option `-f`.
     '''
@@ -765,6 +741,8 @@ def test(
                     )
         elif gdb:
             command = f'{python} {pymupdf_dir_rel}/tests/run_compound.py{run_compound_args} gdb --args {python} -m pytest {pytest_options} {pytest_arg}'
+        elif pytest_prefix:
+            command = f'{python} {pymupdf_dir_rel}/tests/run_compound.py{run_compound_args} {pytest_prefix} {python} -m pytest {pytest_options} {pytest_arg}'
         elif platform.system() == 'Windows':
             # `python -m pytest` doesn't seem to work.
            command = f'{python} {pymupdf_dir_rel}/tests/run_compound.py{run_compound_args} pytest {pytest_options} {pytest_arg}'

{pymupdf-1.25.3 → pymupdf-1.25.5}/setup.py

@@ -152,6 +152,11 @@ Environmental variables:
     
     PYMUPDF_SETUP_PY_LIMITED_API
         If not '0', we build for current Python's stable ABI.
+        
+        However if unset and we are on Python-3.13 or later, we do
+        not build for the stable ABI because as of 2025-03-04 SWIG
+        generates incorrect stable ABI code with Python-3.13 - see:
+        https://github.com/swig/swig/issues/3059
     
     PYMUPDF_SETUP_URL_WHEEL
         If set, we use an existing wheel instead of building a new wheel.
@@ -208,6 +213,11 @@ def log( text):
     sys.stdout.flush()
 
 
+def run(command, check=1):
+    log(f'Running: {command}')
+    return subprocess.run( command, shell=1, check=check)
+
+
 if 1:
     # For debugging.
     log(f'### Starting.')
@@ -218,6 +228,7 @@ if 1:
     log(f'CPU bits: {32 if sys.maxsize == 2**31 - 1 else 64} {sys.maxsize=}')
     log(f'__file__: {__file__!r}')
     log(f'os.getcwd(): {os.getcwd()!r}')
+    log(f'getconf ARG_MAX: {pipcl.run("getconf ARG_MAX", capture=1, check=0, verbose=0)!r}')
     log(f'sys.argv ({len(sys.argv)}):')
     for i, arg in enumerate(sys.argv):
         log(f'    {i}: {arg!r}')
@@ -236,10 +247,16 @@ g_root = os.path.abspath( f'{__file__}/..')
 # Name of file that identifies that we are in a PyMuPDF sdist.
 g_pymupdfb_sdist_marker = 'pymupdfb_sdist'
 
+python_version_tuple = tuple(int(x) for x in platform.python_version_tuple()[:2])
+
 PYMUPDF_SETUP_PY_LIMITED_API = os.environ.get('PYMUPDF_SETUP_PY_LIMITED_API')
 assert PYMUPDF_SETUP_PY_LIMITED_API in (None, '', '0', '1'), \
         f'Should be "", "0", "1" or undefined: {PYMUPDF_SETUP_PY_LIMITED_API=}.'
-g_py_limited_api = (PYMUPDF_SETUP_PY_LIMITED_API != '0')
+if PYMUPDF_SETUP_PY_LIMITED_API is None and python_version_tuple >= (3, 13):
+    log(f'Not defaulting to Python limited api because {platform.python_version_tuple()=}.')
+    g_py_limited_api = False
+else:
+    g_py_limited_api = (PYMUPDF_SETUP_PY_LIMITED_API != '0')
 
 PYMUPDF_SETUP_URL_WHEEL =  os.environ.get('PYMUPDF_SETUP_URL_WHEEL')
 log(f'{PYMUPDF_SETUP_URL_WHEEL=}')
@@ -271,11 +288,6 @@ def _fs_remove(path):
     assert not os.path.exists( path)
 
 
-def run(command, check=1):
-    log(f'Running: {command}')
-    return subprocess.run( command, shell=1, check=check)
-
-
 def _git_get_branch( directory):
     command = f'cd {directory} && git branch --show-current'
     log( f'Running: {command}')
@@ -364,7 +376,7 @@ def tar_extract(path, mode='r:gz', prefix=None, exists='raise'):
     return prefix_actual
 
 
-def get_git_id( directory):
+def git_info( directory):
     '''
     Returns `(sha, comment, diff, branch)`, all items are str or None if not
     available.
@@ -390,10 +402,42 @@ def get_git_id( directory):
             )
     if cp.returncode == 0:
         branch = cp.stdout.strip()
-    log(f'get_git_id(): directory={directory!r} returning branch={branch!r} sha={sha!r} comment={comment!r}')
+    log(f'git_info(): directory={directory!r} returning branch={branch!r} sha={sha!r} comment={comment!r}')
     return sha, comment, diff, branch
 
 
+def git_patch(directory, patch, hard=False):
+    '''
+    Applies string <patch> with `git patch` in <directory>.
+    
+    If <hard> is true we clean the tree with `git checkout .` and then apply
+    the patch.
+
+    Otherwise we apply patch only if it is not already applied; this might fail
+    if there are conflicting changes in the tree.
+    '''
+    log(f'Applying patch in {directory}:\n{textwrap.indent(patch, "    ")}')
+    if not patch:
+        return
+    # Carriage returns break `git apply` so we use `newline='\n'` in open().
+    path = os.path.abspath(f'{directory}/pymupdf_patch.txt')
+    with open(path, 'w', newline='\n') as f:
+        f.write(patch)
+    log(f'Using patch file: {path}')
+    if hard:
+        run(f'cd {directory} && git checkout .')
+        run(f'cd {directory} && git apply {path}')
+        log(f'Have applied patch in {directory}.')
+    else:
+        e = run( f'cd {directory} && git apply --check --reverse {path}', check=0)
+        if e == 0:
+            log(f'Not patching {directory} because already patched.')
+        else:
+            run(f'cd {directory} && git apply {path}')
+            log(f'Have applied patch in {directory}.')
+    run(f'cd {directory} && git diff')
+
+
 mupdf_tgz = os.path.abspath( f'{__file__}/../mupdf.tgz')
 
 def get_mupdf_internal(out, location=None, sha=None, local_tgz=None):
@@ -444,7 +488,8 @@ def get_mupdf_internal(out, location=None, sha=None, local_tgz=None):
         if e:
             # No existing git checkout, so do a fresh clone.
             _fs_remove(local_dir)
-            run(f'git clone --recursive --depth 1 --shallow-submodules {location[4:]} {local_dir}')
+            gitargs = location[4:]
+            run(f'git clone --recursive --depth 1 --shallow-submodules {gitargs} {local_dir}')
 
         # Show sha of checkout.
         run( f'cd {local_dir} && git show --pretty=oneline|head -n 1', check=False)
@@ -624,6 +669,7 @@ def build():
     add('p', f'{g_root}/src/pymupdf.py', to_dir)
     add('p', f'{g_root}/src/table.py', to_dir)
     add('p', f'{g_root}/src/utils.py', to_dir)
+    add('p', f'{g_root}/src/_wxcolors.py', to_dir)
     add('p', f'{g_root}/src/_apply_pages.py', to_dir)
     add('p', f'{g_root}/src/build/extra.py', to_dir)
     if path_so_leaf:
@@ -856,6 +902,34 @@ def build_mupdf_unix(
 
     if openbsd or freebsd:
         env_add(env, 'CXX', 'c++', ' ')
+    
+    if darwin and os.environ.get('GITHUB_ACTIONS') == 'true':
+        if os.environ.get('ImageOS') == 'macos13':
+            # On Github macos13 we need to use Clang/LLVM (Homebrew) 15.0.7,
+            # otherwise mupdf:thirdparty/tesseract/src/api/baseapi.cpp fails to
+            # compile with:
+            #
+            #   thirdparty/tesseract/src/api/baseapi.cpp:150:25: error: 'recursive_directory_iterator' is unavailable: introduced in macOS 10.15
+            #
+            # See:
+            #   https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
+            #
+            log(f'Using llvm@15 clang and clang++')
+            cl15 = pipcl.run(f'brew --prefix llvm@15', capture=1)
+            log(f'{cl15=}')
+            cl15 = cl15.strip()
+            pipcl.run(f'ls -lL {cl15}')
+            pipcl.run(f'ls -lL {cl15}/bin')
+            cc = f'{cl15}/bin/clang'
+            cxx = f'{cl15}/bin/clang++'
+            env['CC'] = cc
+            env['CXX'] = cxx
+    
+    # Show compiler versions.
+    cc = env.get('CC', 'cc')
+    cxx = env.get('CXX', 'c++')
+    pipcl.run(f'{cc} --version')
+    pipcl.run(f'{cxx} --version')
 
     # Add extra flags for MacOS cross-compilation, where ARCHFLAGS can be
     # '-arch arm64'.
@@ -865,6 +939,8 @@ def build_mupdf_unix(
         env_add(env, 'XCFLAGS', archflags)
         env_add(env, 'XLIBS', archflags)
 
+    mupdf_version_tuple = get_mupdf_version(mupdf_local)
+    
     # We specify a build directory path containing 'pymupdf' so that we
     # coexist with non-PyMuPDF builds (because PyMuPDF builds have a
     # different config.h).
@@ -877,7 +953,16 @@ def build_mupdf_unix(
     # $_PYTHON_HOST_PLATFORM allows cross-compiled cibuildwheel builds
     # to coexist, e.g. on github.
     #
+    # Have experimented with looking at getconf_ARG_MAX to decide whether to
+    # omit `PyMuPDF-` from the build directory, to avoid command-too-long
+    # errors with mupdf-1.26. But it seems that `getconf ARG_MAX` returns
+    # a system limit, not the actual limit of the current shell, and there
+    # doesn't seem to be a way to find the current shell's limit.
+    #
     build_prefix = f'PyMuPDF-'
+    if mupdf_version_tuple >= (1, 26):
+        # Avoid link command length problems seen on musllinux.
+        build_prefix = ''
     if pyodide:
         build_prefix += 'pyodide-'
     else:
@@ -894,7 +979,6 @@ def build_mupdf_unix(
         log(f'PYMUPDF_SETUP_MUPDF_TESSERACT=0 so building mupdf without tesseract.')
     else:
         build_prefix += 'tesseract-'
-    mupdf_version_tuple = get_mupdf_version(mupdf_local)
     if (
             linux
             and os.environ.get('PYMUPDF_SETUP_MUPDF_BSYMBOLIC', '1') == '1'
@@ -1158,15 +1242,15 @@ classifier = [
 #
 
 # PyMuPDF version.
-version_p = '1.25.3'
+version_p = '1.25.5'
 
 # PyMuPDFb version. This is the PyMuPDF version whose PyMuPDFb wheels we will
 # (re)use if generating separate PyMuPDFb wheels. Though as of PyMuPDF-1.24.11
-# (2024-10-03) we no longer use PyMuPDFb wheels.
+# (2024-10-03) we no longer use PyMuPDFb wheels so this is actually unused.
 #
 version_b = '1.25.3'
 
-version_mupdf = '1.25.4'
+version_mupdf = '1.25.6'
 
 if os.path.exists(f'{g_root}/{g_pymupdfb_sdist_marker}'):