diff options
| author |   Virgil Dupras <vdupras@gentoo.org> | 2019-02-19 15:22:34 -0500 |
|---|---|---|
| committer | Virgil Dupras <vdupras@gentoo.org> | 2019-02-19 16:01:02 -0500 |
| commit | a5247eb5569e7573eba63db4cf5e6012607e1a6d (patch) | |
| tree | ecc58105b023374e47a0382ea2308a194ed22cee /app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch | |
| parent | net-libs/webkit-gtk: security cleanup (diff) | |
| download | gentoo-a5247eb5569e7573eba63db4cf5e6012607e1a6d.tar.gz gentoo-a5247eb5569e7573eba63db4cf5e6012607e1a6d.tar.bz2 gentoo-a5247eb5569e7573eba63db4cf5e6012607e1a6d.zip | |
app-text/mupdf: fix libressl and openssl
openssl's requirements is actually 1.1+. prior to this change, mupdf
compiled with openssl support unless openssl 1.1+ was installed.
libressl support requires a patch to work properly.
Also, other minor fixes. See closed bugs.
Closes: https://bugs.gentoo.org/671062
Closes: https://bugs.gentoo.org/623732
Closes: https://bugs.gentoo.org/669698
Closes: https://bugs.gentoo.org/670832
Signed-off-by: Virgil Dupras <vdupras@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch')
| -rw-r--r-- | app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch | 35 |
1 files changed, 35 insertions, 0 deletions
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 new file mode 100644 index 000000000000..79efe32c0e41 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch @@ -0,0 +1,35 @@ +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) |