diff options
Diffstat (limited to 'office/mupdf/shared_libs.diff')
| -rw-r--r-- | office/mupdf/shared_libs.diff | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/office/mupdf/shared_libs.diff b/office/mupdf/shared_libs.diff index 465028f632..8d8204b67b 100644 --- a/office/mupdf/shared_libs.diff +++ b/office/mupdf/shared_libs.diff @@ -1,7 +1,7 @@ -diff -Naur mupdf-1.13.0-source/Makefile mupdf-1.13.0-source.patched/Makefile ---- mupdf-1.13.0-source/Makefile 2018-04-12 09:14:06.000000000 -0400 -+++ mupdf-1.13.0-source.patched/Makefile 2018-06-23 15:24:50.242018433 -0400 -@@ -14,7 +14,7 @@ +diff -Naur mupdf-1.16.1-source/Makefile mupdf-1.16.1-source.patched/Makefile +--- mupdf-1.16.1-source/Makefile 2019-08-02 10:49:26.000000000 -0400 ++++ mupdf-1.16.1-source.patched/Makefile 2020-02-17 22:15:13.596704068 -0500 +@@ -20,7 +20,7 @@ # Do not specify CFLAGS or LIBS on the make invocation line - specify # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that # set a variable that was set on the command line. @@ -9,42 +9,36 @@ diff -Naur mupdf-1.13.0-source/Makefile mupdf-1.13.0-source.patched/Makefile +CFLAGS += $(XCFLAGS) -Iinclude -fPIC LIBS += $(XLIBS) -lm - LIBS += $(FREETYPE_LIBS) -@@ -325,10 +325,10 @@ + ifneq ($(threading),no) +@@ -189,17 +189,21 @@ # --- Library --- -MUPDF_LIB = $(OUT)/libmupdf.a --THIRD_LIB = $(OUT)/libmupdfthird.a --THREAD_LIB = $(OUT)/libmuthreads.a --PKCS7_LIB = $(OUT)/libmupkcs7.a +-THIRD_LIB = $(OUT)/libmupdf-third.a +-THREAD_LIB = $(OUT)/libmupdf-threads.a +-PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a +MUPDF_LIB = $(OUT)/libmupdf.so -+THIRD_LIB = $(OUT)/libmupdfthird.so -+THREAD_LIB = $(OUT)/libmuthreads.so -+PKCS7_LIB = $(OUT)/libmupkcs7.so - - MUPDF_OBJ := \ - $(FITZ_OBJ) \ -@@ -355,12 +355,16 @@ - $(ZLIB_OBJ) \ - $(LCMS2_OBJ) ++THIRD_LIB = $(OUT)/libmupdf-third.so ++THREAD_LIB = $(OUT)/libmupdf-threads.so ++PKCS7_LIB = $(OUT)/libmupdf-pkcs7.so -$(MUPDF_LIB) : $(MUPDF_OBJ) +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOMAJOR) -Wl,--no-undefined ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(SOMAJOR) -Wl,--no-undefined $(THIRD_LIBS) $(THIRD_LIB) : $(THIRD_OBJ) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so.$(SOMAJOR) -Wl,--no-undefined ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so.$(SOMAJOR) -Wl,--no-undefined $(THREAD_LIB) : $(THREAD_OBJ) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so.$(SOMAJOR) -Wl,--no-undefined -lpthread ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so.$(SOMAJOR) -Wl,--no-undefined -lpthread $(PKCS7_LIB) : $(PKCS7_OBJ) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupkcs7.so.$(SOMAJOR) ++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupfs-pkcs7.so.$(SOMAJOR) -INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) +INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) - # --- Tools and Apps --- + # --- Main tools and viewers --- -@@ -444,6 +448,14 @@ +@@ -294,6 +298,14 @@ VERSION = $(shell git describe --tags) @@ -59,11 +53,11 @@ diff -Naur mupdf-1.13.0-source/Makefile mupdf-1.13.0-source.patched/Makefile version: sed -i~ -e '/FZ_VERSION /s/".*"/"'$(VERSION)'"/' include/mupdf/fitz/version.h -@@ -482,7 +494,13 @@ - install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf +@@ -331,7 +343,13 @@ + install -m 644 include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf install -d $(DESTDIR)$(libdir) -- install $(INSTALL_LIBS) $(DESTDIR)$(libdir) +- install -m 644 $(INSTALL_LIBS) $(DESTDIR)$(libdir) + install -s -m0755 $(INSTALL_LIBS) $(DESTDIR)$(libdir) + ( cd $(DESTDIR)$(libdir) ; \ + for i in $(INSTALL_LIBS); do \ @@ -73,4 +67,4 @@ diff -Naur mupdf-1.13.0-source/Makefile mupdf-1.13.0-source.patched/Makefile + done ) install -d $(DESTDIR)$(bindir) - install $(INSTALL_APPS) $(DESTDIR)$(bindir) + install -m 755 $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir) |