commit b6184cba8b1a3eb64992f2a7cbeac4db0afffda2
Author: Jan Palus <[email protected]>
Date: Sat May 9 23:11:08 2020 +0200
up to 1.17.0
mupdf-shared.patch | 18 +++++++++---------
mupdf.spec | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/mupdf.spec b/mupdf.spec
index 7ead1ab..fe2a585 100644
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -1,12 +1,12 @@
Summary: MuPDF - lightweight PDF, XPS and CBZ viewer and
parser/rendering library
Summary(pl.UTF-8): MuPDF - lekka przeglądarka PDF, XPS, CBZ
Name: mupdf
-Version: 1.16.1
-Release: 2
+Version: 1.17.0
+Release: 1
License: AGPL v3+
Group: Applications/Text
Source0:
https://www.mupdf.com/downloads/archive/%{name}-%{version}-source.tar.gz
-# Source0-md5: fe6ef7a800d4283c6ca14b22e0e7f748
+# Source0-md5: f6ffcd81fcd4c57016eb630bcd617c50
Patch0: %{name}-shared.patch
URL: https://www.mupdf.com/
BuildRequires: OpenGL-glut-devel
diff --git a/mupdf-shared.patch b/mupdf-shared.patch
index 96f8b28..6172984 100644
--- a/mupdf-shared.patch
+++ b/mupdf-shared.patch
@@ -27,7 +27,7 @@
LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+LTLINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; libtool --mode=link --tag=CC $(CC)
$(LDFLAGS) -o $@ $^ $(LIBS)
+LTLINKCXX_CMD = $(QUIET_LINK) $(MKTGTDIR) ; libtool --mode=link --tag=CXX
$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
- TAGS_CMD = $(QUIET_TAGS) ctags -R
+ TAGS_CMD = $(QUIET_TAGS) ctags -R --c-kinds=+p
WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
@@ -68,6 +75,9 @@
@@ -134,9 +134,9 @@
MURASTER_OBJ := $(OUT)/source/tools/muraster.o
MURASTER_EXE := $(OUT)/muraster
- $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
-- $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS)
-+ $(LTLINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS)
+ $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
$(THREAD_LIB)
+- $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS)
++ $(LTLINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS)
TOOL_APPS += $(MURASTER_EXE)
ifeq ($(HAVE_GLUT),yes)
@@ -282,12 +282,12 @@
@@ -274,8 +274,8 @@
- THIRD_CFLAGS += $(LURATECH_CFLAGS) -DHAVE_LURATECH=1
+ THIRD_CFLAGS += $(LURATECH_CFLAGS) -DHAVE_LURATECH
-$(OUT)/thirdparty/luratech/%.o: thirdparty/luratech/%.c
-- $(CC_CMD) -DLINUX $(LURATECH_CFLAGS) -Wno-tautological-compare
-Wno-absolute-value
+- $(CC_CMD) -DLINUX $(LURATECH_CFLAGS) -Wno-tautological-compare
-Wno-absolute-value -Wno-sign-compare
+$(OUT)/thirdparty/luratech/%.lo: thirdparty/luratech/%.c
-+ $(LTCC_CMD) -DLINUX $(LURATECH_CFLAGS) -Wno-tautological-compare
-Wno-absolute-value
++ $(LTCC_CMD) -DLINUX $(LURATECH_CFLAGS) -Wno-tautological-compare
-Wno-absolute-value -Wno-sign-compare
else # HAVE_LURATECH
@@ -296,9 +296,9 @@
THIRD_CFLAGS += -Ithirdparty/jbig2dec
-$(OUT)/thirdparty/jbig2dec/%.o: thirdparty/jbig2dec/%.c
-- $(CC_CMD) -DHAVE_STDINT_H -DJBIG_EXTERNAL_MEMENTO_H=\"mupdf/memento.h\"
+- $(CC_CMD) -DHAVE_STDINT_H -DJBIG_EXTERNAL_MEMENTO_H=\"mupdf/memento.h\"
-Wno-sign-compare
+$(OUT)/thirdparty/jbig2dec/%.lo: thirdparty/jbig2dec/%.c
-+ $(LTCC_CMD) -DHAVE_STDINT_H
-DJBIG_EXTERNAL_MEMENTO_H=\"mupdf/memento.h\"
++ $(LTCC_CMD) -DHAVE_STDINT_H
-DJBIG_EXTERNAL_MEMENTO_H=\"mupdf/memento.h\" -Wno-sign-compare
endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mupdf.git/commitdiff/b6184cba8b1a3eb64992f2a7cbeac4db0afffda2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
