Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 doc/mupdf/DETAILS                          |    8 ++---
 doc/mupdf/HISTORY                          |    5 +++
 doc/mupdf/mupdf-1.11-shared_libs-1.patch   |   43 
-----------------------------
 doc/mupdf/mupdf-1.12.0-shared_libs-1.patch |   43 
+++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 47 deletions(-)

New commits:
commit 4f8f1834a2478f0bdb2938e210df36a7e7c7ddbd
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    doc/mupdf: version 1.12.0

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index b6f6ffd..0f9caee 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,10 +1,10 @@
            SPELL=mupdf
 if [[ "${MUPDF_BRANCH}" == "rc" ]]; then
-         VERSION=1.11
-     
SOURCE_HASH=sha512:501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
+         VERSION=1.12.0
+     
SOURCE_HASH=sha512:11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
 else
-         VERSION=1.11
-     
SOURCE_HASH=sha512:501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
+         VERSION=1.12.0
+     
SOURCE_HASH=sha512:11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
 fi
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION-source.tar.gz
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 62efb31..ea40d8f 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,8 @@
+2017-12-13 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 1.12.0
+       * mupdf-1.11-shared_libs-1.patch: removed the obsolete patch
+       * mupdf-1.12.0-shared_libs-1.patch: added, inherited from above
+
 2017-04-11 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 1.11
        * mupdf-{1.10a,1.11-rc1}-shared_libs-1.patch: removed
diff --git a/doc/mupdf/mupdf-1.11-shared_libs-1.patch 
b/doc/mupdf/mupdf-1.11-shared_libs-1.patch
deleted file mode 100644
index 7cd07b5..0000000
--- a/doc/mupdf/mupdf-1.11-shared_libs-1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Generate shared libraries for mupdf, instead of static ones. 
This
-             allows to have the font information (around 35 MB) at one place
-             only, instead of in all the executables.
-diff -Naur a/Makefile b/Makefile
---- a/Makefile 2016-11-21 11:21:11.000000000 +0100
-+++ b/Makefile 2016-11-27 10:26:11.411353082 +0100
-@@ -14,7 +14,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.
--CFLAGS += $(XCFLAGS) -Iinclude -Igenerated
-+CFLAGS += $(XCFLAGS) -Iinclude -Igenerated -fPIC
- LIBS += $(XLIBS) -lm
- 
- LIBS += $(FREETYPE_LIBS)
-@@ -300,19 +300,22 @@
- 
- # --- Library ---
- 
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdfthird.a
--THREAD_LIB = $(OUT)/libmuthreads.a
-+MUPDF_LIB = $(OUT)/libmupdf.so
-+THIRD_LIB = $(OUT)/libmupdfthird.so
-+THREAD_LIB = $(OUT)/libmuthreads.so
- 
- MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) 
$(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
- THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(LIBJPEG_OBJ) 
$(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
- THREAD_OBJ := $(THREAD_OBJ)
- 
--$(MUPDF_LIB) : $(MUPDF_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB)
-+      $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
- $(THIRD_LIB) : $(THIRD_OBJ)
-+      $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so 
-Wl,--no-undefined
- $(THREAD_LIB) : $(THREAD_OBJ)
-+      $(LINK_CMD) -pthread -shared -Wl,-soname -Wl,libmuthreads.so 
-Wl,--no-undefined
- 
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
- 
- # --- Tools and Apps ---
- 
diff --git a/doc/mupdf/mupdf-1.12.0-shared_libs-1.patch 
b/doc/mupdf/mupdf-1.12.0-shared_libs-1.patch
new file mode 100644
index 0000000..dbb9059
--- /dev/null
+++ b/doc/mupdf/mupdf-1.12.0-shared_libs-1.patch
@@ -0,0 +1,43 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile 2017-12-13 17:58:02.420417776 -0500
++++ b/Makefile 2017-12-13 18:12:46.955204891 -0500
+@@ -14,7 +14,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.
+-CFLAGS += $(XCFLAGS) -Iinclude
++CFLAGS += $(XCFLAGS) -Iinclude -fPIC
+ LIBS += $(XLIBS) -lm
+ 
+ LIBS += $(FREETYPE_LIBS)
+@@ -312,9 +312,9 @@
+ 
+ # --- Library ---
+ 
+-MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdfthird.a
+-THREAD_LIB = $(OUT)/libmuthreads.a
++MUPDF_LIB = $(OUT)/libmupdf.so
++THIRD_LIB = $(OUT)/libmupdfthird.so
++THREAD_LIB = $(OUT)/libmuthreads.so
+ 
+ MUPDF_OBJ := \
+       $(FITZ_OBJ) \
+@@ -343,11 +343,14 @@
+ 
+ THREAD_OBJ := $(THREAD_OBJ)
+ 
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB)
++      $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
+ $(THIRD_LIB) : $(THIRD_OBJ)
++      $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so 
-Wl,--no-undefined
+ $(THREAD_LIB) : $(THREAD_OBJ)
+-
+-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
++      $(LINK_CMD) -pthread -shared -Wl,-soname -Wl,libmuthreads.so 
-Wl,--no-undefined
++ 
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
+ 
+ # --- Tools and Apps ---
+