diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-04-12 03:03:40 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-04-12 03:03:40 +0200 |
| commit | 705f826fcfadb81b301ad61589ea585bc58c8849 (patch) | |
| tree | 05c83b59a543230bf63255ce903482b3585a0d4b | |
| parent | app-text/zathura: x86 stable (bug #645974) (diff) | |
| download | gentoo-705f826f.tar.gz gentoo-705f826f.tar.bz2 gentoo-705f826f.zip | |
app-text/mupdf: Fix typo in mupdf-1.11-openssl-curl-x11.patch
Reported-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --force
| -rw-r--r-- | app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch | 37 | ||||
| -rw-r--r-- | app-text/mupdf/mupdf-1.12.0-r2.ebuild (renamed from app-text/mupdf/mupdf-1.12.0-r1.ebuild) | 2 |
2 files changed, 38 insertions, 1 deletions
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 new file mode 100644 index 000000000000..92845a0eef2f --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch @@ -0,0 +1,37 @@ +--- 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/mupdf-1.12.0-r1.ebuild b/app-text/mupdf/mupdf-1.12.0-r2.ebuild index 0511828741f3..24fbe8ee0af5 100644 --- a/app-text/mupdf/mupdf-1.12.0-r1.ebuild +++ b/app-text/mupdf/mupdf-1.12.0-r2.ebuild @@ -46,7 +46,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.12-CFLAGS.patch "${FILESDIR}"/${PN}-1.9a-debug-build.patch "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch - "${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch + "${FILESDIR}"/${PN}-1.11-openssl-curl-x11-r1.patch "${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch ) |