Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ddeb391f409d81332a2fece9f3ae4d13d8f98b5a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ddeb391f409d81332a2fece9f3ae4d13d8f98b5a)
  • Date: Sat, 21 Apr 2018 00:44:25 +0000

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

doc/mupdf/DETAILS | 8 ++--
doc/mupdf/HISTORY | 6 +++
doc/mupdf/mupdf-1.12.0-shared_libs-1.patch | 43
-------------------------
doc/mupdf/mupdf-1.13.0-rc1-shared_libs-1.patch | 43
-------------------------
doc/mupdf/mupdf-1.13.0-shared_libs-1.patch | 43
+++++++++++++++++++++++++
5 files changed, 53 insertions(+), 90 deletions(-)

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

doc/mupdf: version 1.13.0

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 8b1f728..0b7bd31 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,10 +1,10 @@
SPELL=mupdf
if [[ "${MUPDF_BRANCH}" == "rc" ]]; then
- VERSION=1.13.0-rc1
-
SOURCE_HASH=sha512:97a8c912d4b37b3188dd0eab7703a60739bd2360399baa8c8583993c0547dd43fb78317c39d92772fb932b77a3aaa4d6f86765f8eda44fa4a6d297f6f44cd5ed
+ VERSION=1.13.0
+
SOURCE_HASH=sha512:c40694d907bb44f18ccf276b3014867f5e0031259064d6f5f4c2bb17bcf1c6773ea0b12b5b99bc3d88bbe69b574e323c490e387e8199f796b44b76bae01f8924
else
- VERSION=1.12.0
-
SOURCE_HASH=sha512:4c9ce81e7b0e2d77e017776fd9f700bc2f695f34b7fd97be7ba113ec1b340e7046c9db7d396abf19a98b1d0c7d72f01ecc1b44fadd250d2d6c6ffdcd9799bc16
+ VERSION=1.13.0
+
SOURCE_HASH=sha512:c40694d907bb44f18ccf276b3014867f5e0031259064d6f5f4c2bb17bcf1c6773ea0b12b5b99bc3d88bbe69b574e323c490e387e8199f796b44b76bae01f8924
fi
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.xz
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 20af6b8..3b17ffa 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,9 @@
+2018-04-20 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.13.0
+ * mupdf-1.12.0-shared_libs-1.patch,
+ mupdf-1.13.0-rc1-shared_libs-1.patch: removed obsolete patches
+ * mupdf-1.13.0-shared_libs-1.patch: added, inherited from the above
+
2018-04-13 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.13.0-rc1 for rc branch, gz -> xz
* mupdf-1.13.0-rc1-shared_libs-1.patch: added corresponding patch
diff --git a/doc/mupdf/mupdf-1.12.0-shared_libs-1.patch
b/doc/mupdf/mupdf-1.12.0-shared_libs-1.patch
deleted file mode 100644
index dbb9059..0000000
--- a/doc/mupdf/mupdf-1.12.0-shared_libs-1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 ---
-
diff --git a/doc/mupdf/mupdf-1.13.0-rc1-shared_libs-1.patch
b/doc/mupdf/mupdf-1.13.0-rc1-shared_libs-1.patch
deleted file mode 100644
index e9fd8f5..0000000
--- a/doc/mupdf/mupdf-1.13.0-rc1-shared_libs-1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -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)
-@@ -325,9 +325,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
- PKCS7_LIB = $(OUT)/libmupkcs7.a
-
- MUPDF_OBJ := \
-@@ -355,12 +355,15 @@
- $(ZLIB_OBJ) \
- $(LCMS2_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
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
-
- # --- Tools and Apps ---
-
diff --git a/doc/mupdf/mupdf-1.13.0-shared_libs-1.patch
b/doc/mupdf/mupdf-1.13.0-shared_libs-1.patch
new file mode 100644
index 0000000..e9fd8f5
--- /dev/null
+++ b/doc/mupdf/mupdf-1.13.0-shared_libs-1.patch
@@ -0,0 +1,43 @@
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -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)
+@@ -325,9 +325,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
+ PKCS7_LIB = $(OUT)/libmupkcs7.a
+
+ MUPDF_OBJ := \
+@@ -355,12 +355,15 @@
+ $(ZLIB_OBJ) \
+ $(LCMS2_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
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+
+-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
+
+ # --- Tools and Apps ---
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ddeb391f409d81332a2fece9f3ae4d13d8f98b5a), Pavel Vinogradov, 04/20/2018

Archive powered by MHonArc 2.6.24.

Top of Page