From 43793fab84041cfc5c60c0151d1591b8a69fb24a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Aug 2018 07:36:27 +0100 Subject: gentoo resync : 25.08.2018 --- app-text/mupdf/files/mupdf-1.11-CFLAGS.patch | 10 ------ .../mupdf/files/mupdf-1.11-CVE-2017-6060.patch | 15 --------- .../files/mupdf-1.11-openssl-curl-x11-r1.patch | 37 ---------------------- .../mupdf/files/mupdf-1.11-openssl-curl-x11.patch | 37 ---------------------- app-text/mupdf/files/mupdf-1.11-system-glfw.patch | 11 ------- 5 files changed, 110 deletions(-) delete mode 100644 app-text/mupdf/files/mupdf-1.11-CFLAGS.patch delete mode 100644 app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch delete mode 100644 app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch delete mode 100644 app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch delete mode 100644 app-text/mupdf/files/mupdf-1.11-system-glfw.patch (limited to 'app-text/mupdf/files') diff --git a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch deleted file mode 100644 index 2ffd326e5e46..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mupdf-1.11-source/Makerules -+++ mupdf-1.11-source/Makerules -@@ -23,7 +23,6 @@ - endif - - ifeq "$(build)" "debug" --CFLAGS += -pipe -g - LDFLAGS += -g - else ifeq "$(build)" "release" - CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer diff --git a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch deleted file mode 100644 index a595253e8649..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch +++ /dev/null @@ -1,15 +0,0 @@ -X-Git-Url: http://git.ghostscript.com/?p=user%2Fsebras%2Fmupdf.git;a=blobdiff_plain;f=platform%2Fx11%2Fjstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614 - -diff --git a/platform/x11/jstest_main.c b/platform/x11/jstest_main.c -index 13c3a0a..f158d96 100644 ---- a/platform/x11/jstest_main.c -+++ b/platform/x11/jstest_main.c -@@ -346,7 +346,7 @@ main(int argc, char *argv[]) - } - else if (match(&line, "OPEN")) - { -- char path[1024]; -+ char path[LONGLINE]; - if (file_open) - pdfapp_close(&gapp); - if (prefix) diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch deleted file mode 100644 index 92845a0eef2f..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- mupdf-1.11-source/Makerules -+++ mupdf-1.11-source/Makerules -@@ -116,12 +116,17 @@ - SYS_PTHREAD_CFLAGS := - SYS_PTHREAD_LIBS := -lpthread - -+WANT_OPENSSL ?= yes -+ifeq "$(WANT_OPENSSL)" "yes" - ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && 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) -@@ -133,12 +138,16 @@ - 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.11-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch deleted file mode 100644 index 91fd9f6485dc..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- mupdf-1.11-source/Makerules -+++ mupdf-1.11-source/Makerules -@@ -116,12 +116,17 @@ - SYS_PTHREAD_CFLAGS := - SYS_PTHREAD_LIBS := -lpthread - -+WANT_OPENSSL ?= yes -+ifeq "$(WANT_OPENSSL)" "yes" - ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && 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) -@@ -133,12 +138,16 @@ - endif - endif - SYS_CURL_DEPS += -lpthread -lrt -+endif - -+WANT_X!! ?= 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.11-system-glfw.patch b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch deleted file mode 100644 index 90189f9400b0..000000000000 --- a/app-text/mupdf/files/mupdf-1.11-system-glfw.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mupdf-1.11-source/Makerules -+++ mupdf-1.11-source/Makerules -@@ -158,6 +158,8 @@ - SYS_JBIG2DEC_LIBS := -ljbig2dec - SYS_LIBJPEG_LIBS := -ljpeg - SYS_ZLIB_LIBS := -lz -+SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3 gl) -+SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3 gl) - - endif - -- cgit v1.2.3