From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 167A21382C5 for ; Thu, 12 Apr 2018 01:04:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46217E08F4; Thu, 12 Apr 2018 01:04:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0BD1AE08F4 for ; Thu, 12 Apr 2018 01:04:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9EDCA335C74 for ; Thu, 12 Apr 2018 01:04:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80664230 for ; Thu, 12 Apr 2018 01:03:58 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1523495020.705f826fcfadb81b301ad61589ea585bc58c8849.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch app-text/mupdf/mupdf-1.12.0-r1.ebuild app-text/mupdf/mupdf-1.12.0-r2.ebuild X-VCS-Directories: app-text/mupdf/ app-text/mupdf/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 705f826fcfadb81b301ad61589ea585bc58c8849 X-VCS-Branch: master Date: Thu, 12 Apr 2018 01:03:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c77b13db-1b56-46ae-b293-b5a8ad702ffb X-Archives-Hash: 5f175dd66a2942446e88db0d53a2b294 commit: 705f826fcfadb81b301ad61589ea585bc58c8849 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Apr 12 01:03:40 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Apr 12 01:03:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705f826f app-text/mupdf: Fix typo in mupdf-1.11-openssl-curl-x11.patch Reported-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Package-Manager: Portage-2.3.28, Repoman-2.3.9 RepoMan-Options: --force .../files/mupdf-1.11-openssl-curl-x11-r1.patch | 37 ++++++++++++++++++++++ ...pdf-1.12.0-r1.ebuild => mupdf-1.12.0-r2.ebuild} | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) 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 00000000000..92845a0eef2 --- /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 similarity index 98% rename from app-text/mupdf/mupdf-1.12.0-r1.ebuild rename to app-text/mupdf/mupdf-1.12.0-r2.ebuild index 0511828741f..24fbe8ee0af 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 )