Attachment #237723 for bug #258977

Lines 1-7 Link Here

(-)b/graphics/mupdf/Makefile (-2 / +2 lines)
1	PORTNAME= mupdf	1	PORTNAME= mupdf
2	DISTVERSION= 1.18.0	2	DISTVERSION= 1.20.3
3	DISTVERSIONSUFFIX= -source	3	DISTVERSIONSUFFIX= -source
4	PORTREVISION= 1
5	PORTEPOCH= 1	4	PORTEPOCH= 1
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	MASTER_SITES= http://www.mupdf.com/downloads/ \	6	MASTER_SITES= http://www.mupdf.com/downloads/ \
Lines 47-52 JS_LIB_DEPENDS= libv8.so:lang/v8 Link Here
47	JS_MAKE_ARGS= V8_PRESENT=1 V8LIBS=-lv8	46	JS_MAKE_ARGS= V8_PRESENT=1 V8LIBS=-lv8
48	SCROLL_EXTRA_PATCHES= ${FILESDIR}/scroll_hack-platform__x11__pdfapp.c	47	SCROLL_EXTRA_PATCHES= ${FILESDIR}/scroll_hack-platform__x11__pdfapp.c
49		48
		49	BINARY_ALIAS= bash=/bin/sh
50	PLIST_SUB= SOVERSION=${PORTVERSION}	50	PLIST_SUB= SOVERSION=${PORTVERSION}
51		51
52	post-patch:	52	post-patch:

Lines 1-3 Link Here

(-)b/graphics/mupdf/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1602272959	1	TIMESTAMP = 1667131678
2	SHA256 (mupdf-1.18.0-source.tar.gz) = 8860ea6d01fc3c360ba5e0fa9fede241c6fbb2a73f5215b17a105de409a19266	2	SHA256 (mupdf-1.20.3-source.tar.gz) = 6b60070f6eec20e8d87d2b5cd22cf49020311a3cf15ee10998e3e5f5f984b1eb
3	SIZE (mupdf-1.18.0-source.tar.gz) = 72621417	3	SIZE (mupdf-1.20.3-source.tar.gz) = 88457290




$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
--- Makefile.orig	2022-10-30 12:16:03 UTC
+++ Makefile
@@ -257,17 +257,19 @@ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
 $(THREAD_LIB) : $(THREAD_OBJ)
 $(PKCS7_LIB) : $(PKCS7_OBJ)
 else
-MUPDF_LIB = $(OUT)/libmupdf.a
-THIRD_LIB = $(OUT)/libmupdf-third.a
+MUPDF_LIB = $(OUT)/libmupdf.so.$(SOVERSION)
+THIRD_LIB = $(OUT)/libmupdf-third.so.$(SOVERSION)
 LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB)
-THIRD_LIB = $(OUT)/libmupdf-third.a
 ifneq ($(USE_SYSTEM_GLUT),yes)
 THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
 endif
 THREAD_LIB = $(OUT)/libmupdf-threads.a
 PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
 

+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOVERSION)
 $(THIRD_LIB) : $(THIRD_OBJ)
+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so.$(SOVERSION)
 $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
 $(THREAD_LIB) : $(THREAD_OBJ)
 $(PKCS7_LIB) : $(PKCS7_OBJ)
 endif




include/mupdf/fitz/device.h
include/mupdf/fitz/display-list.h
include/mupdf/fitz/document.h
include/mupdf/fitz/export.h
include/mupdf/fitz/filter.h
include/mupdf/fitz/font.h
include/mupdf/fitz/geometry.h

include/mupdf/fitz/track-usage.h
include/mupdf/fitz/transition.h
include/mupdf/fitz/tree.h
include/mupdf/fitz/types.h
include/mupdf/fitz/util.h
include/mupdf/fitz/version.h
include/mupdf/fitz/write-pixmap.h

include/mupdf/pdf/javascript.h
include/mupdf/pdf/name-table.h
include/mupdf/pdf/object.h
include/mupdf/pdf/output-pdf.h
include/mupdf/pdf/page.h
include/mupdf/pdf/parse.h
include/mupdf/pdf/resource.h

%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/android-library.html
%%PORTDOCS%%%%DOCSDIR%%/artifex-logo.png
%%PORTDOCS%%%%DOCSDIR%%/building.html
%%PORTDOCS%%%%DOCSDIR%%/coding-overview.html
%%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html
%%PORTDOCS%%%%DOCSDIR%%/coding-style.html
%%PORTDOCS%%%%DOCSDIR%%/ecosystem.css
%%PORTDOCS%%%%DOCSDIR%%/ecosystem.html
%%PORTDOCS%%%%DOCSDIR%%/ecosystem.png
%%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js
%%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js
%%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js

%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-trace.js
%%PORTDOCS%%%%DOCSDIR%%/examples/trace-device.js
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/library.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mupdf-gl.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-clean.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-convert.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-create.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-draw.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-extract.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-info.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-merge.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-pages.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-poster.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-run.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-show.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-sign.html
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-trace.html
%%PORTDOCS%%%%DOCSDIR%%/mutool.html
%%PORTDOCS%%%%DOCSDIR%%/style.css
%%PORTDOCS%%%%DOCSDIR%%/template.html
%%PORTDOCS%%%%DOCSDIR%%/thirdparty.html
%%PORTDOCS%%%%DOCSDIR%%/viewers.html

Return to bug 258977

Lines 1-14 Link Here

(-)b/graphics/mupdf/files/patch-Makefile (-6 / +10 lines)
1	$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $	1	$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
2	--- Makefile.orig 2020-10-10 08:56:03 UTC	2	--- Makefile.orig 2022-10-30 12:16:03 UTC
3	+++ Makefile	3	+++ Makefile
4	@@ -214,13 +214,15 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO)	4	@@ -257,17 +257,19 @@ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
5		5	$(THREAD_LIB) : $(THREAD_OBJ)
6	$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ)	6	$(PKCS7_LIB) : $(PKCS7_OBJ)
7	else	7	else
8	-MUPDF_LIB = $(OUT)/libmupdf.a	8	-MUPDF_LIB = $(OUT)/libmupdf.a
9	-THIRD_LIB = $(OUT)/libmupdf-third.a
10	+MUPDF_LIB = $(OUT)/libmupdf.so.$(SOVERSION)	9	+MUPDF_LIB = $(OUT)/libmupdf.so.$(SOVERSION)
11	+THIRD_LIB = $(OUT)/libmupdf-third.so.$(SOVERSION)	10	+THIRD_LIB = $(OUT)/libmupdf-third.so.$(SOVERSION)
		11	LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB)
		12	-THIRD_LIB = $(OUT)/libmupdf-third.a
		13	ifneq ($(USE_SYSTEM_GLUT),yes)
		14	THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
		15	endif
12	THREAD_LIB = $(OUT)/libmupdf-threads.a	16	THREAD_LIB = $(OUT)/libmupdf-threads.a
13	PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a	17	PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
14		18
Lines 17-22 $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $ Link Here
17	+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOVERSION)	21	+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOVERSION)
18	$(THIRD_LIB) : $(THIRD_OBJ)	22	$(THIRD_LIB) : $(THIRD_OBJ)
19	+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so.$(SOVERSION)	23	+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so.$(SOVERSION)
		24	$(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
20	$(THREAD_LIB) : $(THREAD_OBJ)	25	$(THREAD_LIB) : $(THREAD_OBJ)
21	$(PKCS7_LIB) : $(PKCS7_OBJ)	26	$(PKCS7_LIB) : $(PKCS7_OBJ)
22	endif

Lines 17-22 include/mupdf/fitz/crypt.h Link Here

(-)b/graphics/mupdf/pkg-plist (-5 / +11 lines)
17	include/mupdf/fitz/device.h	17	include/mupdf/fitz/device.h
18	include/mupdf/fitz/display-list.h	18	include/mupdf/fitz/display-list.h
19	include/mupdf/fitz/document.h	19	include/mupdf/fitz/document.h
		20	include/mupdf/fitz/export.h
20	include/mupdf/fitz/filter.h	21	include/mupdf/fitz/filter.h
21	include/mupdf/fitz/font.h	22	include/mupdf/fitz/font.h
22	include/mupdf/fitz/geometry.h	23	include/mupdf/fitz/geometry.h
Lines 44-49 include/mupdf/fitz/text.h Link Here
44	include/mupdf/fitz/track-usage.h	45	include/mupdf/fitz/track-usage.h
45	include/mupdf/fitz/transition.h	46	include/mupdf/fitz/transition.h
46	include/mupdf/fitz/tree.h	47	include/mupdf/fitz/tree.h
		48	include/mupdf/fitz/types.h
47	include/mupdf/fitz/util.h	49	include/mupdf/fitz/util.h
48	include/mupdf/fitz/version.h	50	include/mupdf/fitz/version.h
49	include/mupdf/fitz/write-pixmap.h	51	include/mupdf/fitz/write-pixmap.h
Lines 63-69 include/mupdf/pdf/interpret.h Link Here
63	include/mupdf/pdf/javascript.h	65	include/mupdf/pdf/javascript.h
64	include/mupdf/pdf/name-table.h	66	include/mupdf/pdf/name-table.h
65	include/mupdf/pdf/object.h	67	include/mupdf/pdf/object.h
66	include/mupdf/pdf/output-pdf.h
67	include/mupdf/pdf/page.h	68	include/mupdf/pdf/page.h
68	include/mupdf/pdf/parse.h	69	include/mupdf/pdf/parse.h
69	include/mupdf/pdf/resource.h	70	include/mupdf/pdf/resource.h
Lines 78-91 man/man1/mutool.1.gz Link Here
78	%%PORTDOCS%%%%DOCSDIR%%/CHANGES	79	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
79	%%PORTDOCS%%%%DOCSDIR%%/COPYING	80	%%PORTDOCS%%%%DOCSDIR%%/COPYING
80	%%PORTDOCS%%%%DOCSDIR%%/README	81	%%PORTDOCS%%%%DOCSDIR%%/README
81	%%PORTDOCS%%%%DOCSDIR%%/android-sdk.html	82	%%PORTDOCS%%%%DOCSDIR%%/android-library.html
82	%%PORTDOCS%%%%DOCSDIR%%/artifex-logo.png	83	%%PORTDOCS%%%%DOCSDIR%%/artifex-logo.png
83	%%PORTDOCS%%%%DOCSDIR%%/building.html	84	%%PORTDOCS%%%%DOCSDIR%%/building.html
84	%%PORTDOCS%%%%DOCSDIR%%/coding-overview.html	85	%%PORTDOCS%%%%DOCSDIR%%/coding-overview.html
85	%%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html	86	%%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html
86	%%PORTDOCS%%%%DOCSDIR%%/coding-style.html	87	%%PORTDOCS%%%%DOCSDIR%%/coding-style.html
		88	%%PORTDOCS%%%%DOCSDIR%%/ecosystem.css
87	%%PORTDOCS%%%%DOCSDIR%%/ecosystem.html	89	%%PORTDOCS%%%%DOCSDIR%%/ecosystem.html
88	%%PORTDOCS%%%%DOCSDIR%%/ecosystem.png
89	%%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js	90	%%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js
90	%%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js	91	%%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js
91	%%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js	92	%%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js
Lines 103-118 man/man1/mutool.1.gz Link Here
103	%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-trace.js	104	%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-trace.js
104	%%PORTDOCS%%%%DOCSDIR%%/examples/trace-device.js	105	%%PORTDOCS%%%%DOCSDIR%%/examples/trace-device.js
105	%%PORTDOCS%%%%DOCSDIR%%/index.html	106	%%PORTDOCS%%%%DOCSDIR%%/index.html
		107	%%PORTDOCS%%%%DOCSDIR%%/library.html
106	%%PORTDOCS%%%%DOCSDIR%%/manual-mupdf-gl.html	108	%%PORTDOCS%%%%DOCSDIR%%/manual-mupdf-gl.html
107	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-clean.html	109	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-clean.html
108	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-convert.html	110	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-convert.html
109	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-create.html	111	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-create.html
110	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-draw.html	112	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-draw.html
111	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-extract.html	113	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-extract.html
		114	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-info.html
112	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-merge.html	115	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-merge.html
		116	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-pages.html
		117	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-poster.html
113	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-run.html	118	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-run.html
114	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-show.html	119	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-show.html
		120	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-sign.html
115	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-trace.html	121	%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-trace.html
		122	%%PORTDOCS%%%%DOCSDIR%%/mutool.html
116	%%PORTDOCS%%%%DOCSDIR%%/style.css	123	%%PORTDOCS%%%%DOCSDIR%%/style.css
117	%%PORTDOCS%%%%DOCSDIR%%/template.html
118	%%PORTDOCS%%%%DOCSDIR%%/thirdparty.html	124	%%PORTDOCS%%%%DOCSDIR%%/thirdparty.html
119	-	125	%%PORTDOCS%%%%DOCSDIR%%/viewers.html