Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
Rebuild (tesseract)
2023-01-19 21:00:38 +00:00 · 2022-12-23 21:59:57 +01:00 · 2022-12-21 15:42:11 +01:00 · 2022-12-20 15:14:34 +01:00 · 2022-12-17 11:42:04 +01:00 · 2022-12-13 11:36:39 +01:00
7 changed files with 349 additions and 365 deletions
--- a/.gitignore
+++ b/.gitignore
@ -23,3 +23,11 @@
 /mupdf-1.17.0-source.tar.gz
 /mupdf-1.18.0-rc1-source.tar.gz
 /mupdf-1.18.0-source.tar.gz
+/mupdf-1.19.0-source.tar.gz
+/mupdf-1.20.0-rc1-source.tar.gz
+/mupdf-1.20.0-rc2-source.tar.gz
+/mupdf-1.20.0-source.tar.gz
+/mupdf-1.20.3-source.tar.gz
+/mupdf-1.21.0-rc1-source.tar.gz
+/mupdf-1.21.0-source.tar.gz
+/mupdf-1.21.1-source.tar.gz
--- a/0001-Bug-703366-Fix-double-free-of-object-during-lineariz.patch
+++ b/0001-Bug-703366-Fix-double-free-of-object-during-lineariz.patch
@ -1,49 +0,0 @@
-From cee7cefc610d42fd383b3c80c12cbc675443176a Mon Sep 17 00:00:00 2001
-Message-Id: <cee7cefc610d42fd383b3c80c12cbc675443176a.1614110865.git.mjg@fedoraproject.org>
-From: Robin Watts <Robin.Watts@artifex.com>
-Date: Fri, 22 Jan 2021 17:05:15 +0000
-Subject: [PATCH] Bug 703366: Fix double free of object during linearization.
-
-This appears to happen because we parse an illegal object from
-a broken file and assign it to object 0, which is defined to
-be free.
-
-Here, we fix the parsing code so this can't happen.
---
- source/pdf/pdf-parse.c | 6 ++++++
- source/pdf/pdf-xref.c  | 2 ++
- 2 files changed, 8 insertions(+)
-
-diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
-index 7abc8c3d4..5761c3351 100644
--- a/source/pdf/pdf-parse.c
-+++ b/source/pdf/pdf-parse.c
-@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
- 		fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d ? obj)", num);
- 	}
- 	gen = buf->i;
-+	if (gen < 0 || gen >= 65536)
-+	{
-+		if (try_repair)
-+			*try_repair = 1;
-+		fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number (%d)", gen);
-+	}
- 
- 	tok = pdf_lex(ctx, file, buf);
- 	if (tok != PDF_TOK_OBJ)
-diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
-index 1b2bdcd59..30197b4b8 100644
--- a/source/pdf/pdf-xref.c
-+++ b/source/pdf/pdf-xref.c
-@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf)
- 	{
- 		ofs = fz_tell(ctx, doc->file);
- 		trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, &num, &gen, &stm_ofs, NULL);
-+		if (num == 0)
-+			fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number cannot be 0\n");
- 	}
- 	fz_catch(ctx)
- 	{
-- 
-2.30.1.724.gc30ef96fb6
-
--- a/0001-support-PyMuPDF.patch
+++ b/0001-support-PyMuPDF.patch
@ -1,42 +0,0 @@
-From c8e13f6b200ca086085f8318409bd324ef498852 Mon Sep 17 00:00:00 2001
-Message-Id: <c8e13f6b200ca086085f8318409bd324ef498852.1602190618.git.mjg@fedoraproject.org>
-From: Michael J Gruber <mjg@fedoraproject.org>
-Date: Thu, 8 Oct 2020 22:55:36 +0200
-Subject: [PATCH] support PyMuPDF
-
-PyMuPDF patches mupdf sources to build. Support this by including the
-desired function.
-
-Originally-by: Jorj X. McKie <jorj.x.mckie@outlook.de>
---
- source/pdf/pdf-font-add.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/source/pdf/pdf-font-add.c b/source/pdf/pdf-font-add.c
-index f68b74c02..2ff11efe1 100644
--- a/source/pdf/pdf-font-add.c
-+++ b/source/pdf/pdf-font-add.c
-@@ -778,3 +778,20 @@ pdf_add_cjk_font(fz_context *ctx, pdf_document *doc, fz_font *fzfont, int script
- 
- 	return fref;
- }
-+void jm_valid_chars(fz_context *ctx, fz_font *font, void *arr)
-+{
-+	FT_Face face = font->ft_face;
-+	FT_ULong ucs;
-+	FT_UInt gid;
-+	long *table = (long *)arr;
-+	fz_lock(ctx, FZ_LOCK_FREETYPE);
-+	ucs = FT_Get_First_Char(face, &gid);
-+	while (gid > 0)
-+	{
-+		if (gid < (FT_ULong)face->num_glyphs && face->num_glyphs > 0)
-+			table[gid] = (long)ucs;
-+		ucs = FT_Get_Next_Char(face, ucs, &gid);
-+	}
-+	fz_unlock(ctx, FZ_LOCK_FREETYPE);
-+	return;
-+}
-- 
-2.28.0.945.gedc4c61efd
-
--- a/269
+++ b/269
@ -0,0 +1,269 @@
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.18.0-9
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jul 14 2021 Scott Talbert <swt@techie.net> - 1.18.0-7
+- Enable DroidSansFallback font
+
+* Wed Feb 24 2021 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-6
+- remove obsolete PyMuPDF support
+
+* Tue Feb 23 2021 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-5
+- CVE-2021-3407 (bz #1931964, bz#1931965)
+
+* Tue Jan 26 2021 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-4
+- (original date: Thu Oct 29 2020)
+- remove obsolete patch
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Oct 08 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-2
+- support PyMuPDF
+
+* Thu Oct 08 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-1
+- bugfix and feature release
+- bz #1886338 #1886339 #1886083
+
+* Sun Oct 04 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-0.1.rc1
+- properly name the rc prerelease
+- update versions of bundled libs
+
+* Sat Oct 03 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-rc1
+- mupdf 1.18.0-rc1 test
+
+* Fri Sep 18 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-4
+- rebuild with jbig2dec 0.19
+
+* Mon Jul 27 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-3
+- depend on exact jbig2dec version (bz 1861103)
+
+* Sun May 31 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-2
+- fix signature check crash
+
+* Mon May 11 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-1
+- rebase to 1.17.0 (bz #1831652)
+
+* Wed Feb 05 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.16.1-3
+- fix build with gcc 10
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Aug 16 2019 Michael J Gruber <mjg@fedoraproject.org> - 1.16.1-1
+- rebase to 1.16.1
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue May 07 2019 Michael J Gruber <mjg@fedoraproject.org> - 1.15.0-1
+- rebase to 1.15.0
+
+* Mon Apr 29 2019 Michael J Gruber <mjg@fedoraproject.org> - 1.15rc1-1
+- rc1 test
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-7
+- work around missing mesa EGl dependency
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-6
+- signature handling fix needs more patches than claimed
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-5
+- fix signature handling
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-4
+- bz #1644444 #1644445
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-3
+- bz #1626481 #1626484
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-2
+- bz #1626483 #1626484
+
+* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-1
+- rebase to 1.14.0
+
+* Mon Oct 01 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14rc1-3
+- mupdf-gl desktop entry
+
+* Mon Oct 01 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14rc1-2
+- enable libcrypto
+
+* Wed Sep 26 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14rc1-1
+- rc test
+- adjust to new build system setup
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Jun 10 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-8
+- CVE-2018-10289 (rh bz #1573050) (gs bz #699271)
+
+* Wed Jun 06 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-7
+- fix license field (bug #1586328)
+
+* Sun Jun 03 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-6
+- fix lcms2art build on big endian
+
+* Fri May 18 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-5
+- fix BR (pulled in by freeglut-devel before)
+
+* Mon Apr 23 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-4
+- bundle unicode safe freeglut
+
+* Mon Apr 23 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-3
+- include (now non-empty) libmupdfthird.a again (fixes bug #1553915 for zathura-pdf-mupdf)
+
+* Fri Apr 20 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-2
+- bundle thread-safe lcms2 (fixes bug #1553915)
+
+* Fri Apr 20 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-1
+- rebase to 1.13.0 (rh bz #1569993)
+
+* Fri Apr 13 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-6
+- install svg icon
+
+* Fri Apr 13 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-6
+- install svg icon
+
+* Wed Feb 14 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-5
+- CVE-2018-6192 (rh bz #1539845 #1539846) (gs bz #698916)
+- CVE-2018-6544 (rh bz #1542264 #1542265) (gs bz #698830 #698965)
+- CVE-2018-1000051 (rh bz #1544847 #1544848) (gs bz #698825 #698873)
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Feb 06 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-4
+- CVE-2018-6187 (rh bz #1538432 #1538433) (gs bz #698908)
+
+* Wed Jan 24 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-2
+- CVE-2017-17858 (rh bz #1537952) (gs bz #698819)
+- CVE-2018-5686 (gs bz #698860)
+
+* Thu Dec 14 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-1
+- rebase to 1.12
+- follow switch from GLFW to GLUT
+- follow switch to new version scheme
+
+* Sun Nov 26 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.12rc1-1
+- rc test
+
+* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-9
+- CVE-2017-15369
+- CVE-2017-15587
+
+* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-8
+- repair FTBFS from version specific patch in 412e729 ("New release 1.11", 2017-04-11)
+
+* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-7
+- rebuild with jbig2dec 0.14 (#1456731)
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue May 09 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.11-4
+- Rebuild with new jbig2dec (#1443933)
+
+* Fri Apr 14 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.11-3
+- Fix mupdf-gl build (#1442384)
+
+* Tue Apr 11 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.11-1
+- New release 1.11 (#1441186)
+
+* Thu Apr  6 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.10a-5
+- Fix stack consumption CVE (#1439643)
+
+* Thu Mar  2 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.10a-4
+- fix buffer overflow (#1425338)
+
+* Thu Mar 02 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.10a-3
+- Several packaging fixes
+
+* Thu Feb 23 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.10a-2
+- Add comment with explanation of disabled debuginfo
+- Fix make verbose output
+
+* Sat Feb 11 2017 Pavel Zhukov <pzhukov@redhat.com> - 1.10a-1
+- New release (1.10a)
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Nov 28 2015 Pavel Zhukov <landgraf@fedoraproject.org> -1.8-1
+- New release (#1280518)
+
+* Sat Nov 28 2015 Pavel Zhukov <landgraf@fedoraproject.org> -1.7a-4
+- Disable memento
+
+* Wed Nov 18 2015 Petr Šabata <contyk@redhat.com> - 1.7a-3
+- Package the license text with the %%license macro
+- Don't use the %%version macro in filenames, it's not helpful
+- Added extra handling for the docs; %%_docdir is no longer autopackaged,
+  plus we want to install the license text elsewhere
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Jun 01 2015  Pavel Zhukov <landgraf@fedoraproject.org> - 1.7a-1
+- New release 1.7a (#1219482)
+* Wed May 06 2015  Pavel Zhukov <landgraf@fedoraproject.org> - 1.7-1
+- New release 1.7 (#1210318)
+- Fix segfault in obj_close routine (#1202137, #1215752)
+
+* Wed May 06 2015 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-6
+- Fix executable name in desktop file
+
+* Sat Oct 11 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-5
+- Add missed curl-devel
+
+* Fri Jul 04 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-3
+- Add fPIC flag (#1109589)
+- Add curl-devel to BR (#1114566)
+
+* Sun Jun 15 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-2
+- Add fix for new openjpeg2
+
+* Sun Jun 15 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-1
+- New release 1.5 (#1108710)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue May  6 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.4-1
+- New release 1.4 (#1087287)
+
+* Fri Jan 24 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.1-5
+- Fix stack overflow (#1056699)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.1-2
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Wed Jan 09 2013 Pavel Zhukov <landgraf@fedoraproject.org> - 1.1-1
+- New release
+
+* Sun May 20 2012  Pavel Zhukov <landgraf@fedoraproject.org> - 1.0-1
+- New release
+
+* Wed Mar 14 2012  Pavel Zhukov <landgraf@fedoraproject.org> - 0.9-2
+- Fix buffer overflow (#752388)
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
--- a/mupdf-1.21.1-fix-png_write_band.patch
+++ b/mupdf-1.21.1-fix-png_write_band.patch
@ -0,0 +1,50 @@
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Sun, 18 Dec 2022 00:22:04 +0000 (+0900)
+Subject: Bug 706227: png_write_band: initialize stream before calling deflateBound
+X-Git-Url: http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=a76b4ed0d3a2c7e52bba2d6c10b44d11d5ade2fe
+
+Bug 706227: png_write_band: initialize stream before calling deflateBound
+
+zlib deflateBound manual says when calling this function,
+stream should have been initialized via a call to deflateInit_()
+or deflateInit2_(), so change so.
+
+Note that without this fix, "mutool draw -F png" segfaults on s390x,
+perhaps on big endian, uninitialized bytes of a value (which is
+not wholly initialized) is read, on the other hand, on little endian
+initialized bytes of the value is read, so it happens not to cause
+segfault.
+
+Fixes https://bugs.ghostscript.com/show_bug.cgi?id=706227
+---
+
+diff --git a/source/fitz/output-png.c b/source/fitz/output-png.c
+index 17279f913..979c75eeb 100644
+--- a/source/fitz/output-png.c
+++ b/source/fitz/output-png.c
+@@ -236,6 +236,12 @@ png_write_band(fz_context *ctx, fz_band_writer *writer_, int stride, int band_st
+ 		if (usize > SIZE_MAX / band_height)
+ 			fz_throw(ctx, FZ_ERROR_GENERIC, "png data too large.");
+ 		usize *= band_height;
+		writer->stream.opaque = ctx;
+		writer->stream.zalloc = fz_zlib_alloc;
+		writer->stream.zfree = fz_zlib_free;
+		err = deflateInit(&writer->stream, Z_DEFAULT_COMPRESSION);
+		if (err != Z_OK)
+			fz_throw(ctx, FZ_ERROR_GENERIC, "compression error %d", err);
+ 		writer->usize = usize;
+ 		/* Now figure out how large a buffer we need to compress into.
+ 		 * deflateBound always expands a bit, and it's limited by being
+@@ -245,12 +251,6 @@ png_write_band(fz_context *ctx, fz_band_writer *writer_, int stride, int band_st
+ 			writer->csize = UINT32_MAX;
+ 		writer->udata = Memento_label(fz_malloc(ctx, writer->usize), "png_write_udata");
+ 		writer->cdata = Memento_label(fz_malloc(ctx, writer->csize), "png_write_cdata");
+-		writer->stream.opaque = ctx;
+-		writer->stream.zalloc = fz_zlib_alloc;
+-		writer->stream.zfree = fz_zlib_free;
+-		err = deflateInit(&writer->stream, Z_DEFAULT_COMPRESSION);
+-		if (err != Z_OK)
+-			fz_throw(ctx, FZ_ERROR_GENERIC, "compression error %d", err);
+ 	}
+ 
+ 	dp = writer->udata;
--- a/mupdf.spec
+++ b/mupdf.spec
@ -4,34 +4,37 @@
 %global jbig2dec_version 0.19

 Name:           mupdf
-Version:        1.18.0
-Release:        5%{?dist}
+Version:        1.21.1
+# upstream prerelease versions tags need to be translated to Fedorian
+%global upversion %{version}
+Release:        %autorelease
 Summary:        A lightweight PDF viewer and toolkit
-License:        AGPLv3+
+License:        AGPL-3.0-or-later
 URL:            http://mupdf.com/
-Source0:        http://mupdf.com/downloads/archive/%{name}-%{version}-source.tar.gz
+Source0:        http://mupdf.com/downloads/archive/%{name}-%{upversion}-source.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}-gl.desktop
+Patch:          mupdf-1.21.1-fix-png_write_band.patch
 BuildRequires:  gcc gcc-c++ make binutils desktop-file-utils coreutils pkgconfig
 BuildRequires:  openjpeg2-devel desktop-file-utils
 BuildRequires:  libjpeg-devel freetype-devel libXext-devel curl-devel
 BuildRequires:  harfbuzz-devel openssl-devel mesa-libEGL-devel
 BuildRequires:  mesa-libGL-devel mesa-libGLU-devel libXi-devel libXrandr-devel
-BuildRequires:  gumbo-parser-devel
+BuildRequires:  gumbo-parser-devel leptonica-devel tesseract-devel
 BuildRequires:  jbig2dec-devel = %{jbig2dec_version}
 BuildRequires:  jbig2dec-libs = %{jbig2dec_version}
 Requires:       jbig2dec-libs = %{jbig2dec_version}
 # 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) = 2.10art
+Provides:       bundled(lcms2-devel) = 2.14~rc1^59-g88b6a72
 # We need to build against the Artifex fork of freeglut so that we are unicode safe.
-Provides:       bundled(freeglut-devel) = 3.0.0
+Provides:       bundled(freeglut-devel) = 3.0.0^11.g13ae6aa
 # 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.0.9
-Patch1:		0001-support-PyMuPDF.patch
-Patch2:		0001-Bug-703366-Fix-double-free-of-object-during-lineariz.patch
+Provides:       bundled(mujs-devel) = 1.3.2
+# muPDF builds only against in-tree extract which is versioned along with ghostpdl.
+Provides:       bundled(extract) = 9.56.0^53-gc18d9f3

 %description
 MuPDF is a lightweight PDF viewer and toolkit written in portable C.
@ -41,7 +44,7 @@ within fractions of a pixel for the highest fidelity in reproducing
 the look of a printed page on screen.
 MuPDF has a small footprint.  A binary that includes the standard
 Roman fonts is only one megabyte.  A build with full CJK support
-(including an Asian font) is approximately five megabytes.
+(including an Asian font) is approximately seven megabytes.
 MuPDF has support for all non-interactive PDF 1.7 features, and the
 toolkit provides a simple API for accessing the internal structures of
 the PDF document.  Example code for navigating interactive links and
@ -58,13 +61,11 @@ The mupdf-devel package contains header files for developing
 applications that use mupdf and static libraries

 %prep
-%setup -q -n %{name}-%{version}-source
-for d in $(ls thirdparty | grep -v -e freeglut -e lcms2 -e mujs)
+%autosetup -p1 -n %{name}-%{upversion}-source
+for d in $(ls thirdparty | grep -v -e extract -e freeglut -e lcms2 -e mujs)
 do
  rm -rf thirdparty/$d
 done
-%patch1 -p1
-%patch2 -p1

 echo > user.make "\
  USE_SYSTEM_FREETYPE := yes
@ -79,10 +80,13 @@ echo > user.make "\
  USE_SYSTEM_GLUT := no # need freeglut2-art fork
  USE_SYSTEM_CURL := yes
  USE_SYSTEM_GUMBO := yes
+  USE_TESSERACT := yes
+  USE_SYSTEM_LEPTONICA := yes
+  USE_SYSTEM_TESSERACT := yes
 "

 %build
-export XCFLAGS="%{optflags} -fPIC -DJBIG_NO_MEMENTO -DTOFU -DTOFU_CJK"
+export XCFLAGS="%{optflags} -fPIC -DJBIG_NO_MEMENTO -DTOFU -DTOFU_CJK_EXT"

 make  %{?_smp_mflags}  build=debug verbose=yes
 %install
@ -113,260 +117,4 @@ cd %{buildroot}/%{_bindir} && ln -s %{name}-x11 %{name}
 %{_libdir}/lib%{name}*.a

 %changelog
-* Tue Feb 23 2021 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-5
- CVE-2021-3407 (bz #1931964, bz#1931965)
-
-* Tue Jan 26 2021 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-4
- (original date: Thu Oct 29 2020)
- remove obsolete patch
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Oct 08 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-2
- support PyMuPDF
-
-* Thu Oct 08 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-1
- bugfix and feature release
- bz #1886338 #1886339 #1886083
-
-* Sun Oct 04 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-0.1.rc1
- properly name the rc prerelease
- update versions of bundled libs
-
-* Sat Oct 03 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.18.0-rc1
- mupdf 1.18.0-rc1 test
-
-* Fri Sep 18 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-4
- rebuild with jbig2dec 0.19
-
-* Mon Jul 27 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-3
- depend on exact jbig2dec version (bz 1861103)
-
-* Sun May 31 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-2
- fix signature check crash
-
-* Mon May 11 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.17.0-1
- rebase to 1.17.0 (bz #1831652)
-
-* Wed Feb 05 2020 Michael J Gruber <mjg@fedoraproject.org> - 1.16.1-3
- fix build with gcc 10
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Aug 16 2019 Michael J Gruber <mjg@fedoraproject.org> - 1.16.1-1
- rebase to 1.16.1
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue May 07 2019 Michael J Gruber <mjg@fedoraproject.org> - 1.15.0-1
- rebase to 1.15.0
-
-* Mon Apr 29 2019 Michael J Gruber <mjg@fedoraproject.org> - 1.15rc1-1
- rc1 test
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-7
- work around missing mesa EGl dependency
-
-* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-6
- signature handling fix needs more patches than claimed
-
-* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-5
- fix signature handling
-
-* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-4
- bz #1644444 #1644445
-
-* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-3
- bz #1626481 #1626484
-
-* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-2
- bz #1626483 #1626484
-
-* Thu Nov 15 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14.0-1
- rebase to 1.14.0
-
-* Mon Oct 01 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14rc1-3
- mupdf-gl desktop entry
-
-* Mon Oct 01 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14rc1-2
- enable libcrypto
-
-* Wed Sep 26 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14rc1-1
- rc test
- adjust to new build system setup
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sun Jun 10 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-8
- CVE-2018-10289 (rh bz #1573050) (gs bz #699271)
-
-* Wed Jun 06 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-7
- fix license field (bug #1586328)
-
-* Sun Jun 03 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-6
- fix lcms2art build on big endian
-
-* Fri May 18 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-5
- fix BR (pulled in by freeglut-devel before)
-
-* Mon Apr 23 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-4
- bundle unicode safe freeglut
-
-* Mon Apr 23 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-3
- include (now non-empty) libmupdfthird.a again (fixes bug #1553915 for zathura-pdf-mupdf)
-
-* Fri Apr 20 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-2
- bundle thread-safe lcms2 (fixes bug #1553915)
-
-* Fri Apr 20 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.13.0-1
- rebase to 1.13.0 (rh bz #1569993)
-
-* Fri Apr 13 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-6
- install svg icon
-
-* Fri Apr 13 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-6
- install svg icon
-
-* Wed Feb 14 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-5
- CVE-2018-6192 (rh bz #1539845 #1539846) (gs bz #698916)
- CVE-2018-6544 (rh bz #1542264 #1542265) (gs bz #698830 #698965)
- CVE-2018-1000051 (rh bz #1544847 #1544848) (gs bz #698825 #698873)
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Feb 06 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-4
- CVE-2018-6187 (rh bz #1538432 #1538433) (gs bz #698908)
-
-* Wed Jan 24 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-2
- CVE-2017-17858 (rh bz #1537952) (gs bz #698819)
- CVE-2018-5686 (gs bz #698860)
-
-* Thu Dec 14 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.12.0-1
- rebase to 1.12
- follow switch from GLFW to GLUT
- follow switch to new version scheme
-
-* Sun Nov 26 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.12rc1-1
- rc test
-
-* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-9
- CVE-2017-15369
- CVE-2017-15587
-
-* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-8
- repair FTBFS from version specific patch in 412e729 ("New release 1.11", 2017-04-11)
-
-* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-7
- rebuild with jbig2dec 0.14 (#1456731)
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue May 09 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.11-4
- Rebuild with new jbig2dec (#1443933)
-
-* Fri Apr 14 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.11-3
- Fix mupdf-gl build (#1442384)
-
-* Tue Apr 11 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.11-1
- New release 1.11 (#1441186)
-
-* Thu Apr  6 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.10a-5
- Fix stack consumption CVE (#1439643)
-
-* Thu Mar  2 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.10a-4
- fix buffer overflow (#1425338)
-
-* Thu Mar 02 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.10a-3
- Several packaging fixes
-
-* Thu Feb 23 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.10a-2
- Add comment with explanation of disabled debuginfo
- Fix make verbose output
-
-* Sat Feb 11 2017 Pavel Zhukov <pzhukov@redhat.com> - 1.10a-1
- New release (1.10a)
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Nov 28 2015 Pavel Zhukov <landgraf@fedoraproject.org> -1.8-1
- New release (#1280518)
-
-* Sat Nov 28 2015 Pavel Zhukov <landgraf@fedoraproject.org> -1.7a-4
- Disable memento
-
-* Wed Nov 18 2015 Petr Šabata <contyk@redhat.com> - 1.7a-3
- Package the license text with the %%license macro
- Don't use the %%version macro in filenames, it's not helpful
- Added extra handling for the docs; %%_docdir is no longer autopackaged,
-  plus we want to install the license text elsewhere
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7a-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Jun 01 2015  Pavel Zhukov <landgraf@fedoraproject.org> - 1.7a-1
- New release 1.7a (#1219482)
-* Wed May 06 2015  Pavel Zhukov <landgraf@fedoraproject.org> - 1.7-1
- New release 1.7 (#1210318)
- Fix segfault in obj_close routine (#1202137, #1215752)
-
-* Wed May 06 2015 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-6
- Fix executable name in desktop file
-
-* Sat Oct 11 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-5
- Add missed curl-devel
-
-* Fri Jul 04 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-3
- Add fPIC flag (#1109589)
- Add curl-devel to BR (#1114566)
-
-* Sun Jun 15 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-2
- Add fix for new openjpeg2
-
-* Sun Jun 15 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.5-1
- New release 1.5 (#1108710)
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue May  6 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.4-1
- New release 1.4 (#1087287)
-
-* Fri Jan 24 2014 Pavel Zhukov <landgraf@fedoraproject.org> - 1.1-5
- Fix stack overflow (#1056699)
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.1-2
- rebuild due to "jpeg8-ABI" feature drop
-
-* Wed Jan 09 2013 Pavel Zhukov <landgraf@fedoraproject.org> - 1.1-1
- New release
-
-* Sun May 20 2012  Pavel Zhukov <landgraf@fedoraproject.org> - 1.0-1
- New release
-
-* Wed Mar 14 2012  Pavel Zhukov <landgraf@fedoraproject.org> - 0.9-2
- Fix buffer overflow (#752388)
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+%autochangelog
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (mupdf-1.18.0-source.tar.gz) = dd3d413badc5ea50ee100a39aa0265f2d096006e6466f3029ef5f4902e7a9f8e9f958b78ae484524233217ae6ef6ecf56431b8ac462d603a050c4e490503aef1
+SHA512 (mupdf-1.21.1-source.tar.gz) = 11eeea409e0b44d3f754a44b00b15522c2ae2d94171b8c7067efa7acbb1d597eefe1e27607fab90a56bf6c73579bbfb77b7599080fc2504a5881aaf7cc1957c7
Author	SHA1	Message	Date
Fedora Release Engineering	59b615c537	Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-01-19 21:00:38 +00:00
Sandro Mani	57d5651c80	Rebuild (tesseract)	2022-12-23 21:59:57 +01:00
Sandro Mani	dae2ea6f54	Rebuild (leptonica)	2022-12-21 15:42:11 +01:00
Michael J Gruber	15f1cc451a	fix png_write_band (rhbz#2154545) ... (gsbz#706227)	2022-12-20 15:14:34 +01:00
Michael J Gruber	4383cdfe1f	SPDX migration	2022-12-17 11:42:04 +01:00
Michael J Gruber	910cfdca95	rebase to 1.21.1 (rhbz#2152708)	2022-12-13 11:36:39 +01:00
Michael J Gruber	1bccd68af3	rebase to 1.21.0 (rhbz#2140776)	2022-11-11 13:59:27 +01:00
Michael J Gruber	110373e8d9	rebase to 1.21.0-rc1	2022-10-27 20:48:13 +02:00
Michael J Gruber	c05df1b2d8	rebase to 1.20.3 (bz #2104499 )	2022-08-12 21:13:32 +02:00
Fedora Release Engineering	7d449a49d4	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-22 00:00:23 +00:00
Sandro Mani	2fb98fa93a	Rebuild (tesseract)	2022-07-08 10:50:04 +02:00
Michael J Gruber	ee679b51f4	rebase to 1.20.0 (bz #2094792 )	2022-06-15 16:36:37 +02:00
Michael J Gruber	e445746c93	rebase to 1.20.0-rc2	2022-06-15 16:22:35 +02:00
Michael J Gruber	678de8a167	rebase to 1.20.0-rc1	2022-06-15 16:22:35 +02:00
Sandro Mani	0a9799470d	Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0	2022-05-21 00:30:53 +02:00
Sandro Mani	1c6178e7ee	Rebuild for tesseract-5.1.0	2022-03-10 00:14:13 +01:00
Sandro Mani	9a63db0324	Bump as F36 needs another rebuild	2022-02-25 12:58:25 +01:00
Sandro Mani	36e10e67a1	Rebuild (leptonica)	2022-02-25 12:05:55 +01:00
Fedora Release Engineering	62d9f5639c	- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-01-20 20:40:46 +00:00
Sandro Mani	2531fa4323	Rebuild (tesseract)	2021-12-19 19:01:06 +01:00
Sandro Mani	13b80e8c97	Rebuild (tesseract)	2021-12-14 13:27:00 +01:00
Michael J Gruber	3628ae0720	enable OCR (leptonica/tesseract) Enable OCR with the leptonica/tesseract engine.	2021-10-12 22:41:05 +02:00
Michael J Gruber	347b10e4f3	rebase to 1.19.0 bz #2011302	2021-10-06 18:00:02 +02:00
Michael J Gruber	1cd3a406e9	switch to rpmautospec	2021-10-06 16:28:24 +02:00
Sahana Prasad	e7cb6106cc	Rebuilt with OpenSSL 3.0.0	2021-09-14 19:08:30 +02:00
Fedora Release Engineering	f0c5d722d5	- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-07-22 15:37:39 +00:00
Michael J Gruber	926ba3b7ff	truth in advertising	2021-07-19 18:05:32 +02:00
Scott Talbert	307c5ad242	Enable DroidSansFallback font	2021-07-13 21:41:56 -04:00
Michael J Gruber	2651dbfbbb	remove obsolete PyMuPDF support PyMuPDF and above do not rely on patched mupdf sources any more, so not provide the extra exported function and revert back to vanilla sources.	2021-02-24 11:57:03 +01:00