mupdf: 1.22.1 -> 1.23.0

Changelog: https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=1.23.0
This commit is contained in:
Mario Rodas 2023-08-19 04:20:00 +00:00
parent dbd393758a
commit a40945ad67
2 changed files with 9 additions and 21 deletions

View file

@ -1,25 +1,13 @@
From b2935ed7e2962d73f3b493c38c0bb1e8659c0a60 Mon Sep 17 00:00:00 2001 Use command -v in favor of which
From: toonn <toonn@toonn.io>
Date: Tue, 8 Mar 2022 23:59:19 +0100
Subject: [PATCH 1/2] Use command -v in favor of which
---
Makerules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makerules b/Makerules
index 0fdaecb..6d52cca 100644
--- a/Makerules --- a/Makerules
+++ b/Makerules +++ b/Makerules
@@ -145,7 +145,7 @@ else ifeq ($(OS),MACOS) @@ -170,7 +170,7 @@
LD = xcrun ld ifneq ($(ARCHFLAGS),)
RANLIB = xcrun ranlib $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
HAVE_LIBCRYPTO := no
- ifeq (, $(shell which pkg-config)) - else ifeq (, $(shell which pkg-config))
+ ifeq (, $(shell command -v pkg-config)) + else ifeq (, $(shell command -v pkg-config))
$(warning "No pkg-config found, install it for proper integration of libcrypto") $(warning "No pkg-config found, install it for proper integration of libcrypto")
else else
HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
--
2.17.2 (Apple Git-113)

View file

@ -53,12 +53,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.22.1"; version = "1.23.0";
pname = "mupdf"; pname = "mupdf";
src = fetchurl { src = fetchurl {
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
sha256 = "sha256-1i88DkVuu8QucfWkfw+M0SzsK/Co1yt541+jWmU4slo="; sha256 = "sha256-3kFAaS5pMULDEeAwrBVuOO4XXXq2wb4QxcmuljhGFk4=";
}; };
patches = [ ./0001-Use-command-v-in-favor-of-which.patch patches = [ ./0001-Use-command-v-in-favor-of-which.patch