From 2eb9c59f59c9ca5fa148f016d562c5a42255fede Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 13 Dec 2025 10:33:55 +0200 Subject: [PATCH] Update package version to 1.27.0 --- pkg.info | 4 +-- source-files/mupdf-clang21.patch | 44 -------------------------------- source.sh | 2 -- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 source-files/mupdf-clang21.patch diff --git a/pkg.info b/pkg.info index 6fc1c33..9cae1f0 100644 --- a/pkg.info +++ b/pkg.info @@ -1,6 +1,6 @@ name: mupdf description: Lightweight PDF and XPS viewer -version: 1.26.12 +version: 1.27.0 revision: 1 url: https://mupdf.com/ license: AGPL3-or-later @@ -27,7 +27,7 @@ downloads: - url: https://www.mupdf.com/downloads/archive/mupdf-${BPM_PKG_VERSION}-source.tar.gz extract_to: ${BPM_SOURCE} extract_strip_components: 1 - checksum: 6baf910928f404167ba49be6340195dec340795724722b331f5a2143f5aa0d01 + checksum: ae2442416de499182d37a526c6fa2bacc7a3bed5a888d113ca04844484dfe7c6 split_packages: - name: mupdf depends: diff --git a/source-files/mupdf-clang21.patch b/source-files/mupdf-clang21.patch deleted file mode 100644 index deafe08..0000000 --- a/source-files/mupdf-clang21.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/scripts/wrap/parse.py b/scripts/wrap/parse.py -index 1954101af..7079c8170 100644 ---- a/scripts/wrap/parse.py -+++ b/scripts/wrap/parse.py -@@ -2,6 +2,7 @@ - Support for accessing parse tree for MuPDF headers. - ''' - -+import collections - import os - import sys - import time -@@ -9,7 +10,7 @@ import time - import jlib - - try: -- import clang -+ import clang.cindex - except ImportError as e: - jlib.log( 'Warning, could not import clang: {e}') - clang = None -@@ -487,6 +488,10 @@ class Arg: - - get_args_cache = dict() - -+# get_args() needs to know how to get something hashable from a clang.cindex.Cursor. -+if clang: -+ g_cursor_is_hashable = issubclass(clang.cindex.Cursor, collections.abc.Hashable) -+ - def get_args( tu, cursor, include_fz_context=False, skip_first_alt=False, verbose=False): - ''' - Yields Arg instance for each arg of the function at . -@@ -509,7 +514,10 @@ def get_args( tu, cursor, include_fz_context=False, skip_first_alt=False, verbos - # - if verbose: - jlib.log( '## Looking at args of {cursor.spelling=}') -- key = tu, cursor.location.file, cursor.location.line, include_fz_context, skip_first_alt -+ if g_cursor_is_hashable: -+ key = tu, cursor, include_fz_context, skip_first_alt -+ else: -+ key = tu, cursor.location.file, cursor.location.line, include_fz_context, skip_first_alt - ret = get_args_cache.get( key) - if not verbose and state.state_.show_details(cursor.spelling): - verbose = True diff --git a/source.sh b/source.sh index 025e24f..43fe071 100644 --- a/source.sh +++ b/source.sh @@ -8,8 +8,6 @@ prepare() { cd "$BPM_SOURCE" # Apply patch for additional install targets patch -Np1 -i "$BPM_WORKDIR"/mupdf-install-targets.patch - # Apply patch for clang 21 - patch -Np1 -i "$BPM_WORKDIR"/mupdf-clang21.patch # Setup make configuration cat > user.make <<-EOF