Skip to Content.
Sympa Menu

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

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 (12c6130ddb18a39dc5a4a16a638fa7118d1809ab)
  • Date: Tue, 11 Apr 2017 21:37:09 +0000

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

doc/mupdf/DETAILS | 8 ++---
doc/mupdf/HISTORY | 5 +++
doc/mupdf/mupdf-1.10a-shared_libs-1.patch | 40 -------------------------
doc/mupdf/mupdf-1.11-rc1-shared_libs-1.patch | 43
---------------------------
doc/mupdf/mupdf-1.11-shared_libs-1.patch | 43
+++++++++++++++++++++++++++
5 files changed, 52 insertions(+), 87 deletions(-)

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

doc/mupdf: version 1.11

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 37c0a84..b6f6ffd 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,10 +1,10 @@
SPELL=mupdf
if [[ "${MUPDF_BRANCH}" == "rc" ]]; then
- VERSION=1.11-rc1
-
SOURCE_HASH=sha512:777385bbf6dffc29f1306fa193d40b495a331d785bbc79c835f286ff34dc1f8b55ec905bf064a0bc7ceef1950f763ba6a0a1c07039564209354fbeeadfd32b70
+ VERSION=1.11
+
SOURCE_HASH=sha512:501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
else
- VERSION=1.10a
-
SOURCE_HASH=sha512:8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec
+ VERSION=1.11
+
SOURCE_HASH=sha512:501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
fi
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.gz
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index dfb0a68..62efb31 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,8 @@
+2017-04-11 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.11
+ * mupdf-{1.10a,1.11-rc1}-shared_libs-1.patch: removed
+ * mupdf-1.11-shared_libs-1.patch: added from rc1 patch
+
2017-03-31 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS, PREPARE, PRE_BUILD, mupdf-${VERSION}-shared_libs-1.patch:
added multiversioning, updated hash for 1.11-rc1, GPL -> AGPL
diff --git a/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
b/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
deleted file mode 100644
index 14b7d3d..0000000
--- a/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
-Date: 2016-11-27
-Initial Package Version: 1.10
-Upstream Status: N/A
-Origin: Armin K and Gentoo
-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
-@@ -15,7 +15,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 -I$(GEN)
-+CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN) -fPIC
- LIBS += $(XLIBS) -lm
-
- LIBS += $(FREETYPE_LIBS)
-@@ -152,14 +152,16 @@
-
- # --- Library ---
-
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdfthird.a
-+MUPDF_LIB = $(OUT)/libmupdf.so
-+THIRD_LIB = $(OUT)/libmupdfthird.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) $(JPEG_OBJ)
$(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_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
-
- INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-
diff --git a/doc/mupdf/mupdf-1.11-rc1-shared_libs-1.patch
b/doc/mupdf/mupdf-1.11-rc1-shared_libs-1.patch
deleted file mode 100644
index 7cd07b5..0000000
--- a/doc/mupdf/mupdf-1.11-rc1-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.11-shared_libs-1.patch
b/doc/mupdf/mupdf-1.11-shared_libs-1.patch
new file mode 100644
index 0000000..7cd07b5
--- /dev/null
+++ b/doc/mupdf/mupdf-1.11-shared_libs-1.patch
@@ -0,0 +1,43 @@
+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 ---
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (12c6130ddb18a39dc5a4a16a638fa7118d1809ab), Pavel Vinogradov, 04/11/2017

Archive powered by MHonArc 2.6.24.

Top of Page