repair FTBFS from version specific patch

412e729 ("New release 1.11", 2017-04-11) introduced/rewrote the version
specific openjpeg patch. This breaks with every new openjpeg version due
to the changed subdir. Make it independent of that, it's in the include
path.
epel9
Michael J Gruber 7 years ago
parent 153dba2563
commit 3aae5268e0

@ -1,8 +1,8 @@
diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c diff --git i/source/fitz/load-jpx.c w/source/fitz/load-jpx.c
index d01de58..a07dbb5 100644 index d01de585..9934e47a 100644
--- a/source/fitz/load-jpx.c --- i/source/fitz/load-jpx.c
+++ b/source/fitz/load-jpx.c +++ w/source/fitz/load-jpx.c
@@ -443,15 +443,19 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int @@ -443,12 +443,15 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
} }
#else /* HAVE_LURATECH */ #else /* HAVE_LURATECH */
@ -18,13 +18,8 @@ index d01de58..a07dbb5 100644
+#endif +#endif
#define USE_JPIP #define USE_JPIP
-#include <openjpeg.h> #include <openjpeg.h>
+#include <openjpeg-2.1/openjpeg.h> @@ -920,6 +923,9 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
+
struct fz_jpxd_s
{
@@ -920,6 +924,9 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
} }
#endif /* HAVE_LURATECH */ #endif /* HAVE_LURATECH */

@ -1,6 +1,6 @@
Name: mupdf Name: mupdf
Version: 1.11 Version: 1.11
Release: 7%{?dist} Release: 8%{?dist}
Summary: A lightweight PDF viewer and toolkit Summary: A lightweight PDF viewer and toolkit
Group: Applications/Publishing Group: Applications/Publishing
License: GPLv3 License: GPLv3
@ -81,6 +81,9 @@ update-desktop-database &> /dev/null || :
%{_libdir}/lib%{name}*.a %{_libdir}/lib%{name}*.a
%changelog %changelog
* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-8
* repair FTBFS from version specific patch in 412e729 ("New release 1.11", 2017-04-11)
* Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-7 * Sat Nov 11 2017 Michael J Gruber <mjg@fedoraproject.org> - 1.11-7
- rebuild with jbig2dec 0.14 (#1456731) - rebuild with jbig2dec 0.14 (#1456731)

Loading…
Cancel
Save