commit 9c7a5df

mupdf: make patches be more descriptive.

1@@ -1,5 +1,5 @@
2 6f7ba80dc9452c9749fdbaec59a77311ce50efcd91723520fdbbb0932b54d65c53
3-3e7d1f9c1dceeb756324aa97b30d95093e559baefbd983a9e30bbe0d98e1be80ed
4-e4bfb981cc739669a53877449abdf6fa7fa2ae6769b0f1588f46ae3882edd4e067
5-43826dec496c9e32a50a9fab32c3be127317196517c0b489805e4d3f458f87c843
6+6937bc652fe47825ab6dbc7cc7a7028bfd787d6c1d7c869bb68afb9810a0bf5953
7+f91bbd65a6e6fc29f511d232bb7d771d81f2c1df142530f2691357231b75f669d0
8+d7e4b5c978fe0c5527f0eb935d4aad192521cf251ac34e8f589ae05703378969e7
9 ef5d7912fc071b26aadbfb32c65ab08e7e2f2083c0fd2ab376a98761d12d0f3f86

 1@@ -1,8 +1,19 @@
 2+From e1b833b68258f2dee06cc8a8708160e975d3cfab Mon Sep 17 00:00:00 2001
 3+From: hovercats <hovercatswithlasereyes@protonmail.com>
 4+Date: Thu, 2 May 2024 04:19:24 +0200
 5+Subject: [PATCH 1/4] remove gumbo-parser dependency
 6+
 7+---
 8+ Makefile          |  1 -
 9+ Makelists         | 18 ------------------
10+ source/fitz/xml.c |  4 ++++
11+ 3 files changed, 4 insertions(+), 19 deletions(-)
12+
13 diff --git a/Makefile b/Makefile
14-index 0f28384..11c3e04 100644
15+index 53cf06f..dea68b3 100644
16 --- a/Makefile
17 +++ b/Makefile
18-@@ -155,7 +155,6 @@ MUPDF_SRC += $(sort $(wildcard source/fitz/*.cpp))
19+@@ -178,7 +178,6 @@ MUPDF_SRC += $(sort $(wildcard source/fitz/*.cpp))
20  MUPDF_SRC += $(sort $(wildcard source/pdf/*.c))
21  MUPDF_SRC += $(sort $(wildcard source/xps/*.c))
22  MUPDF_SRC += $(sort $(wildcard source/svg/*.c))
23@@ -11,10 +22,10 @@ index 0f28384..11c3e04 100644
24  MUPDF_SRC += $(sort $(wildcard source/cbz/*.c))
25  
26 diff --git a/Makelists b/Makelists
27-index e37b3ed..dbcf577 100644
28+index 4747a12..2350297 100644
29 --- a/Makelists
30 +++ b/Makelists
31-@@ -31,24 +31,6 @@ FREETYPE_SRC += thirdparty/freetype/src/smooth/smooth.c
32+@@ -32,24 +32,6 @@ FREETYPE_SRC += thirdparty/freetype/src/smooth/smooth.c
33  FREETYPE_SRC += thirdparty/freetype/src/truetype/truetype.c
34  FREETYPE_SRC += thirdparty/freetype/src/type1/type1.c
35  
36@@ -69,3 +80,6 @@ index ef9a233..0278228 100644
37  
38  fz_xml *fz_xml_find_dfs(fz_xml *item, const char *tag, const char *att, const char *match)
39  {
40+-- 
41+2.44.0
42+

 1@@ -1,8 +1,18 @@
 2+From 8069fdfd9fdc9c420040bee545f0ae9b540b789f Mon Sep 17 00:00:00 2001
 3+From: hovercats <hovercatswithlasereyes@protonmail.com>
 4+Date: Thu, 2 May 2024 04:20:00 +0200
 5+Subject: [PATCH 2/4] remove openjpeg dependency
 6+
 7+---
 8+ Makelists                | 31 -------------------------------
 9+ source/fitz/encode-jpx.c |  4 ++--
10+ 2 files changed, 2 insertions(+), 33 deletions(-)
11+
12 diff --git a/Makelists b/Makelists
13-index ac54f6f..af430d6 100644
14+index 2350297..a1ece3f 100644
15 --- a/Makelists
16 +++ b/Makelists
17-@@ -272,37 +272,6 @@ JBIG2DEC_SRC += thirdparty/jbig2dec/jbig2_segment.c
18+@@ -269,37 +269,6 @@ JBIG2DEC_SRC += thirdparty/jbig2dec/jbig2_segment.c
19  JBIG2DEC_SRC += thirdparty/jbig2dec/jbig2_symbol_dict.c
20  JBIG2DEC_SRC += thirdparty/jbig2dec/jbig2_text.c
21  
22@@ -57,3 +67,6 @@ index 40cca5a..e38604f 100644
23  static opj_image_t *
24  image_from_pixmap(fz_context *ctx, fz_pixmap *pix)
25  {
26+-- 
27+2.44.0
28+

 1@@ -1,5 +1,14 @@
 2+From 557e949d4a386ac22f0dfdbc8c18bca4135ed508 Mon Sep 17 00:00:00 2001
 3+From: hovercats <hovercatswithlasereyes@protonmail.com>
 4+Date: Thu, 2 May 2024 04:21:00 +0200
 5+Subject: [PATCH 3/4] change OBJCOPY_CMD to work on non-GNU linkers
 6+
 7+---
 8+ Makefile | 2 +-
 9+ 1 file changed, 1 insertion(+), 1 deletion(-)
10+
11 diff --git a/Makefile b/Makefile
12-index 53cf06f..948a0be 100644
13+index dea68b3..726d470 100644
14 --- a/Makefile
15 +++ b/Makefile
16 @@ -76,7 +76,7 @@ endif
17@@ -11,3 +20,6 @@ index 53cf06f..948a0be 100644
18  GENDEF_CMD = $(QUIET_GENDEF) gendef - $< > $@
19  DLLTOOL_CMD = $(QUIET_DLLTOOL) dlltool -d $< -D $(notdir $(^:%.def=%.dll)) -l $@
20  
21+-- 
22+2.44.0
23+

 1@@ -1,5 +1,5 @@
 2 https://mupdf.com/downloads/archive/mupdf-1.24.0-source.tar.gz
 3-patches/no-gumbo.patch
 4-patches/no-openjpeg.patch
 5-patches/objcopy.patch
 6-patches/pkcs7-fix.patch
 7+patches/0001-remove-gumbo-parser-dependency.patch
 8+patches/0002-remove-openjpeg-dependency.patch
 9+patches/0003-change-OBJCOPY_CMD-to-work-on-non-GNU-linkers.patch
10+patches/0004-Fixed-handling-of-safebags-in-pkcs7-helper-library.patch