Accepting request 212849 from home:gberh:branches:Publishing

- update to version 1.3
  * Windows RT viewer app for MuPDF.
  * Library changes to support progressive loading (display PDF
    files as they download). Windows/Linux/MacOS viewer supports
    this using curl.
  * Incremental updates to PDF files are now (optionally) preserved
    on loading/saving.
  * Prototype support for checking PDF Digital Signatures.
  * Initial annotation support (strike-out, underline, highlight
   and ink) (library and android builds only).
  * Fix operation on Android API level 8.
  * Android redraw optimisations.
  * Android app now supports Google Cloud Print.
  * Android app translated into many languages.
  * Android support for more architectures.
  * Improvements to store (avoid collisions causing unnecessary
    evictions).
  * Windows apps use Unicode filenames now.
  * PDF function handling improved; functions can now be passed to
    devices without 'sampling'.
  * PDF image handling improved; images can now be passed to
   devices without decompression.
  * Indexed images are no longer uncompressed at load time, saving
    memory.
  * Caching of rendered tiles for speed.
  * Improved text analysis mode, capable of spotting
    columns/indents, right-to-left text etc.
  * HTML output mode now includes image output.
  * PDF password encoding handling improved.
  * MuPDF now opens Jpeg, Tiff and PNG files directly.

OBS-URL: https://build.opensuse.org/request/show/212849
OBS-URL: https://build.opensuse.org/package/show/Publishing/mupdf?expand=0&rev=12

mupdf-1.2-source.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b
-size 13808821

mupdf-1.3-source.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478
+size 14594969

mupdf-fix-openjpeg2.patch

@@ -0,0 +1,15 @@
+Index: mupdf-1.3-source/Makerules
+===================================================================
+--- mupdf-1.3-source.orig/Makerules
++++ mupdf-1.3-source/Makerules
+@@ -62,8 +62,8 @@ SYS_X11_LIBS = $(shell pkg-config --libs
+ 
+ SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
+ SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
+-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
+-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
++SYS_OPENJPEG_CFLAGS = -I/usr/include/openjpeg-2.0
++SYS_OPENJPEG_LIBS = -lopenjp2
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz

mupdf.changes

@@ -1,3 +1,47 @@
+-------------------------------------------------------------------
+Sat Jan  4 20:08:44 UTC 2014 - gber@opensuse.org
+
+- update to version 1.3
+  * Windows RT viewer app for MuPDF.
+  * Library changes to support progressive loading (display PDF
+    files as they download). Windows/Linux/MacOS viewer supports
+    this using curl.
+  * Incremental updates to PDF files are now (optionally) preserved
+    on loading/saving.
+  * Prototype support for checking PDF Digital Signatures.
+  * Initial annotation support (strike-out, underline, highlight
+   and ink) (library and android builds only).
+  * Fix operation on Android API level 8.
+  * Android redraw optimisations.
+  * Android app now supports Google Cloud Print.
+  * Android app translated into many languages.
+  * Android support for more architectures.
+  * Improvements to store (avoid collisions causing unnecessary
+    evictions).
+  * Windows apps use Unicode filenames now.
+  * PDF function handling improved; functions can now be passed to
+    devices without 'sampling'.
+  * PDF image handling improved; images can now be passed to
+   devices without decompression.
+  * Indexed images are no longer uncompressed at load time, saving
+    memory.
+  * Caching of rendered tiles for speed.
+  * Improved text analysis mode, capable of spotting
+    columns/indents, right-to-left text etc.
+  * HTML output mode now includes image output.
+  * PDF password encoding handling improved.
+  * MuPDF now opens Jpeg, Tiff and PNG files directly.
+  * Bug preventing OpenXPS files from being opened fixed.
+  * Initial (feature incomplete) SVG and PDF output devices.
+  * PWG raster (mono/grey/RGB) and PCL (mono) output devices.
+  * Various performance improvements (including tilings and mesh
+    based shadings).
+  * Revamped directory structure to reflect recent changes.
+  * Various potential SEGV, SoftMask and rendering fixes.
+  * Many potential crashes in Jpeg2000 and JBIG2 images fixed.
+- restore desktop file and icon which were dropped by upstream
+- build with support for progressive rendering via libcurl
+
 -------------------------------------------------------------------
 Wed Jun 12 16:58:48 UTC 2013 - dvaleev@suse.com
 

mupdf.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=MuPDF
+GenericName=PDF file viewer
+Comment=PDF file viewer
+Exec=mupdf %f
+Icon=mupdf
+Terminal=true
+Type=Application
+MimeType=application/pdf;application/x-pdf;
+Categories=Viewer;Graphics;
+NoDisplay=true

mupdf.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56a4fe7f311db9e93fbca7ed4374533c7369cdb090b007b5b3dc6ba7b94f0a4d
+size 3009

mupdf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mupdf
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 Guido Berhoerster.
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,19 +18,23 @@
 
 
 Name:           mupdf
-Version:        1.2
+Version:        1.3
 Release:        0
 Summary:        Lightweight PDF and XPS Viewer and Parser and Rendering Library
 License:        AGPL-3.0+
 Group:          Productivity/Office/Other
 Url:            http://mupdf.com/
-Source:         http://mupdf.googlecode.com/files/mupdf-%{version}-source.zip
+Source0:        http://mupdf.googlecode.com/files/mupdf-%{version}-source.tar.gz
+Source1:        mupdf.desktop
+Source2:        mupdf.png
+# PATCH-FIX-OPENSUSE mupdf-fix-openjpeg2.patch gber@opensuse.org -- Fix cflags, libs of openjpeg2 on openSUSE
+Patch0:         mupdf-fix-openjpeg2.patch
 BuildRequires:  freetype-devel
 BuildRequires:  gcc-c++
 BuildRequires:  jbig2dec-devel
+BuildRequires:  libcurl-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  openjpeg-devel
+BuildRequires:  openjpeg2-devel
-BuildRequires:  unzip
 BuildRequires:  update-desktop-files
 BuildRequires:  v8-devel
 BuildRequires:  v8-private-headers-devel
@@ -64,29 +68,43 @@ based on mupdf.
 
 %prep
 %setup -q -n %{name}-%{version}-source
+
 # do not use the inlined copies of build dpendencies
 rm -rf thirdparty
 
+%patch0 -p1
+
+mkdir docs/examples
+for src in docs/*.c; do
+    if [ -r "$src" ]; then
+        ln -s "$src" "docs/examples/${src##*/}"
+    fi
+done
+
 %build
 # do no set CFLAGS which is used by the build system itself!
-export XCFLAGS="%{optflags} -fPIC"
+export XCFLAGS="%{optflags} -fPIC -pthread"
-make %{?_smp_mflags} verbose=1
+make %{?_smp_mflags} \
-ls -1 build/debug
+    verbose=1 \
+    NOCURL= \
+    CURL_CFLAGS="$(pkg-config --libs libcurl)" \
+    CURL_LIBS=" -pthread $(pkg-config --libs libcurl)"
 
 %install
 %make_install prefix=%{_prefix} libdir=%{_libdir}
-# mutool is missing from the install target
-install -p -m 755 build/debug/mutool %{buildroot}%{_bindir}/mutool
 
-chmod 0644 %{buildroot}%{_includedir}/*.h \
+mv %{buildroot}%{_bindir}/mupdf-x11 %{buildroot}%{_bindir}/mupdf
+
+rm -rf %{buildroot}%{_datadir}/doc/
+
+chmod 0644 %{buildroot}%{_includedir}/mupdf/*.h \
+    %{buildroot}%{_includedir}/mupdf/*/*.h \
     %{buildroot}%{_libdir}/*.a \
     %{buildroot}%{_mandir}/man1/*
 
-sed -e '/^Type=/aNoDisplay=true' -e '/\[Desktop Action View\]/,$d' \
+install -D -p -m 644 %{SOURCE1} \
-    debian/mupdf.desktop > debian/mupdf.desktop.new
-install -D -p -m 644 debian/mupdf.desktop.new \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
-install -D -p -m 644 debian/mupdf.png \
+install -D -p -m 644 %{SOURCE2} \
     %{buildroot}%{_datadir}/pixmaps/%{name}.png
 %suse_update_desktop_file mupdf
 
@@ -98,7 +116,8 @@ install -D -p -m 644 debian/mupdf.png \
 
 %files
 %defattr(-,root,root)
-%doc README COPYING
+%doc CHANGES COPYING README docs/naming.txt docs/overview.txt
+%doc docs/progressive.txt docs/refcount.txt docs/examples/
 %{_bindir}/mupdf
 %{_bindir}/mudraw
 %{_bindir}/mutool
@@ -108,7 +127,8 @@ install -D -p -m 644 debian/mupdf.png \
 
 %files devel-static
 %defattr(-,root,root,-)
-%{_includedir}/*.h
+%{_includedir}/mupdf/
-%{_libdir}/libfitz.a
+%{_libdir}/libmupdf.a
+%{_libdir}/libmupdf-js-none.a
 
 %changelog