cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to mupdf-1.21.0

Browse Source
This commit is contained in:
sthen 2022-11-08 12:41:05 +00:00
parent 4f4bba5bfa
commit 40195a9fc3
8 changed files with 16 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
textproc/mupdf/Makefile
View File

@ -1,10 +1,9 @@
COMMENT = graphic library, pdf parser, viewer and utilities
# bump and test textproc/zathura/plugins/mupdf if updating
V = 1.20.3
V = 1.21.0
DISTNAME = mupdf-$V-source
PKGNAME = mupdf-${V:S/-rc/rc/}
REVISION = 0
CATEGORIES = textproc x11

4
textproc/mupdf/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mupdf-1.20.3-source.tar.gz) = a2AHD27sIOjYfStc0iz0kCAxGjzxXuEJmOPl9fmEses=
SIZE (mupdf-1.20.3-source.tar.gz) = 88457290
SHA256 (mupdf-1.21.0-source.tar.gz) = If71shlrYNxM+TWPkXwiVbGiY6BTkRKenKdqe1xZI84=
SIZE (mupdf-1.21.0-source.tar.gz) = 54753613

6
textproc/mupdf/patches/patch-Makerules
View File

@ -1,7 +1,7 @@
Index: Makerules
--- Makerules.orig
+++ Makerules
@@ -71,8 +71,8 @@ ifeq ($(build),debug)
@@ -83,8 +83,8 @@ ifeq ($(build),debug)
CFLAGS += -pipe -g
LDFLAGS += -g
else ifeq ($(build),release)
@ -12,7 +12,7 @@ Index: Makerules
else ifeq ($(build),small)
CFLAGS += -pipe -Os -DNDEBUG -fomit-frame-pointer
LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
@@ -156,8 +156,8 @@ else ifeq ($(OS),MACOS)
@@ -168,8 +168,8 @@ else ifeq ($(OS),MACOS)
endif
endif
@ -23,7 +23,7 @@ Index: Makerules
ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
@@ -218,10 +218,10 @@ else ifeq ($(OS),Linux)
@@ -230,10 +230,10 @@ else ifeq ($(OS),Linux)
X11_LIBS := $(shell pkg-config --libs x11 xext)
endif

6
textproc/mupdf/patches/patch-platform_x11_pdfapp_c
View File

@ -28,7 +28,7 @@ Index: platform/x11/pdfapp.c
static int zoom_in(int oldres)
{
int i;
@@ -1575,6 +1585,7 @@ key_rewritten:
@@ -1570,6 +1580,7 @@ key_rewritten:
app->pageno++;
break;
@ -36,7 +36,7 @@ Index: platform/x11/pdfapp.c
case 'b':
{
int number = 1;
@@ -1621,7 +1632,7 @@ key_rewritten:
@@ -1616,7 +1627,7 @@ key_rewritten:
{
if (app->imgw + app->panx <= app->winw + app->imgw/20)
{
@ -45,7 +45,7 @@ Index: platform/x11/pdfapp.c
{
app->panx = 0;
app->pany = 0;
@@ -1733,9 +1744,9 @@ static void handlescroll(pdfapp_t *app, int modifiers,
@@ -1728,9 +1739,9 @@ static void handlescroll(pdfapp_t *app, int modifiers,
{
/* zoom in/out if ctrl is pressed */
if (dir > 0)

35
textproc/mupdf/patches/patch-source_helpers_pkcs7_pkcs7-openssl_c
View File

@ -1,35 +0,0 @@
- disable redefinitions of OpenSSL accessors provided by libcrypto
- avoid (harmless) compiler warning about incompatible function pointer types
- add default_paths to STORE for checking signatures (aka /etc/ssl/cert.pem)
Index: source/helpers/pkcs7/pkcs7-openssl.c
--- source/helpers/pkcs7/pkcs7-openssl.c.orig
+++ source/helpers/pkcs7/pkcs7-openssl.c
@@ -119,7 +119,7 @@ static const char AdobeCA_p7c[] = {
#warning detect version of openssl at compile time
#endif
-#ifdef LIBRESSL_VERSION_NUMBER
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3060000fL
static inline const STACK_OF(PKCS12_SAFEBAG) *
PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag)
@@ -203,7 +203,7 @@ static int stream_free(BIO *b)
return 1;
}
-static long stream_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
+static long stream_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
{
return 1;
}
@@ -513,6 +513,9 @@ check_certificate(fz_context *ctx, pdf_pkcs7_verifier
X509_STORE_add_cert(st, c);
}
}
+
+ /* Add default paths */
+ X509_STORE_set_default_paths(st);
res = pk7_verify_cert(st, pk7sig);

2
textproc/mupdf/patches/patch-source_tools_mudraw_c
View File

@ -12,7 +12,7 @@ Index: source/tools/mudraw.c
#include <string.h>
#include <limits.h>
#include <stdlib.h>
@@ -2036,6 +2038,12 @@ int mudraw_main(int argc, char **argv)
@@ -2040,6 +2042,12 @@ int mudraw_main(int argc, char **argv)
if (fz_optind == argc)
return usage();

2
textproc/mupdf/patches/patch-source_tools_pdfinfo_c
View File

@ -12,7 +12,7 @@ Index: source/tools/pdfinfo.c
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
@@ -1058,6 +1060,12 @@ int pdfinfo_main(int argc, char **argv)
@@ -1046,6 +1048,12 @@ int pdfinfo_main(int argc, char **argv)
{
infousage();
return 1;

5
textproc/mupdf/pkg/PLIST
View File

@ -41,6 +41,8 @@ include/mupdf/fitz/pool.h
include/mupdf/fitz/separation.h
include/mupdf/fitz/shade.h
include/mupdf/fitz/store.h
include/mupdf/fitz/story-writer.h
include/mupdf/fitz/story.h
include/mupdf/fitz/stream.h
include/mupdf/fitz/string-util.h
include/mupdf/fitz/structured-text.h
@ -113,8 +115,11 @@ share/doc/mupdf/style.css
share/doc/mupdf/thirdparty.html
share/doc/mupdf/viewers.html
share/examples/mupdf/
share/examples/mupdf/SnarkFront.svg
share/examples/mupdf/example.c
share/examples/mupdf/huntingofthesnark.png
share/examples/mupdf/multi-threaded.c
share/examples/mupdf/storytest.c
share/pixmaps/
share/pixmaps/mupdf.xpm
@tag update-desktop-database