Accepting request 564446 from Publishing

OBS-URL: https://build.opensuse.org/request/show/564446 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mupdf?expand=0&rev=30
2018-01-20 10:24:27 +00:00 · 2018-01-20 10:24:27 +00:00 · 2460b4f9f7
commit 2460b4f9f7
parent 582b6d4399 b5f50951b5
6 changed files with 46 additions and 76 deletions
--- a/fix-openjpeg-flags.patch
+++ b/fix-openjpeg-flags.patch
@ -1,12 +1,12 @@
-Index: mupdf-1.11-source/source/fitz/load-jpx.c
+Index: b/source/fitz/load-jpx.c
 ===================================================================
--- mupdf-1.11-source.orig/source/fitz/load-jpx.c
-+++ mupdf-1.11-source/source/fitz/load-jpx.c
-@@ -444,7 +444,6 @@ fz_load_jpx_info(fz_context *ctx, unsign
+--- a/source/fitz/load-jpx.c
+++ b/source/fitz/load-jpx.c
+@@ -445,7 +445,6 @@
 
 #else /* HAVE_LURATECH */
 
 -#define OPJ_STATIC
 #define OPJ_HAVE_INTTYPES_H
- #if !defined(_WIN32) && !defined(_WIN64)
+ #if !defined(_MSC_VER) || _MSC_VER >= 1600
 #define OPJ_HAVE_STDINT_H
--- a/mupdf-1.11-source.tar.gz
+++ b/mupdf-1.11-source.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a
-size 40156070
--- a/mupdf-1.12.0.tar.xz
+++ b/mupdf-1.12.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:577b3820c6b23d319be91e0e06080263598aa0662d9a7c50af500eb6f003322d
+size 37299040
--- a/mupdf.changes
+++ b/mupdf.changes
@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Sun Jan 14 03:11:32 UTC 2018 - avindra@opensuse.org
+
+- Update to version 1.12.0
+  * Color Management:
+    + LCMS2 library for color management
+    + CMYK rendering with overprint simulation
+    + Spot color rendering
+    + Transparency rendering fixes
+  * Structured text output improvements:
+    + Reworked structured text API
+    + Faster text searching
+    + Highlight and copy text by selecting lines instead of by
+      area
+    + New semantic XHTML output format
+    + New layout preserving HTML output format
+  * Features and improvements:
+    + Improved non-AA rendering with new scan converter
+    + Improved LARGEFILE support
+    + Improved TIFF support
+    + Improved documentation
+    + PCLm output.
+    + PSD output.
+    + New "mutool trace" tool.
+    + New "mutool sign" tool (work in progress).
+    + Text redaction (work in progress).
+    + Lots of bug fixes.
+- Strip "-source" from tarball name
+- Switch to xz release (13mb smaller)
+- rebase fix-openjpeg-flags.patch
+- drop reproducible.patch
+  * fixed upstream in 081d4c72430e3077a05499c783d9fbe24361b368
+
 -------------------------------------------------------------------
 Fri Nov 10 08:15:18 UTC 2017 - aloisio@gmx.com

--- a/mupdf.spec
+++ b/mupdf.spec
@ -1,7 +1,7 @@
 #
 # spec file for package mupdf
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 Guido Berhoerster.
 #
 # All modifications and additions to the file contributed by third parties
@ -18,18 +18,16 @@


 Name:           mupdf
-Version:        1.11
+Version:        1.12.0
 Release:        0
 Summary:        Lightweight PDF and XPS Viewer and Parser and Rendering Library
 License:        AGPL-3.0+
 Group:          Productivity/Office/Other
 Url:            https://mupdf.com/
-Source0:        https://mupdf.com/downloads/mupdf-%{version}-source.tar.gz
+Source0:        https://mupdf.com/downloads/mupdf-%{version}-source.tar.xz#/%{name}-%{version}.tar.xz
 Source1:        mupdf.desktop
 Source2:        mupdf.png
 Patch1:         fix-openjpeg-flags.patch
-# PATCH-FIX-UPSTREAM https://bugs.ghostscript.com/show_bug.cgi?id=697958
-Patch9:         reproducible.patch
 BuildRequires:  freetype-devel
 BuildRequires:  gcc-c++
 BuildRequires:  jbig2dec-devel
@ -66,12 +64,10 @@ based on mupdf.
 %prep
 %setup -q -n %{name}-%{version}-source
 %patch1 -p1
-%patch9 -p1

 # do not use the inlined copies of build dpendencies except for mujs
 rm -rf $(ls -d thirdparty/*/ | grep -v mujs)

-mkdir docs/examples
 for src in docs/*.c; do
    if [ -r "$src" ]; then
        ln -s "$src" "docs/examples/${src##*/}"
@ -120,8 +116,8 @@ install -D -p -m 644 %{SOURCE2} \
 %endif

 %files
-%doc CHANGES COPYING README docs/naming.txt docs/overview.txt
-%doc docs/progressive.txt docs/refcount.txt docs/examples/
+%doc CHANGES COPYING README 
+%doc docs/examples/
 %{_bindir}/mupdf
 %{_bindir}/mutool
 %{_datadir}/applications/mupdf.desktop
--- a/reproducible.patch
+++ b/reproducible.patch
@ -1,59 +0,0 @@
-Index: mupdf-1.11-source/Makefile
-===================================================================
--- mupdf-1.11-source.orig/Makefile
-+++ mupdf-1.11-source/Makefile
-@@ -125,14 +125,14 @@ SVG_HDR := include/mupdf/svg.h
- HTML_HDR := include/mupdf/html.h
- THREAD_HDR := include/mupdf/helpers/mu-threads.h
- 
-FITZ_SRC := $(wildcard source/fitz/*.c)
-PDF_SRC := $(wildcard source/pdf/*.c)
-XPS_SRC := $(wildcard source/xps/*.c)
-SVG_SRC := $(wildcard source/svg/*.c)
-CBZ_SRC := $(wildcard source/cbz/*.c)
-HTML_SRC := $(wildcard source/html/*.c)
-GPRF_SRC := $(wildcard source/gprf/*.c)
-THREAD_SRC := $(wildcard source/helpers/mu-threads/*.c)
-+FITZ_SRC := $(sort $(wildcard source/fitz/*.c))
-+PDF_SRC := $(sort $(wildcard source/pdf/*.c))
-+XPS_SRC := $(sort $(wildcard source/xps/*.c))
-+SVG_SRC := $(sort $(wildcard source/svg/*.c))
-+CBZ_SRC := $(sort $(wildcard source/cbz/*.c))
-+HTML_SRC := $(sort $(wildcard source/html/*.c))
-+GPRF_SRC := $(sort $(wildcard source/gprf/*.c))
-+THREAD_SRC := $(sort $(wildcard source/helpers/mu-threads/*.c))
- 
- FITZ_SRC_HDR := $(wildcard source/fitz/*.h)
- PDF_SRC_HDR := $(wildcard source/pdf/*.h) source/pdf/pdf-name-table.h
-@@ -180,11 +180,11 @@ generate: $(NAME_GEN)
- 
- HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
- 
-FONT_BIN_DROID := $(wildcard resources/fonts/droid/*.ttf)
-FONT_BIN_NOTO := $(wildcard resources/fonts/noto/*.ttf)
-FONT_BIN_HAN := $(wildcard resources/fonts/han/*.otf)
-FONT_BIN_URW := $(wildcard resources/fonts/urw/*.cff)
-FONT_BIN_SIL := $(wildcard resources/fonts/sil/*.cff)
-+FONT_BIN_DROID := $(sort $(wildcard resources/fonts/droid/*.ttf))
-+FONT_BIN_NOTO := $(sort $(wildcard resources/fonts/noto/*.ttf))
-+FONT_BIN_HAN := $(sort $(wildcard resources/fonts/han/*.otf))
-+FONT_BIN_URW := $(sort $(wildcard resources/fonts/urw/*.cff))
-+FONT_BIN_SIL := $(sort $(wildcard resources/fonts/sil/*.cff))
- 
- FONT_GEN_DROID := $(subst resources/fonts/droid/, generated/, $(addsuffix .c, $(basename $(FONT_BIN_DROID))))
- FONT_GEN_NOTO := $(subst resources/fonts/noto/, generated/, $(addsuffix .c, $(basename $(FONT_BIN_NOTO))))
-@@ -224,10 +224,10 @@ generate: $(FONT_GEN)
- 
- CMAPDUMP_EXE := $(OUT)/scripts/cmapdump.exe
- 
-CMAP_CJK_SRC := $(wildcard resources/cmaps/cjk/*)
-CMAP_EXTRA_SRC := $(wildcard resources/cmaps/extra/*)
-CMAP_UTF8_SRC := $(wildcard resources/cmaps/utf8/*)
-CMAP_UTF32_SRC := $(wildcard resources/cmaps/utf32/*)
-+CMAP_CJK_SRC := $(sort $(wildcard resources/cmaps/cjk/*))
-+CMAP_EXTRA_SRC := $(sort $(wildcard resources/cmaps/extra/*))
-+CMAP_UTF8_SRC := $(sort $(wildcard resources/cmaps/utf8/*))
-+CMAP_UTF32_SRC := $(sort $(wildcard resources/cmaps/utf32/*))
- 
- generated/gen_cmap_cjk.h : $(CMAP_CJK_SRC) | generated
- 	$(QUIET_GEN) $(CMAPDUMP_EXE) $@ $(CMAP_CJK_SRC)