[rpms/mupdf] f45: rebase to 1.28.2 (rhbz#2493555)

[rpms/mupdf] f45: rebase to 1.28.2 (rhbz#2493555)

[Michael J Gruber]

            A new commit has been pushed.

            Repo   : rpms/mupdf
            Branch : f45
            Commit : 18f3d212ebb02c8a1a88b967eb1f96a87e7748da
            Author : Michael J Gruber <mjg@fedoraproject.org>
            Date   : 2026-08-15T16:25:21+02:00
            Stats  : +36/-171 in 12 file(s)
            URL    : https://src.fedoraproject.org/rpms/mupdf/c/18f3d212ebb02c8a1a88b967eb1f96a87e7748da?branch=f45

            Log:
            rebase to 1.28.2 (rhbz#2493555)

- Markdown document format support
- HTML and EPUB improvements
- PDF write option "decrypt" is deprecated; use "encrypt=none" instead
- New mutool audit command to analyze PDF structure and generate report
- Various fixes and improvements

---
diff --git a/.gitignore b/.gitignore
index 9f3c9f3..83ef7ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,6 @@
 /mupdf-1.27.0-source.tar.gz
 /mupdf-1.27.1-source.tar.gz
 /mupdf-1.27.2-source.tar.gz
+/mupdf-1.28.0-source.tar.gz
+/mupdf-1.28.1-source.tar.gz
+/mupdf-1.28.2-source.tar.gz

diff --git a/0001-Bug-708990-Avoid-overflow-src_stride-calculation-in-.patch b/0001-Bug-708990-Avoid-overflow-src_stride-calculation-in-.patch
deleted file mode 100644
index 41fbbd7..0000000
--- a/0001-Bug-708990-Avoid-overflow-src_stride-calculation-in-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a26f0142e7d390d4a82c6e5ae0e312e07cc4ec85 Mon Sep 17 00:00:00 2001
-Message-ID: <a26f0142e7d390d4a82c6e5ae0e312e07cc4ec85.1775143641.git.mjg@fedoraproject.org>
-From: Tor Andersson <tor.andersson@artifex.com>
-Date: Mon, 5 Jan 2026 17:54:15 +0100
-Subject: [PATCH] Bug 708990: Avoid overflow src_stride calculation in
- unpack_stream.
-
-By using 64-bit math!
----
- source/fitz/draw-unpack.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/fitz/draw-unpack.c b/source/fitz/draw-unpack.c
-index 048abbf35..8c99337db 100644
---- a/source/fitz/draw-unpack.c
-+++ b/source/fitz/draw-unpack.c
-@@ -437,7 +437,7 @@ unpack_drop(fz_context *ctx, void *state)
- fz_stream *
- fz_unpack_stream(fz_context *ctx, fz_stream *src, int depth, int w, int h, int n, int indexed, int pad, int skip)
- {
--	int src_stride = (w*depth*n+7)>>3;
-+	int src_stride = ((int64_t)w*depth*n+7)>>3; // avoid overflow by bumping to 64-bit math
- 	int dst_stride;
- 	unpack_state *state;
- 	fz_unpack_line_fn unpack_line = NULL;
--- 
-2.53.0.1333.gdad296f530
-

diff --git a/0001-Bug-709364-Fix-missing-bounds-checks-in-CFF-subsetti.patch b/0001-Bug-709364-Fix-missing-bounds-checks-in-CFF-subsetti.patch
deleted file mode 100644
index 8d5063f..0000000
--- a/0001-Bug-709364-Fix-missing-bounds-checks-in-CFF-subsetti.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7da80849dccb7108a0a732d3c0392a2b575aac6d Mon Sep 17 00:00:00 2001
-Message-ID: <7da80849dccb7108a0a732d3c0392a2b575aac6d.1784187361.git.mjg@fedoraproject.org>
-From: Robin Watts <Robin.Watts@artifex.com>
-Date: Wed, 13 May 2026 14:57:47 +0100
-Subject: [PATCH] Bug 709364: Fix missing bounds checks in CFF subsetting
-
-Thanks to Jenny Guanni Qu for the report and original patch.
-
-(cherry picked from commit 611f75f0c8657b92460554009196c5ac4b68d909)
----
- source/fitz/subset-cff.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/source/fitz/subset-cff.c b/source/fitz/subset-cff.c
-index 65cf1564d..38eabcd90 100644
---- a/source/fitz/subset-cff.c
-+++ b/source/fitz/subset-cff.c
-@@ -311,7 +311,7 @@ index_load(fz_context *ctx, index_t *index, const uint8_t *base, uint32_t len, u
- 	data_offset = 3 + (index->count+1) * os - 1;
- 	index->data_offset = data_offset + offset;
- 
--	if (data_offset > len)
-+	if (index->data_offset > len)
- 		fz_throw(ctx, FZ_ERROR_FORMAT, "Truncated index");
- 
- 	data += 3;
-@@ -327,7 +327,7 @@ index_load(fz_context *ctx, index_t *index, const uint8_t *base, uint32_t len, u
- 			fz_throw(ctx, FZ_ERROR_FORMAT, "Index not monotonic");
- 		prev = v;
- 	}
--	if (v > len)
-+	if (index->data_offset + v > len)
- 		fz_throw(ctx, FZ_ERROR_FORMAT, "Truncated index");
- 
- 	data += prev - 1;
--- 
-2.55.0.349.g25e4f52c35
-

diff --git a/0001-Do-not-complain-to-your-friendly-local-distribution-.patch b/0001-Do-not-complain-to-your-friendly-local-distribution-.patch
index 32654ef..4abdce7 100644
--- a/0001-Do-not-complain-to-your-friendly-local-distribution-.patch
+++ b/0001-Do-not-complain-to-your-friendly-local-distribution-.patch
@@ -1,5 +1,5 @@
-From 4232ffdd8bfbc60067f81bf92afba3713209c430 Mon Sep 17 00:00:00 2001
-Message-ID: <4232ffdd8bfbc60067f81bf92afba3713209c430.1761772186.git.mjg@fedoraproject.org>
+From c10824a0520daddf94535bd3848136b240b07c3c Mon Sep 17 00:00:00 2001
+Message-ID: <c10824a0520daddf94535bd3848136b240b07c3c.1784292333.git.mjg@fedoraproject.org>
 From: Michael J Gruber <mjg@fedoraproject.org>
 Date: Thu, 6 Jun 2024 14:27:12 +0200
 Subject: [PATCH] Do not complain to your friendly local distribution manager
@@ -12,10 +12,10 @@ unbundled builds.
  1 file changed, 2 deletions(-)
 
 diff --git a/platform/gl/gl-ui.c b/platform/gl/gl-ui.c
-index d3dfb1de6..c0d9d72d7 100644
+index c0cf69515..c0a71fa58 100644
 --- a/platform/gl/gl-ui.c
 +++ b/platform/gl/gl-ui.c
-@@ -449,8 +449,6 @@ void ui_init(int w, int h, const char *title)
+@@ -452,8 +452,6 @@ void ui_init(int w, int h, const char *title)
  #if defined(FREEGLUT) && (GLUT_API_VERSION >= 6)
  	glutKeyboardExtFunc(on_keyboard);
  #else
@@ -25,5 +25,5 @@ index d3dfb1de6..c0d9d72d7 100644
  #endif
  	glutSpecialFunc(on_special);
 -- 
-2.51.2.1007.g590f8df4db
+2.55.0.417.gd2046ead17
 

diff --git a/0001-do-not-use-CXXFLAGS-with-swig.patch b/0001-do-not-use-CXXFLAGS-with-swig.patch
index b8f8381..5fb42b1 100644
--- a/0001-do-not-use-CXXFLAGS-with-swig.patch
+++ b/0001-do-not-use-CXXFLAGS-with-swig.patch
@@ -1,5 +1,5 @@
-From 7a2d67f523299721eb603da8ab6066fc59bb05f2 Mon Sep 17 00:00:00 2001
-Message-ID: <7a2d67f523299721eb603da8ab6066fc59bb05f2.1761772186.git.mjg@fedoraproject.org>
+From 160b704dde86a34ede17c3f82220334c4bc26419 Mon Sep 17 00:00:00 2001
+Message-ID: <160b704dde86a34ede17c3f82220334c4bc26419.1784292324.git.mjg@fedoraproject.org>
 From: Michael J Gruber <mjg@fedoraproject.org>
 Date: Fri, 31 Jan 2025 21:59:13 +0100
 Subject: [PATCH] do not use CXXFLAGS with swig
@@ -12,10 +12,10 @@ XCXXFLAGS for c++ which swig does understand.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/scripts/wrap/swig.py b/scripts/wrap/swig.py
-index 653d188f2..4dffc2f08 100644
+index 1b3c6f14f..0b0fb9ab8 100644
 --- a/scripts/wrap/swig.py
 +++ b/scripts/wrap/swig.py
-@@ -1801,7 +1801,7 @@ def build_swig(
+@@ -1832,7 +1832,7 @@ def build_swig(
                          -outdir {os.path.relpath(build_dirs.dir_mupdf)}/platform/python
                          -o {cpp}
                          -includeall
@@ -25,5 +25,5 @@ index 653d188f2..4dffc2f08 100644
                          -I{os.path.relpath(include1)}
                          -I{os.path.relpath(include2)}
 -- 
-2.51.2.1007.g590f8df4db
+2.55.0.417.gd2046ead17
 

diff --git a/0001-mupdfwrap_test-adjust-to-mupdf-1.27.x.patch b/0001-mupdfwrap_test-adjust-to-mupdf-1.27.x.patch
index caf93cb..1423d66 100644
--- a/0001-mupdfwrap_test-adjust-to-mupdf-1.27.x.patch
+++ b/0001-mupdfwrap_test-adjust-to-mupdf-1.27.x.patch
@@ -1,5 +1,5 @@
-From a9b308e75b3dbe20dc8fe502b9a212749433ea92 Mon Sep 17 00:00:00 2001
-Message-ID: <a9b308e75b3dbe20dc8fe502b9a212749433ea92.1761772186.git.mjg@fedoraproject.org>
+From 3600658c93486cb854a84f22039969da08bb8f71 Mon Sep 17 00:00:00 2001
+Message-ID: <3600658c93486cb854a84f22039969da08bb8f71.1784292319.git.mjg@fedoraproject.org>
 From: Michael J Gruber <mjg@fedoraproject.org>
 Date: Fri, 23 May 2025 15:57:30 +0200
 Subject: [PATCH] mupdfwrap_test: adjust to mupdf 1.27.x
@@ -41,5 +41,5 @@ index 7e077981d..4e48ca2c8 100755
  
  def test_install_load_system_font(path):
 -- 
-2.51.2.1007.g590f8df4db
+2.55.0.417.gd2046ead17
 

diff --git a/0001-pdf_choice_widget_options2-avoid-core-dump-with-_GLI.patch b/0001-pdf_choice_widget_options2-avoid-core-dump-with-_GLI.patch
deleted file mode 100644
index f3ee298..0000000
--- a/0001-pdf_choice_widget_options2-avoid-core-dump-with-_GLI.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From abee31b9d76be9d7518883358037421cded1d97f Mon Sep 17 00:00:00 2001
-Message-ID: <abee31b9d76be9d7518883358037421cded1d97f.1761772186.git.mjg@fedoraproject.org>
-From: Michael J Gruber <mjg@fedoraproject.org>
-Date: Tue, 4 Feb 2025 10:17:18 +0100
-Subject: [PATCH] pdf_choice_widget_options2: avoid core dump with
- _GLIBCXX_ASSERTIONS
-
-From a C programmer's view, &opts[0] == opts, but for the vector class
-in stdc++ there is a difference in if, where and when the existence of a
-zeroth element is checked. This matters for "empty" vectors only, but
-depending on g++/stdc++ version and flags this may throw an unexpected
-assertion and abort on run time. Noticed with gcc 15 on Fedora rawhide
-(42).
-
-Replace &opts[0] by opts.data() which gives the pointer to the data
-storage of the vector, which is what pdf_choice_widget_options expects.
----
- scripts/wrap/cpp.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/wrap/cpp.py b/scripts/wrap/cpp.py
-index 5ff6f30b4..0d6823282 100644
---- a/scripts/wrap/cpp.py
-+++ b/scripts/wrap/cpp.py
-@@ -1263,7 +1263,7 @@ g_extra_definitions = textwrap.dedent(f'''
-         {{
-             int n = pdf_choice_widget_options(ctx, tw, exportval, nullptr);
-             std::vector<const char*> opts(n);
--            int n2 = pdf_choice_widget_options(ctx, tw, exportval, &opts[0]);
-+            int n2 = pdf_choice_widget_options(ctx, tw, exportval, opts.data());
-             assert(n2 == n);
-             std::vector<std::string> ret(n);
-             for (int i=0; i<n; ++i)
--- 
-2.51.2.1007.g590f8df4db
-

diff --git a/0001-pdf_font-report-font-name-in-warning.patch b/0001-pdf_font-report-font-name-in-warning.patch
deleted file mode 100644
index dc77673..0000000
--- a/0001-pdf_font-report-font-name-in-warning.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 842e6024a916025533ae73d8740f9445d4dc1de6 Mon Sep 17 00:00:00 2001
-Message-ID: <842e6024a916025533ae73d8740f9445d4dc1de6.1762376054.git.mjg@fedoraproject.org>
-From: Michael J Gruber <mjg@fedoraproject.org>
-Date: Tue, 3 Jun 2025 16:41:35 +0200
-Subject: [PATCH] pdf_font: report font name in warning
-
-b835c7213 ("Bug 708512: Add some more sanity checks for font ascent/descent values", 2025-05-02)
-started to warn about bogus font params. Report the affected font to
-help users track down problems.
----
- source/pdf/pdf-font.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/pdf/pdf-font.c b/source/pdf/pdf-font.c
-index 5e3b8765d..533b39d93 100644
---- a/source/pdf/pdf-font.c
-+++ b/source/pdf/pdf-font.c
-@@ -1507,7 +1507,7 @@ pdf_load_font_descriptor(fz_context *ctx, pdf_document *doc, pdf_font_desc *font
- 		fontdesc->descent < FZ_MAX_TRUSTWORTHY_DESCENT * 1000)
- 	{
- 		if (fontdesc->ascent != 0 || fontdesc->descent != 0)
--			fz_warn(ctx, "bogus font ascent/descent values (%g / %g)", fontdesc->ascent, fontdesc->descent);
-+			fz_warn(ctx, "bogus font ascent/descent values (%g / %g) in font %s", fontdesc->ascent, fontdesc->descent, fontdesc->font->name);
- 		fontdesc->font->ascender = 0.8f;
- 		fontdesc->font->descender = -0.2f;
- 		fontdesc->font->ascdesc_src = FZ_ASCDESC_DEFAULT;
--- 
-2.52.0.rc0.476.g3d3e2faed3
-

diff --git a/0001-setup.py-do-not-bundle-c-and-c-libs-in-wheel.patch b/0001-setup.py-do-not-bundle-c-and-c-libs-in-wheel.patch
index 839a861..31e4cc2 100644
--- a/0001-setup.py-do-not-bundle-c-and-c-libs-in-wheel.patch
+++ b/0001-setup.py-do-not-bundle-c-and-c-libs-in-wheel.patch
@@ -1,5 +1,5 @@
-From bf852f7efc7c6461675cf70c8de9f3db28f5a4e1 Mon Sep 17 00:00:00 2001
-Message-ID: <bf852f7efc7c6461675cf70c8de9f3db28f5a4e1.1761772186.git.mjg@fedoraproject.org>
+From a853e7669fb1e5bcac5384bb7eea0f6b191a4bcd Mon Sep 17 00:00:00 2001
+Message-ID: <a853e7669fb1e5bcac5384bb7eea0f6b191a4bcd.1784292327.git.mjg@fedoraproject.org>
 From: Michael J Gruber <mjg@fedoraproject.org>
 Date: Mon, 11 Nov 2024 16:08:56 +0100
 Subject: [PATCH] setup.py: do not bundle c and c++ libs in wheel
@@ -11,10 +11,10 @@ We want to package libs separately, so do not include them in the wheel
  1 file changed, 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 0462eeaa7..768212a22 100755
+index fcde52624..eee460b99 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -356,8 +356,6 @@ def build():
+@@ -355,8 +355,6 @@ def build():
                  ]
      else:
          names = [
@@ -24,5 +24,5 @@ index 0462eeaa7..768212a22 100755
                  f'{build_dir()}/mupdf.py',                          # Python.
                  ]
 -- 
-2.51.2.1007.g590f8df4db
+2.55.0.417.gd2046ead17
 

diff --git a/0001-setup.py-do-not-require-libclang-and-swig.patch b/0001-setup.py-do-not-require-libclang-and-swig.patch
index 1c41522..dd8cb0a 100644
--- a/0001-setup.py-do-not-require-libclang-and-swig.patch
+++ b/0001-setup.py-do-not-require-libclang-and-swig.patch
@@ -1,5 +1,5 @@
-From 89611f9bf7c8d7e3b959cd2fb78571c3e3f1f2aa Mon Sep 17 00:00:00 2001
-Message-ID: <89611f9bf7c8d7e3b959cd2fb78571c3e3f1f2aa.1761772186.git.mjg@fedoraproject.org>
+From b1d13cde7b8c2ef73cf13d063e765d1f266db92e Mon Sep 17 00:00:00 2001
+Message-ID: <b1d13cde7b8c2ef73cf13d063e765d1f266db92e.1784292330.git.mjg@fedoraproject.org>
 From: Michael J Gruber <mjg@fedoraproject.org>
 Date: Thu, 31 Oct 2024 23:53:31 +0100
 Subject: [PATCH] setup.py: do not require libclang and swig
@@ -11,10 +11,10 @@ on Fedora), so do not add them to the requirements by default.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 6b2c8b841..0462eeaa7 100755
+index 49199f559..fcde52624 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -540,7 +540,7 @@ def get_requires_for_build_wheel(config_settings=None):
+@@ -539,7 +539,7 @@ def get_requires_for_build_wheel(config_settings=None):
          #print(f'OpenBSD: libclang not available via pip; assuming `pkg_add py3-llvm`.')
          pass
      else:
@@ -23,7 +23,7 @@ index 6b2c8b841..0462eeaa7 100755
      if msys2():
          #print(f'msys2: pip install of swig does not build; assuming `pacman -S swig`.')
          pass
-@@ -548,7 +548,7 @@ def get_requires_for_build_wheel(config_settings=None):
+@@ -547,7 +547,7 @@ def get_requires_for_build_wheel(config_settings=None):
          #print(f'OpenBSD: pip install of swig does not build; assuming `pkg_add swig`.')
          pass
      else:
@@ -33,5 +33,5 @@ index 6b2c8b841..0462eeaa7 100755
  
  
 -- 
-2.51.2.1007.g590f8df4db
+2.55.0.417.gd2046ead17
 

diff --git a/mupdf.spec b/mupdf.spec
index bfcfb99..0078570 100644
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -4,8 +4,8 @@ Name:		mupdf
 
 %global libname libmupdf
 %global pypiname mupdf
-Version:	1.27.2
-%global somajor 27
+Version:	1.28.2
+%global somajor 28
 %global sominor 2
 %global soname %{somajor}.%{sominor}
 %global pkgconfig %{_libdir}/pkgconfig
@@ -22,11 +22,6 @@ Source0:	http://mupdf.com/downloads/archive/%{name}-%{upversion}-source.tar.gz
 Source1:	%{name}.desktop
 Source2:	%{name}-gl.desktop
 
-# Upstream patches from master branch:
-# rhbz#2454361 and siblings
-Patch:		0001-Bug-708990-Avoid-overflow-src_stride-calculation-in-.patch
-# rhbz#2463402
-Patch:		0001-Bug-709364-Fix-missing-bounds-checks-in-CFF-subsetti.patch
 # Fedora specific patches:
 # Do not bug me if Artifex relies on local fork
 Patch:		0001-Do-not-complain-to-your-friendly-local-distribution-.patch
@@ -35,15 +30,9 @@ Patch:		0001-setup.py-do-not-require-libclang-and-swig.patch
 # Do not install shared libraries in the python tree
 Patch:		0001-setup.py-do-not-bundle-c-and-c-libs-in-wheel.patch
 # Suggested upstream:
-# Avoid core dump of python bindings with gcc15
-# https://github.com/ArtifexSoftware/mupdf/pull/55
-Patch:		0001-pdf_choice_widget_options2-avoid-core-dump-with-_GLI.patch
 # Do not apply CXXFLAGS to swig
 # https://github.com/ArtifexSoftware/mupdf/pull/56
 Patch:		0001-do-not-use-CXXFLAGS-with-swig.patch
-# Be more helpful with the new warning in 1.26.x
-# https://github.com/ArtifexSoftware/mupdf/pull/74
-Patch:		0001-pdf_font-report-font-name-in-warning.patch
 # Replace removed Python 2 C API macros with Python 3 equivalents
 # for compatibility with SWIG 4.5.0
 # https://github.com/ArtifexSoftware/mupdf/pull/102
@@ -76,12 +65,14 @@ Requires:	%{name}-libs%{_isa} = %{version}-%{release}
 # We need to build against the Artifex fork of lcms2 so that we are thread safe
 # (see bug #1553915). Artifex make sure to rebase against upstream, who refuse
 # to integrate Artifex's changes. 
-Provides:	bundled(lcms2-devel) = lcms2.16^65.gf75fad7
+Provides:	bundled(lcms2-devel) = lcms2.19.1^752.gd69c644
 # muPDF needs the muJS sources for the build even if we build against the system
 # version so bundling them is the safer choice.
 Provides:	bundled(mujs-devel) = 1.3.9-9.ge892c9f
 # muPDF builds only against in-tree extract which is versioned along with ghostpdl.
 Provides:	bundled(extract) = 10.05
+# cmark-gfm is not in Fedora.
+Provides:	bundled(cmark-gfm) = 0.29.0.gfm.13^3.g74e0f5b
 
 %description
 MuPDF is a lightweight PDF viewer and toolkit written in portable C.
@@ -137,7 +128,7 @@ The python3-%{pypiname} package contains low level mupdf python bindings.
 
 %prep
 %autosetup -p1 -n %{name}-%{upversion}-source
-for d in $(ls thirdparty | grep -v -e extract -e lcms2 -e mujs)
+for d in $(ls thirdparty | grep -v -e extract -e lcms2 -e mujs -e cmark-gfm)
 do
 	rm -rf thirdparty/$d
 done
@@ -164,6 +155,8 @@ sed -i -e '/DZXING_EXPERIMENTAL_API/ d' Makelists
 # enforce same setting as above for py bindings:
 sed -i -e 's/barcode=yes/barcode=no/' scripts/wrap/__main__.py
 %endif
+# do not use venvs during build
+sed -i -e '/autovenv.enter/ d' scripts/wrap/__main__.py
 
 %generate_buildrequires
 %pyproject_buildrequires -R

diff --git a/sources b/sources
index 6252c85..82ca335 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mupdf-1.27.2-source.tar.gz) = 68c92007aac775d22dca151a7ae2d4e77755dbc0c8a6faeec8048aa3537de4e1b5a98d999e090460298f294d7aed62e3aa144817d78655435d9498b159ccd0dc
+SHA512 (mupdf-1.28.2-source.tar.gz) = aa574414f273f2463c98dc65773d33adc0e3909b0424fb5748f437791f85ef7298452a85db5fde342273a2b0fee738a8a5d6b9e1d93750302b647091b55bbfed