From bbe255ff481f0eeae8124b3abd6ad7353d03fd12 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 3 Oct 2020 21:13:40 +0200 Subject: [PATCH] mupdf 1.18.0-rc1 test --- .gitignore | 1 + ...sh-when-using-openssl-for-digital-si.patch | 27 -------- 0001-fix-build-on-big-endian.patch | 56 ++++++++++------ 0001-fix-build-with-gcc-10.patch | 66 ------------------- mupdf.spec | 20 +++--- sources | 2 +- 6 files changed, 48 insertions(+), 124 deletions(-) delete mode 100644 0001-Fix-possible-crash-when-using-openssl-for-digital-si.patch delete mode 100644 0001-fix-build-with-gcc-10.patch diff --git a/.gitignore b/.gitignore index 3d30901..ae216e9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /mupdf-1.15.0-source.tar.gz /mupdf-1.16.1-source.tar.gz /mupdf-1.17.0-source.tar.gz +/mupdf-1.18.0-rc1-source.tar.gz diff --git a/0001-Fix-possible-crash-when-using-openssl-for-digital-si.patch b/0001-Fix-possible-crash-when-using-openssl-for-digital-si.patch deleted file mode 100644 index 0d80397..0000000 --- a/0001-Fix-possible-crash-when-using-openssl-for-digital-si.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a38556c13b132c2e3b275fac0d2e2f0f32895036 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Paul Gardiner -Date: Tue, 12 May 2020 17:21:18 +0100 -Subject: [PATCH] Fix possible crash when using openssl for digital signature - support. - ---- - source/helpers/pkcs7/pkcs7-openssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/helpers/pkcs7/pkcs7-openssl.c b/source/helpers/pkcs7/pkcs7-openssl.c -index dfb99bb8c..a0a15fbd5 100644 ---- a/source/helpers/pkcs7/pkcs7-openssl.c -+++ b/source/helpers/pkcs7/pkcs7-openssl.c -@@ -606,7 +606,7 @@ static char *x509_get_name_entry_string(fz_context *ctx, X509_NAME *name, int ni - int idx = X509_NAME_get_index_by_NID(name, nid, -1); - X509_NAME_ENTRY *entry = X509_NAME_get_entry(name, idx); - ASN1_STRING *data = X509_NAME_ENTRY_get_data(entry); -- return fz_strdup(ctx, (const char *)ASN1_STRING_get0_data(data)); -+ return data ? fz_strdup(ctx, (const char *)ASN1_STRING_get0_data(data)) : NULL; - } - - static pdf_pkcs7_designated_name *x509_designated_name(fz_context *ctx, X509 *x509) --- -2.27.0.rc1.210.gb37d18b052 - diff --git a/0001-fix-build-on-big-endian.patch b/0001-fix-build-on-big-endian.patch index d52de37..6780bae 100644 --- a/0001-fix-build-on-big-endian.patch +++ b/0001-fix-build-on-big-endian.patch @@ -1,5 +1,5 @@ -From ea2fba125c79be72d339b49aa83bde88103ce68c Mon Sep 17 00:00:00 2001 -Message-Id: +From 070c4d03de2a75f387aab0107314b503834e60fa Mon Sep 17 00:00:00 2001 +Message-Id: <070c4d03de2a75f387aab0107314b503834e60fa.1601760275.git.mjg@fedoraproject.org> From: Michael J Gruber Date: Sun, 3 Jun 2018 17:55:46 +0200 Subject: [PATCH] fix build on big endian @@ -13,11 +13,25 @@ again. Signed-off-by: Michael J Gruber --- - src/cmsmd5.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) + include/lcms2mt_plugin.h | 2 +- + src/cmsmd5.c | 18 +++++++++--------- + 2 files changed, 10 insertions(+), 10 deletions(-) +diff --git a/include/lcms2mt_plugin.h b/include/lcms2mt_plugin.h +index fad1724..f480858 100644 +--- a/include/lcms2mt_plugin.h ++++ b/include/lcms2mt_plugin.h +@@ -97,7 +97,7 @@ CMSAPI void CMSEXPORT _cmsMAT3eval(cmsContext ContextID, cmsVEC3* + // MD5 low level ------------------------------------------------------------------------------------- + + CMSAPI cmsHANDLE CMSEXPORT cmsMD5alloc(cmsContext ContextID); +-CMSAPI void CMSEXPORT cmsMD5add(cmsHANDLE Handle, const cmsUInt8Number* buf, cmsUInt32Number len); ++CMSAPI void CMSEXPORT cmsMD5add(cmsContext ContextID, cmsHANDLE Handle, const cmsUInt8Number* buf, cmsUInt32Number len); + CMSAPI void CMSEXPORT cmsMD5finish(cmsContext ContextID, cmsProfileID* ProfileID, cmsHANDLE Handle); + + // Error logging ------------------------------------------------------------------------------------- diff --git a/src/cmsmd5.c b/src/cmsmd5.c -index d3017ab..75caacb 100644 +index 6104304..11f65d1 100644 --- a/src/cmsmd5.c +++ b/src/cmsmd5.c @@ -29,7 +29,7 @@ @@ -38,40 +52,40 @@ index d3017ab..75caacb 100644 #endif -@@ -169,7 +169,7 @@ cmsHANDLE MD5alloc(cmsContext ContextID) - +@@ -166,7 +166,7 @@ cmsHANDLE CMSEXPORT cmsMD5alloc(cmsContext ContextID) + return (cmsHANDLE) ctx; + } - static --void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) -+void MD5add(cmsContext ContextID, cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) +-void CMSEXPORT cmsMD5add(cmsHANDLE Handle, const cmsUInt8Number* buf, cmsUInt32Number len) ++void CMSEXPORT cmsMD5add(cmsContext ContextID, cmsHANDLE Handle, const cmsUInt8Number* buf, cmsUInt32Number len) { _cmsMD5* ctx = (_cmsMD5*) Handle; cmsUInt32Number t; -@@ -193,7 +193,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) +@@ -190,7 +190,7 @@ void CMSEXPORT cmsMD5add(cmsHANDLE Handle, const cmsUInt8Number* buf, cmsUInt32N } memmove(p, buf, t); - byteReverse(ctx->in, 16); + byteReverse(ContextID, ctx->in, 16); - MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); + cmsMD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); buf += t; -@@ -202,7 +202,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) +@@ -199,7 +199,7 @@ void CMSEXPORT cmsMD5add(cmsHANDLE Handle, const cmsUInt8Number* buf, cmsUInt32N while (len >= 64) { memmove(ctx->in, buf, 64); - byteReverse(ctx->in, 16); + byteReverse(ContextID, ctx->in, 16); - MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); + cmsMD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); buf += 64; len -= 64; -@@ -229,21 +229,21 @@ void MD5finish(cmsContext ContextID, cmsProfileID* ProfileID, cmsHANDLE Handle) +@@ -225,21 +225,21 @@ void CMSEXPORT cmsMD5finish(cmsContext ContextID, cmsProfileID* ProfileID, cmsH if (count < 8) { memset(p, 0, count); - byteReverse(ctx->in, 16); + byteReverse(ContextID, ctx->in, 16); - MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); + cmsMD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); memset(ctx->in, 0, 56); } else { @@ -83,22 +97,22 @@ index d3017ab..75caacb 100644 ((cmsUInt32Number *) ctx->in)[14] = ctx->bits[0]; ((cmsUInt32Number *) ctx->in)[15] = ctx->bits[1]; - MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); + cmsMD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); - byteReverse((cmsUInt8Number *) ctx->buf, 4); + byteReverse(ContextID, (cmsUInt8Number *) ctx->buf, 4); memmove(ProfileID ->ID8, ctx->buf, 16); _cmsFree(ContextID, ctx); -@@ -288,7 +288,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile) +@@ -284,7 +284,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile) if (MD5 == NULL) goto Error; // Add all bytes -- MD5add(MD5, Mem, BytesNeeded); -+ MD5add(ContextID,MD5, Mem, BytesNeeded); +- cmsMD5add(MD5, Mem, BytesNeeded); ++ cmsMD5add(ContextID, MD5, Mem, BytesNeeded); // Temp storage is no longer needed _cmsFree(ContextID, Mem); -- -2.21.0.1043.g4a4bfeb487 +2.28.0.945.gedc4c61efd diff --git a/0001-fix-build-with-gcc-10.patch b/0001-fix-build-with-gcc-10.patch deleted file mode 100644 index 7ca64d1..0000000 --- a/0001-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 33349b6cebcca0ac9db79177c046fa153c073470 Mon Sep 17 00:00:00 2001 -Message-Id: <33349b6cebcca0ac9db79177c046fa153c073470.1580897265.git.mjg@fedoraproject.org> -From: Michael J Gruber -Date: Wed, 5 Feb 2020 11:07:38 +0100 -Subject: [PATCH] fix build with gcc 10 - -gcc 10 uses -fno-common by default, so that mupdf fails to build: the -linker raises "multiple definition" errors the the definitions in -fg_gl2.h which were supposed to be declarations. Mark them as such and -move the definition to fg_gl2.c. - -Signed-off-by: Michael J Gruber ---- - src/fg_gl2.c | 10 ++++++++++ - src/fg_gl2.h | 14 +++++++------- - 2 files changed, 17 insertions(+), 7 deletions(-) - -diff --git a/src/fg_gl2.c b/src/fg_gl2.c -index 38b0acb..a9ccdf1 100644 ---- a/src/fg_gl2.c -+++ b/src/fg_gl2.c -@@ -27,6 +27,16 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifndef GL_ES_VERSION_2_0 -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; -diff --git a/src/fg_gl2.h b/src/fg_gl2.h -index ab8ba5c..fb3d467 100644 ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif - --- -2.25.0.231.gf1b37f75f4 - diff --git a/mupdf.spec b/mupdf.spec index f1e4437..4e2f78e 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -4,19 +4,21 @@ %global jbig2dec_version 0.19 Name: mupdf -Version: 1.17.0 -Release: 4%{?dist} +Version: 1.18.0rc1 +%global origversion 1.18.0-rc1 +Release: 1%{?dist} Summary: A lightweight PDF viewer and toolkit License: AGPLv3+ URL: http://mupdf.com/ -Source0: http://mupdf.com/downloads/archive/%{name}-%{version}-source.tar.gz +Source0: http://mupdf.com/downloads/archive/%{name}-%{origversion}-source.tar.gz Source1: %{name}.desktop Source2: %{name}-gl.desktop -BuildRequires: gcc make binutils desktop-file-utils coreutils pkgconfig +BuildRequires: gcc gcc-c++ make binutils desktop-file-utils coreutils pkgconfig BuildRequires: openjpeg2-devel desktop-file-utils BuildRequires: libjpeg-devel freetype-devel libXext-devel curl-devel BuildRequires: harfbuzz-devel openssl-devel mesa-libEGL-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel libXi-devel libXrandr-devel +BuildRequires: gumbo-parser-devel BuildRequires: jbig2dec-devel = %{jbig2dec_version} BuildRequires: jbig2dec-libs = %{jbig2dec_version} Requires: jbig2dec-libs = %{jbig2dec_version} @@ -30,8 +32,6 @@ Provides: bundled(freeglut-devel) = 3.0.0 # version so bundling them is the safer choice. Provides: bundled(mujs-devel) = 1.0.5 Patch0: 0001-fix-build-on-big-endian.patch -Patch1: 0001-fix-build-with-gcc-10.patch -Patch2: 0001-Fix-possible-crash-when-using-openssl-for-digital-si.patch %description MuPDF is a lightweight PDF viewer and toolkit written in portable C. @@ -58,14 +58,12 @@ The mupdf-devel package contains header files for developing applications that use mupdf and static libraries %prep -%setup -q -n %{name}-%{version}-source +%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 -d thirdparty/lcms2 -%patch1 -p1 -d thirdparty/freeglut -%patch2 -p1 echo > user.make "\ USE_SYSTEM_FREETYPE := yes USE_SYSTEM_HARFBUZZ := yes @@ -78,6 +76,7 @@ echo > user.make "\ USE_SYSTEM_ZLIB := yes USE_SYSTEM_GLUT := no # need freeglut2-art fork USE_SYSTEM_CURL := yes + USE_SYSTEM_GUMBO := yes " %build @@ -112,6 +111,9 @@ cd %{buildroot}/%{_bindir} && ln -s %{name}-x11 %{name} %{_libdir}/lib%{name}*.a %changelog +* Sat Oct 03 2020 Michael J Gruber - 1.18.0-rc1 +- mupdf 1.18.0-rc1 test + * Fri Sep 18 2020 Michael J Gruber - 1.17.0-4 - rebuild with jbig2dec 0.19 diff --git a/sources b/sources index 2fed017..e58c64a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mupdf-1.17.0-source.tar.gz) = a049c4dde20d42d4165959c58434a838581413b89afe0c4e72f40dc54097966b995357eece5e81d87b5d64f24c57c5778bc5b9a7b668057d01b736fc17bc3cb3 +SHA512 (mupdf-1.18.0-rc1-source.tar.gz) = 1ef0fab4bcbb9765d8a264b834e46496e0a1629e56e87b85ec1da826ffd1a10f975f122e0bd180e95530914cd1b2095ec4a113736cc7380dafeb03b1d07d5e06