up to 1.15.0

diff --git a/mupdf-shared.patch b/mupdf-shared.patch
index b1b4692170e0220493be3c51b21d02871947bff1..e0a8a4683c317fff7f1f7375cd0655f8e1852d83 100644 (file)
--- a/mupdf-shared.patch
+++ b/mupdf-shared.patch
@@ -1,5 +1,5 @@
---- mupdf-1.14.0-source/Makefile.orig  2018-10-04 11:19:28.000000000 +0200
-+++ mupdf-1.14.0-source/Makefile       2018-10-16 21:33:57.902407170 +0200
+--- mupdf-1.15.0-source/Makefile.orig  2019-05-06 13:53:09.000000000 +0200
++++ mupdf-1.15.0-source/Makefile       2019-07-04 01:42:59.715191269 +0200
 @@ -41,9 +41,12 @@
    QUIET_AR = @ echo "    AR $@" ;
    QUIET_RANLIB = @ echo "    RANLIB $@" ;
@@ -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 $^
+ TAGS_CMD = $(QUIET_TAGS) ctags -R
  WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
  OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
 @@ -68,6 +75,9 @@
@@ -40,7 +40,7 @@
  $(OUT)/%.exe: %.c
        $(LINK_CMD)
  
-@@ -93,13 +103,16 @@
+@@ -90,13 +100,16 @@
        $(CC_CMD) -Wall $(THIRD_CFLAGS) $(GLUT_CFLAGS)
  
  ifeq ($(HAVE_OBJCOPY),yes)
@@ -59,7 +59,7 @@
  $(OUT)/platform/%.o : platform/%.c
        $(CC_CMD) -Wall
  
-@@ -107,12 +120,13 @@
+@@ -104,12 +117,13 @@
        $(WINDRES_CMD)
  
  .PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
@@ -75,7 +75,7 @@
  
  MUPDF_SRC := $(sort $(wildcard source/fitz/*.c))
  MUPDF_SRC += $(sort $(wildcard source/pdf/*.c))
-@@ -122,7 +136,7 @@
+@@ -119,7 +133,7 @@
  MUPDF_SRC += $(sort $(wildcard source/cbz/*.c))
  MUPDF_SRC += $(sort $(wildcard source/gprf/*.c))
  
@@ -84,7 +84,7 @@
  
  THREAD_SRC := source/helpers/mu-threads/mu-threads.c
  THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.o)
-@@ -150,13 +164,13 @@
+@@ -147,13 +161,13 @@
  generated/%.ttc.c : %.ttc $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_EXE) -s $@ $<
  
  ifeq ($(HAVE_OBJCOPY),yes)
@@ -100,7 +100,7 @@
  endif
  
  generate: $(FONT_GEN)
-@@ -190,17 +204,18 @@
+@@ -187,17 +201,18 @@
  
  # --- Library ---
  
@@ -124,75 +124,50 @@
  
  # --- Main tools and viewers ---
  
-@@ -214,7 +228,7 @@
+@@ -211,13 +226,13 @@
  MUTOOL_OBJ := $(MUTOOL_SRC:%.c=$(OUT)/%.o)
  MUTOOL_EXE := $(OUT)/mutool
  $(MUTOOL_EXE) : $(MUTOOL_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)
- INSTALL_APPS += $(MUTOOL_EXE)
+ TOOL_APPS += $(MUTOOL_EXE)
+ 
+ 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)
+ TOOL_APPS += $(MURASTER_EXE)
  
  ifeq ($(HAVE_GLUT),yes)
-@@ -222,7 +236,7 @@
+@@ -225,7 +240,7 @@
    MUVIEW_GLUT_OBJ := $(MUVIEW_GLUT_SRC:%.c=$(OUT)/%.o)
    MUVIEW_GLUT_EXE := $(OUT)/mupdf-gl
    $(MUVIEW_GLUT_EXE) : $(MUVIEW_GLUT_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(GLUT_LIB)
 -      $(LINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS) $(WIN32_LDFLAGS) $(GLUT_LIBS)
 +      $(LTLINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS) $(WIN32_LDFLAGS) $(GLUT_LIBS)
-   INSTALL_APPS += $(MUVIEW_GLUT_EXE)
+   VIEW_APPS += $(MUVIEW_GLUT_EXE)
  endif
  
-@@ -232,7 +246,7 @@
+@@ -235,7 +250,7 @@
    MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_main.o
    MUVIEW_X11_OBJ += $(OUT)/platform/x11/x11_image.o
    $(MUVIEW_X11_EXE) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
 -      $(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS)
 +      $(LTLINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS)
-   INSTALL_APPS += $(MUVIEW_X11_EXE)
+   VIEW_APPS += $(MUVIEW_X11_EXE)
  endif
  
-@@ -242,7 +256,7 @@
+@@ -245,7 +260,7 @@
    MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_main.o
    MUVIEW_WIN32_OBJ += $(OUT)/platform/x11/win_res.o
    $(MUVIEW_WIN32_EXE) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
 -      $(LINK_CMD) $(THIRD_LIBS) $(WIN32_LDFLAGS) $(WIN32_LIBS) $(LIBCRYPTO_LIBS)
 +      $(LTLINK_CMD) $(THIRD_LIBS) $(WIN32_LDFLAGS) $(WIN32_LIBS) $(LIBCRYPTO_LIBS)
-   INSTALL_APPS += $(MUVIEW_WIN32_EXE)
+   VIEW_APPS += $(MUVIEW_WIN32_EXE)
  endif
  
-@@ -251,19 +265,19 @@
- 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)
- EXTRA_APPS += $(MURASTER_EXE)
- 
- MJSGEN_OBJ := $(OUT)/source/tools/mjsgen.o
- MJSGEN_EXE := $(OUT)/mjsgen
- $(MJSGEN_EXE) : $(MJSGEN_OBJ) $(MUPDF_LIB) $(THIRD_LIB)
--      $(LINK_CMD) $(THIRD_LIBS)
-+      $(LTLINK_CMD) $(THIRD_LIBS)
- EXTRA_APPS += $(MJSGEN_EXE)
- 
- MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
- MUJSTEST_EXE := $(OUT)/mujstest
- $(MUJSTEST_EXE) : $(MUJSTEST_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
--      $(LINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS)
-+      $(LTLINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS)
- EXTRA_APPS += $(MUJSTEST_EXE)
- 
- ifeq ($(HAVE_X11),yes)
-@@ -274,7 +288,7 @@
-   MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/x11_image.o
-   MUVIEW_X11_CURL_OBJ += $(OUT)/platform/x11/curl/curl_stream.o
-   $(MUVIEW_X11_CURL_EXE) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(CURL_LIB)
--      $(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(CURL_LIBS) $(LIBCRYPTO_LIBS)
-+      $(LTLINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(CURL_LIBS) $(LIBCRYPTO_LIBS)
-   EXTRA_APPS += $(MUVIEW_X11_CURL_EXE)
- endif
- endif
-@@ -299,9 +313,9 @@
+@@ -267,9 +282,9 @@
  # --- Examples ---
  
  $(OUT)/example: docs/examples/example.c $(MUPDF_LIB) $(THIRD_LIB)
@@ -204,19 +179,19 @@
  
  # --- Update version string header ---
  
-@@ -345,10 +359,10 @@
-       install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
+@@ -312,10 +327,10 @@
+       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)
 +      libtool --mode=install install $(INSTALL_LIBS) $(DESTDIR)$(libdir)
  
        install -d $(DESTDIR)$(bindir)
--      install $(INSTALL_APPS) $(DESTDIR)$(bindir)
-+      libtool --mode=install install $(INSTALL_APPS) $(DESTDIR)$(bindir)
+-      install -m 755 $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
++      libtool --mode=install install $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
  
        install -d $(DESTDIR)$(mandir)/man1
-       install docs/man/*.1 $(DESTDIR)$(mandir)/man1
+       install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1
 --- mupdf-1.14.0-source/Makethird.orig 2018-10-04 11:19:28.000000000 +0200
 +++ mupdf-1.14.0-source/Makethird      2018-10-16 22:01:41.962388169 +0200
 @@ -52,8 +52,8 @@

diff --git a/mupdf.spec b/mupdf.spec
index 2851121aa0af5f9c4f3997dfbcc6b7b5b48c4876..26fe61ca2d1cf9fd317069c3e52dec38e49998d8 100644 (file)
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -1,30 +1,28 @@
 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.14.0
-Release:       3
+Version:       1.15.0
+Release:       1
 License:       AGPL v3+
 Group:         Applications/Text
 Source0:       https://www.mupdf.com/downloads/archive/%{name}-%{version}-source.tar.gz
-# Source0-md5: 98adc2f430cc7900397ab50a478485c5
+# Source0-md5: e9f1d47108e4e9151666c56ecad47fc9
 Patch0:                %{name}-shared.patch
 URL:           https://www.mupdf.com/
 BuildRequires: OpenGL-glut-devel
-BuildRequires: curl-devel >= 7.51.0
 BuildRequires: freetype-devel >= 1:2.9.1
 BuildRequires: harfbuzz-devel >= 1.9.0
 BuildRequires: jbig2dec-devel >= 0.14
 BuildRequires: libjpeg-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
-BuildRequires: mujs-devel >= 1.0.4
+BuildRequires: mujs-devel >= 1.0.6
 BuildRequires: openjpeg2-devel >= 2.3.0
 BuildRequires: openssl-devel >= 1.1.0
 BuildRequires: pkgconfig
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: zlib-devel >= 1.2.11
-Requires:      curl-libs >= 7.51.0
 Requires:      freetype >= 1:2.9.1
 Requires:      harfbuzz >= 1.9.0
 Requires:      jbig2dec >= 0.14
@@ -44,7 +42,7 @@ Summary(pl.UTF-8):    Biblioteki współdzielone MuPDF
 Group:         Libraries
 Requires:      freetype >= 1:2.9.1
 Requires:      jbig2dec >= 0.14
-Requires:      mujs
+Requires:      mujs >= 1.0.6
 Requires:      openjpeg2
 Requires:      openssl >= 1.1.0
 Requires:      zlib >= 1.2.11
@@ -64,7 +62,7 @@ Requires:     freetype-devel >= 1:2.9.1
 Requires:      jbig2dec-devel >= 0.14
 Requires:      libjpeg-devel
 Requires:      libstdc++-devel
-Requires:      mujs-devel >= 1.0.4
+Requires:      mujs-devel >= 1.0.6
 Requires:      openjpeg2-devel >= 2.3.0
 Requires:      openssl-devel >= 1.1.0
 Requires:      zlib-devel >= 1.2.11
@@ -92,7 +90,6 @@ Statyczne biblioteki MuPDF.
 %patch0 -p1
 
 # use system libs instead:
-# curl 7.51.0
 # freetype 2.9.1
 # harfbuzz 1.9.0 + git update (nothing crucial)
 # jbig2dec 0.14
@@ -100,7 +97,7 @@ Statyczne biblioteki MuPDF.
 # mujs ?
 # openjpeg 2.3.0
 # zlib 1.2.11
-%{__rm} -r thirdparty/{curl,freetype,jbig2dec,libjpeg,mujs,openjpeg,zlib}
+%{__rm} -r thirdparty/{freetype,jbig2dec,libjpeg,mujs,openjpeg,zlib}
 # but keep:
 # freeglut - 3.0.0 + some additional keyboard and clipboard APIs
 # lcms2 - "art" fork with tread safety
@@ -143,6 +140,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES CONTRIBUTORS README docs/{index,manual*,thirdparty}.html
 %attr(755,root,root) %{_bindir}/mupdf-gl
 %attr(755,root,root) %{_bindir}/mupdf-x11
+%attr(755,root,root) %{_bindir}/muraster
 %attr(755,root,root) %{_bindir}/mutool
 %{_mandir}/man1/mupdf.1*
 %{_mandir}/man1/mutool.1*