All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/6] package/mupdf: bump to version 1.23.8
@ 2024-01-10  9:38 James Hilliard
  2024-01-10  9:38 ` [Buildroot] [PATCH 2/6] package/python-distro: add host build James Hilliard
                   ` (4 more replies)
  0 siblings, 5 replies; 14+ messages in thread
From: James Hilliard @ 2024-01-10  9:38 UTC (permalink / raw)
  To: buildroot
  Cc: Raphaël Mélotte, James Hilliard, Asaf Kahlon,
	Julien Olivain, Thomas Petazzoni

Drop patch which is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 ...issing-limits.h-include-for-UINT_MAX.patch | 70 -------------------
 package/mupdf/mupdf.hash                      |  4 +-
 package/mupdf/mupdf.mk                        |  2 +-
 3 files changed, 3 insertions(+), 73 deletions(-)
 delete mode 100644 package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch

diff --git a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch
deleted file mode 100644
index 95f2f86666..0000000000
--- a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From ebce9f1b129ebc8f2b17afa02a4ffcb9453c11d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= <raphael.melotte@mind.be>
-Date: Mon, 24 Apr 2023 17:27:35 +0200
-Subject: [PATCH] Add missing limits.h include for UINT_MAX
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-encode-basic.c uses 'UINT_MAX', which is available in the 'limits.h'
-header.
-
-In some configurations that build with zlib from [1], by chance
-limits.h gets indirectly included when including 'z-imp.h' (the
-includes are: 'z-imp.h' -> 'zlib.h' -> 'zconf.h' -> 'limits.h'), so
-the build succeeds.
-
-When using other zlib implementations however (for example from [2]),
-limits.h is not necessarily included indirectly, which leads to the
-build failing in the following way:
-
-source/fitz/encode-basic.c: In function 'deflate_write':
-source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function)
-  343 |         newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n);
-      |                           ^~~~~~~~
-source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'?
-
-Add the missing include, so that the build succeeds no matter if zlib
-indirectly includes 'limit.h' or not.
-
-Similarly, also add it in output-ps.c where it's also missing.
-
-[1]: https://zlib.net/
-[2]: https://github.com/zlib-ng/zlib-ng
-
-Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
-Upstream: https://bugs.ghostscript.com/show_bug.cgi?id=706667
----
- source/fitz/encode-basic.c | 2 ++
- source/fitz/output-ps.c    | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/source/fitz/encode-basic.c b/source/fitz/encode-basic.c
-index 03a4ff76b..84f0c35e6 100644
---- a/source/fitz/encode-basic.c
-+++ b/source/fitz/encode-basic.c
-@@ -24,6 +24,8 @@
- 
- #include "z-imp.h"
- 
-+#include <limits.h>
-+
- struct ahx
- {
- 	fz_output *chain;
-diff --git a/source/fitz/output-ps.c b/source/fitz/output-ps.c
-index ef22c3cd6..3dc8ea17d 100644
---- a/source/fitz/output-ps.c
-+++ b/source/fitz/output-ps.c
-@@ -24,6 +24,8 @@
- 
- #include "z-imp.h"
- 
-+#include <limits.h>
-+
- typedef struct ps_band_writer_s
- {
- 	fz_band_writer super;
--- 
-2.39.1
-
diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash
index 1f636097ed..8acd9afa8a 100644
--- a/package/mupdf/mupdf.hash
+++ b/package/mupdf/mupdf.hash
@@ -1,8 +1,8 @@
 # From https://mupdf.com/downloads/index.html:
-sha1  b9907729d604f0bf3846b45cd5891e10d7a66e24  mupdf-1.22.0-source.tar.lz
+sha1  bff29452eb30e477e543196971936874454ff9d5  mupdf-1.23.8-source.tar.lz
 
 # Locally computed:
-sha256  bed78a0abf8496b30c523497292de979db633eca57e02f6cd0f3c7c042551c3e  mupdf-1.22.0-source.tar.lz
+sha256  9373fc293e0ae18d87d302d74a3db071462618e9a0b60ae29c2132e636ac1554  mupdf-1.23.8-source.tar.lz
 
 # Hash for license files:
 sha256  57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6  COPYING
diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk
index 08894d7980..d462a2e481 100644
--- a/package/mupdf/mupdf.mk
+++ b/package/mupdf/mupdf.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # python-pymupdf's version must match mupdf's version
-MUPDF_VERSION = 1.22.0
+MUPDF_VERSION = 1.23.8
 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz
 MUPDF_SITE = https://mupdf.com/downloads/archive
 MUPDF_LICENSE = AGPL-3.0+
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2024-02-09 13:15 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-10  9:38 [Buildroot] [PATCH 1/6] package/mupdf: bump to version 1.23.8 James Hilliard
2024-01-10  9:38 ` [Buildroot] [PATCH 2/6] package/python-distro: add host build James Hilliard
2024-01-10  9:38 ` [Buildroot] [PATCH 3/6] package/python-scikit-build: new package James Hilliard
2024-01-10  9:38 ` [Buildroot] [PATCH 4/6] package/python-swig: " James Hilliard
2024-01-10 11:01   ` Yann E. MORIN
2024-01-10 11:30     ` James Hilliard
2024-01-10 14:13       ` Yann E. MORIN
2024-01-10 14:15         ` Yann E. MORIN
2024-01-10 23:55         ` James Hilliard
2024-01-10  9:38 ` [Buildroot] [PATCH 5/6] ackage/python-libclang: " James Hilliard
2024-01-10  9:38 ` [Buildroot] [PATCH 6/6] package/python-pymupdf: bump to version 1.23.9rc2 James Hilliard
2024-02-08 11:28   ` Raphaël Mélotte via buildroot
2024-02-08 21:29     ` Arnout Vandecappelle via buildroot
2024-02-09 13:15       ` Raphaël Mélotte via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.