From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- app-text/mupdf/files/mupdf-1.14-CFLAGS.patch | 13 --- app-text/mupdf/files/mupdf-1.14-Makefile.patch | 46 -------- .../mupdf/files/mupdf-1.14-fix-big-endian.patch | 125 --------------------- .../files/mupdf-1.14-r3-openssl-curl-x11.patch | 35 ------ app-text/mupdf/files/mupdf-1.3-zoom-2.patch | 10 -- 5 files changed, 229 deletions(-) delete mode 100644 app-text/mupdf/files/mupdf-1.14-CFLAGS.patch delete mode 100644 app-text/mupdf/files/mupdf-1.14-Makefile.patch delete mode 100644 app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch delete mode 100644 app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch delete mode 100644 app-text/mupdf/files/mupdf-1.3-zoom-2.patch (limited to 'app-text/mupdf/files') diff --git a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch deleted file mode 100644 index 90972e8c53ea..000000000000 --- a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makerules b/Makerules -index fc9bf998..82f10b28 100644 ---- a/Makerules -+++ b/Makerules -@@ -21,8 +21,6 @@ SANITIZE_FLAGS += -fsanitize=address - SANITIZE_FLAGS += -fsanitize=leak - - ifeq ($(build),debug) -- CFLAGS += -pipe -g -- LDFLAGS += -g $(LDREMOVEUNREACH) - else ifeq ($(build),release) - CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer - LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s diff --git a/app-text/mupdf/files/mupdf-1.14-Makefile.patch b/app-text/mupdf/files/mupdf-1.14-Makefile.patch deleted file mode 100644 index a8c4ef770dce..000000000000 --- a/app-text/mupdf/files/mupdf-1.14-Makefile.patch +++ /dev/null @@ -1,46 +0,0 @@ -1. debug build (not sure why...) -2. build shared library -3. add optional static lib target -4. Don't install COPYING -diff --git a/Makefile b/Makefile -index 37fc48e6..4303e9fa 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ - -include user.make - - ifndef build -- build := release -+ build := debug - endif - - ifndef OUT -@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h - - # --- Library --- - --MUPDF_LIB = $(OUT)/libmupdf.a --THIRD_LIB = $(OUT)/libmupdf-third.a -+MUPDF_LIB = libmupdf.so.$(GENTOO_PV) -+MUPDF_STATIC = $(OUT)/libmupdf.a -+THIRD_LIB = - THREAD_LIB = $(OUT)/libmupdf-threads.a - PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a - --$(MUPDF_LIB) : $(MUPDF_OBJ) --$(THIRD_LIB) : $(THIRD_OBJ) -+$(MUPDF_LIB): $(MUPDF_OBJ) $(THIRD_OBJ) -+ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -Wl,--no-undefined -o $@ $^ $(THIRD_LIBS) $(LIBS) -+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ) - $(THREAD_LIB) : $(THREAD_OBJ) - $(PKCS7_LIB) : $(PKCS7_OBJ) - -@@ -355,7 +357,7 @@ install: libs apps - - install -d $(DESTDIR)$(docdir) - install -d $(DESTDIR)$(docdir)/examples -- install README COPYING CHANGES $(DESTDIR)$(docdir) -+ install README CHANGES $(DESTDIR)$(docdir) - install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) - install docs/examples/* $(DESTDIR)$(docdir)/examples - 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 deleted file mode 100644 index dc472153ca6b..000000000000 --- a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch +++ /dev/null @@ -1,125 +0,0 @@ -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.14-r3-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch deleted file mode 100644 index 79efe32c0e41..000000000000 --- a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/Makerules b/Makerules -index fc9bf998..f1fd93cb 100644 ---- a/Makerules -+++ b/Makerules -@@ -113,10 +113,11 @@ else ifeq ($(OS),Linux) - SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) - endif - -- HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes) -+ HAVE_CURL ?= not-unless-portage-tells-me - ifeq ($(HAVE_CURL),yes) - SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) -- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -+ # We have to forcibly add -lpthread to avoid linking errors. -+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread - endif - - HAVE_GLUT := yes -@@ -125,13 +126,14 @@ else ifeq ($(OS),Linux) - SYS_GLUT_LIBS := -lglut -lGL - endif - -- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) -+ HAVE_X11 ?= not-unless-portage-tells-me - ifeq ($(HAVE_X11),yes) - X11_CFLAGS := $(shell pkg-config --cflags x11 xext) - X11_LIBS := $(shell pkg-config --libs x11 xext) - endif - -- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) -+ -+ HAVE_LIBCRYPTO ?= not-unless-portage-tells-me - ifeq ($(HAVE_LIBCRYPTO),yes) - LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO - LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) diff --git a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch deleted file mode 100644 index 353912450236..000000000000 --- a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mupdf-1.3/platform/x11/pdfapp.c -+++ mupdf-1.3/platform/x11/pdfapp.c -@@ -866,6 +867,7 @@ - break; - - case ' ': -+ case 'F': - panto = DONT_PAN; - if (app->numberlen > 0) - app->pageno += atoi(app->number); -- cgit v1.2.3