mupdf 1.14.0rc1 test
This commit is contained in:
Michael J Gruber
parent
c1882bd634
commit
fb4c14274b
1
.gitignore
vendored
1
.gitignore
vendored
@ -15,3 +15,4 @@
|
||||
/mupdf-1.12.0-source.tar.gz
|
||||
/mupdf-1.13.0-rc1-source.tar.gz
|
||||
/mupdf-1.13.0-source.tar.gz
|
||||
/mupdf-1.14.0-rc1-source.tar.gz
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 6f3535a520674b757548c1c84a48150e12cbb739 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <6f3535a520674b757548c1c84a48150e12cbb739.1528633460.git.mjg@fedoraproject.org>
|
||||
From: Michael J Gruber <mjg@fedoraproject.org>
|
||||
Date: Sun, 10 Jun 2018 14:22:50 +0200
|
||||
Subject: [PATCH] Fix 699271: skip space correctly
|
||||
|
||||
Terminate skipping spaces when there is no more space or no more char.
|
||||
---
|
||||
source/pdf/pdf-xref.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
|
||||
index 8515090d..68a8783b 100644
|
||||
--- a/source/pdf/pdf-xref.c
|
||||
+++ b/source/pdf/pdf-xref.c
|
||||
@@ -647,7 +647,7 @@ fz_skip_space(fz_context *ctx, fz_stream *stm)
|
||||
do
|
||||
{
|
||||
int c = fz_peek_byte(ctx, stm);
|
||||
- if (c > 32 && c != EOF)
|
||||
+ if (c > 32 || c == EOF)
|
||||
return;
|
||||
(void)fz_read_byte(ctx, stm);
|
||||
}
|
||||
--
|
||||
2.18.0.rc1.265.g7dd663a68f
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff --git i/source/fitz/load-jpx.c w/source/fitz/load-jpx.c
|
||||
index a1c39f9f..056209a4 100644
|
||||
--- i/source/fitz/load-jpx.c
|
||||
+++ w/source/fitz/load-jpx.c
|
||||
@@ -444,6 +444,10 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w
|
||||
}
|
||||
|
||||
#else /* HAVE_LURATECH */
|
||||
+#ifdef __cplusplus
|
||||
+extern "C"
|
||||
+{
|
||||
+#endif
|
||||
|
||||
#include <openjpeg.h>
|
||||
|
||||
@@ -924,6 +928,9 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w
|
||||
}
|
||||
|
||||
#endif /* HAVE_LURATECH */
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#else /* FZ_ENABLE_JPX */
|
||||
|
||||
43
mupdf.spec
43
mupdf.spec
@ -1,13 +1,14 @@
|
||||
Name: mupdf
|
||||
Version: 1.13.0
|
||||
Release: 9%{?dist}
|
||||
Version: 1.14.0rc1
|
||||
%global origversion 1.14.0-rc1
|
||||
Release: 1%{?dist}
|
||||
Summary: A lightweight PDF viewer and toolkit
|
||||
Group: Applications/Publishing
|
||||
License: AGPLv3+
|
||||
URL: http://mupdf.com/
|
||||
Source0: http://mupdf.com/downloads/%{name}-%{version}-source.tar.gz
|
||||
Source0: http://mupdf.com/downloads/archive/%{name}-%{origversion}-source.tar.gz
|
||||
Source1: %{name}.desktop
|
||||
BuildRequires: gcc make binutils desktop-file-utils coreutils
|
||||
BuildRequires: gcc make binutils desktop-file-utils coreutils pkgconfig
|
||||
BuildRequires: openjpeg2-devel jbig2dec-devel desktop-file-utils
|
||||
BuildRequires: libjpeg-devel freetype-devel libXext-devel curl-devel
|
||||
BuildRequires: harfbuzz-devel
|
||||
@ -17,10 +18,11 @@ BuildRequires: mesa-libGL-devel mesa-libGLU-devel libXi-devel libXrandr-devel
|
||||
# to integrate Artifex's changes.
|
||||
Provides: bundled(lcms2-devel) = 2.9
|
||||
# We need to build against the Artifex fork of freeglut so that we are unicode safe.
|
||||
Provides: bundled(freeglut)-devel) = 3.0.0
|
||||
Patch0: %{name}-1.13-openjpeg.patch
|
||||
Patch1: 0001-fix-build-on-big-endian.patch
|
||||
Patch2: 0001-Fix-699271-skip-space-correctly.patch
|
||||
Provides: bundled(freeglut-devel) = 3.0.0
|
||||
# muPDF needs the muJS sources for the build even if we build against the system
|
||||
# version so bundling them is the safer choice.
|
||||
Provides: bundled(mujs-devel) = 1.0.5
|
||||
Patch0: 0001-fix-build-on-big-endian.patch
|
||||
|
||||
%description
|
||||
MuPDF is a lightweight PDF viewer and toolkit written in portable C.
|
||||
@ -48,14 +50,25 @@ The mupdf-devel package contains header files for developing
|
||||
applications that use mupdf and static libraries
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}-source
|
||||
for d in $(ls thirdparty | grep -v -e freeglut -e lcms2)
|
||||
%setup -q -n %{name}-%{origversion}-source
|
||||
for d in $(ls thirdparty | grep -v -e freeglut -e lcms2 -e mujs)
|
||||
do
|
||||
rm -rf thirdparty/$d
|
||||
done
|
||||
%patch0 -p1
|
||||
%patch1 -p1 -d thirdparty/lcms2
|
||||
%patch2 -p1
|
||||
%patch0 -p1 -d thirdparty/lcms2
|
||||
echo > user.make "\
|
||||
USE_SYSTEM_FREETYPE := yes
|
||||
USE_SYSTEM_HARFBUZZ := yes
|
||||
USE_SYSTEM_JBIG2DEC := yes
|
||||
USE_SYSTEM_JPEGXR := yes # not used without HAVE_JPEGXR
|
||||
USE_SYSTEM_LCMS2 := no # need lcms2-art fork
|
||||
USE_SYSTEM_LIBJPEG := yes
|
||||
USE_SYSTEM_MUJS := no # build needs source anyways
|
||||
USE_SYSTEM_OPENJPEG := yes
|
||||
USE_SYSTEM_ZLIB := yes
|
||||
USE_SYSTEM_GLUT := no # need freeglut2-art frok
|
||||
USE_SYSTEM_CURL := yes
|
||||
"
|
||||
|
||||
%build
|
||||
export XCFLAGS="%{optflags} -fPIC -DJBIG_NO_MEMENTO -DTOFU -DTOFU_CJK"
|
||||
@ -94,6 +107,10 @@ update-desktop-database &> /dev/null || :
|
||||
%{_libdir}/lib%{name}*.a
|
||||
|
||||
%changelog
|
||||
* Wed Sep 26 2018 Michael J Gruber <mjg@fedoraproject.org> - 1.14rc1-1
|
||||
- rc test
|
||||
- adjust to new build system setup
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (mupdf-1.13.0-source.tar.gz) = d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
|
||||
SHA512 (mupdf-1.14.0-rc1-source.tar.gz) = e31b145b7fb6490751ae3b4f0b7c4877288756f063a9313b9e4cbf8a5e5208d67e808222a284632b8521f4624a043007765d217c9b79ea44812d934143de338e
|
||||
|
||||
Loading…
Reference in New Issue
Block a user