From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- .../files/mupdf-1.11-drop-libmupdfthird.patch | 22 ---- app-text/mupdf/files/mupdf-1.12-CFLAGS.patch | 11 -- app-text/mupdf/files/mupdf-1.13-libressl.patch | 23 ---- .../mupdf/files/mupdf-1.13-openssl-curl-x11.patch | 39 ------- .../mupdf/files/mupdf-1.14-fix-big-endian.patch | 125 +++++++++++++++++++++ app-text/mupdf/files/mupdf-1.9a-debug-build.patch | 10 -- 6 files changed, 125 insertions(+), 105 deletions(-) delete mode 100644 app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch delete mode 100644 app-text/mupdf/files/mupdf-1.12-CFLAGS.patch delete mode 100644 app-text/mupdf/files/mupdf-1.13-libressl.patch delete mode 100644 app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch create mode 100644 app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch delete mode 100644 app-text/mupdf/files/mupdf-1.9a-debug-build.patch (limited to 'app-text/mupdf/files') diff --git a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch deleted file mode 100644 index e5600c00cd83..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- mupdf-1.11-source/Makefile -+++ mupdf-1.11-source/Makefile -@@ -301,7 +301,7 @@ - # --- Library --- - - MUPDF_LIB = $(OUT)/libmupdf.a --THIRD_LIB = $(OUT)/libmupdfthird.a -+THIRD_LIB = - THREAD_LIB = $(OUT)/libmuthreads.a - - MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) ---- mupdf-1.12.0-source/Makefile -+++ mupdf-1.12.0-source/Makefile -@@ -343,7 +343,7 @@ - - THREAD_OBJ := $(THREAD_OBJ) - --$(MUPDF_LIB) : $(MUPDF_OBJ) -+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) - $(THIRD_LIB) : $(THIRD_OBJ) - $(THREAD_LIB) : $(THREAD_OBJ) - diff --git a/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch deleted file mode 100644 index 796d127263ae..000000000000 --- a/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mupdf-1.12.0-source/Makerules -+++ mupdf-1.12.0-source/Makerules -@@ -22,8 +22,6 @@ - endif - - ifeq "$(build)" "debug" --CFLAGS += -pipe -g --LDFLAGS += -g - else ifeq "$(build)" "release" - CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer - LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s diff --git a/app-text/mupdf/files/mupdf-1.13-libressl.patch b/app-text/mupdf/files/mupdf-1.13-libressl.patch deleted file mode 100644 index 396a0e5b5db9..000000000000 --- a/app-text/mupdf/files/mupdf-1.13-libressl.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Makerules b/Makerules -index f9b25d6..6c91c6c 100644 ---- a/Makerules -+++ b/Makerules -@@ -106,11 +106,17 @@ SYS_GLUT_LIBS := -lglut -lGL - - WANT_OPENSSL ?= yes - ifeq "$(WANT_OPENSSL)" "yes" --ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes" -+ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre" -+ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.0' && echo yes)" "yes" - HAVE_LIBCRYPTO := yes - SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) - SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) - endif -+else ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes" -+HAVE_LIBCRYPTO := yes -+SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) -+SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) -+endif - endif - - WANT_CURL ?= yes diff --git a/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch deleted file mode 100644 index 6db51a083edb..000000000000 --- a/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/Makerules b/Makerules -index ef2b6b0..f9b25d6 100644 ---- a/Makerules -+++ b/Makerules -@@ -104,12 +104,17 @@ HAVE_GLUT := yes - SYS_GLUT_CFLAGS := - SYS_GLUT_LIBS := -lglut -lGL - -+WANT_OPENSSL ?= yes -+ifeq "$(WANT_OPENSSL)" "yes" - ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes" - HAVE_LIBCRYPTO := yes - SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) - SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) - endif -+endif - -+WANT_CURL ?= yes -+ifeq "$(WANT_CURL)" "yes" - ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes" - HAVE_CURL := yes - SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) -@@ -121,12 +126,16 @@ SYS_CURL_DEPS += $(shell pkg-config --libs openssl) - endif - endif - SYS_CURL_DEPS += -lpthread -lrt -+endif - -+WANT_X11 ?= yes -+ifeq "$(WANT_X11)" "yes" - ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" - HAVE_X11 := yes - SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext) - SYS_X11_LIBS := $(shell pkg-config --libs x11 xext) - endif -+endif - - ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes" - SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) diff --git a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch b/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch new file mode 100644 index 000000000000..dc472153ca6b --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch @@ -0,0 +1,125 @@ +vdupras note: exact same patch as in +https://bugs.ghostscript.com/show_bug.cgi?id=699395 except for tweaked +diff paths. +From 5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602 Mon Sep 17 00:00:00 2001 +Message-Id: <5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602.1528041417.git.mjg@fedoraproject.org> +From: Michael J Gruber +Date: Sun, 3 Jun 2018 17:55:46 +0200 +Subject: [PATCH] fix build on big endian + +0dc1153 ("Spread of context into all procedures and removal from +structures", 2017-04-26) missed a few spots that are relevant on big +endian only. + +Add the missing ContextIDs in the call chain so that the build succeeds +again. + +Signed-off-by: Michael J Gruber +--- + src/cmsmd5.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/cmsmd5.c b/src/cmsmd5.c +index 4b8f7f9..dd0925a 100644 +--- a/thirdparty/lcms2/src/cmsmd5.c ++++ b/thirdparty/lcms2/src/cmsmd5.c +@@ -29,7 +29,7 @@ + #ifdef CMS_USE_BIG_ENDIAN + + static +-void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs) ++void byteReverse(cmsContext ContextID, cmsUInt8Number * buf, cmsUInt32Number longs) + { + do { + +@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs) + } + + #else +-#define byteReverse(buf, len) ++#define byteReverse(ContextID, buf, len) + #endif + + +@@ -172,7 +172,7 @@ cmsHANDLE MD5alloc(cmsContext ContextID) + + + static +-void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) ++void MD5add(cmsContext ContextID, cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) + { + _cmsMD5* ctx = (_cmsMD5*) Handle; + cmsUInt32Number t; +@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) + } + + memmove(p, buf, t); +- byteReverse(ctx->in, 16); ++ byteReverse(ContextID, ctx->in, 16); + + MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); + buf += t; +@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) + + while (len >= 64) { + memmove(ctx->in, buf, 64); +- byteReverse(ctx->in, 16); ++ byteReverse(ContextID, ctx->in, 16); + MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); + buf += 64; + len -= 64; +@@ -216,7 +216,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len) + + // Destroy the object and return the checksum + static +-void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle) ++void MD5finish(cmsContext ContextID, cmsProfileID* ProfileID, cmsHANDLE Handle) + { + _cmsMD5* ctx = (_cmsMD5*) Handle; + cmsUInt32Number count; +@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle) + if (count < 8) { + + memset(p, 0, count); +- byteReverse(ctx->in, 16); ++ byteReverse(ContextID, ctx->in, 16); + MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); + + memset(ctx->in, 0, 56); + } else { + memset(p, 0, count - 8); + } +- byteReverse(ctx->in, 14); ++ byteReverse(ContextID, ctx->in, 14); + + ((cmsUInt32Number *) ctx->in)[14] = ctx->bits[0]; + ((cmsUInt32Number *) ctx->in)[15] = ctx->bits[1]; + + MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in); + +- byteReverse((cmsUInt8Number *) ctx->buf, 4); ++ byteReverse(ContextID, (cmsUInt8Number *) ctx->buf, 4); + memmove(ProfileID ->ID8, ctx->buf, 16); + + _cmsFree(ctx ->ContextID, ctx); +@@ -291,7 +291,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); + + // Temp storage is no longer needed + _cmsFree(ContextID, Mem); +@@ -300,7 +300,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile) + memmove(Icc, &Keep, sizeof(_cmsICCPROFILE)); + + // And store the ID +- MD5finish(&Icc ->ProfileID, MD5); ++ MD5finish(ContextID, &Icc ->ProfileID, MD5); + return TRUE; + + Error: +-- +2.18.0.rc0.294.g786209a621 + diff --git a/app-text/mupdf/files/mupdf-1.9a-debug-build.patch b/app-text/mupdf/files/mupdf-1.9a-debug-build.patch deleted file mode 100644 index 93c52f5c5f8b..000000000000 --- a/app-text/mupdf/files/mupdf-1.9a-debug-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mupdf-1.9a/Makefile -+++ mupdf-1.9a/Makefile -@@ -1,6 +1,6 @@ - # GNU Makefile - --build ?= release -+build ?= debug - - OUT := build/$(build) - GEN := generated -- cgit v1.2.3