From 7c17b2644a7ca602b1405134510644011e91ff9b Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 11 Sep 2019 13:23:39 +0200 Subject: app-text/mupdf: Drop old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../mupdf/files/mupdf-1.14-openssl-curl-x11.patch | 52 --------- app-text/mupdf/mupdf-1.14.0-r2.ebuild | 126 --------------------- 2 files changed, 178 deletions(-) delete mode 100644 app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch delete mode 100644 app-text/mupdf/mupdf-1.14.0-r2.ebuild diff --git a/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch deleted file mode 100644 index a1284a63d670..000000000000 --- a/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/Makerules b/Makerules -index fc9bf998..5c0fffa4 100644 ---- a/Makerules -+++ b/Makerules -@@ -113,10 +113,14 @@ else ifeq ($(OS),Linux) - SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) - endif - -+ WANT_CURL ?= yes -+ ifeq "$(WANT_CURL)" "yes" - HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes) - 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 - endif - - HAVE_GLUT := yes -@@ -125,17 +129,29 @@ else ifeq ($(OS),Linux) - SYS_GLUT_LIBS := -lglut -lGL - endif - -+ WANT_X11 ?= yes -+ ifeq "$(WANT_X11)" "yes" - HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) - ifeq ($(HAVE_X11),yes) - X11_CFLAGS := $(shell pkg-config --cflags x11 xext) - X11_LIBS := $(shell pkg-config --libs x11 xext) - endif -+ endif - -- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) -- ifeq ($(HAVE_LIBCRYPTO),yes) -+ WANT_OPENSSL ?= yes -+ ifeq "$(WANT_OPENSSL)" "yes" -+ ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre" -+ ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.0' && echo yes)" "yes" -+ HAVE_LIBCRYPTO := yes -+ LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO -+ LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) -+ endif -+ else ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes" -+ HAVE_LIBCRYPTO := yes - LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO - LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) - endif -+ endif - - HAVE_PTHREAD := yes - ifeq ($(HAVE_PTHREAD),yes) diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild deleted file mode 100644 index 8e081a7e46aa..000000000000 --- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs xdg - -DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" -HOMEPAGE="https://mupdf.com/" -SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz" - -LICENSE="AGPL-3" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="X curl +javascript libressl opengl +ssl static-libs +vanilla" - -RDEPEND=" - >=dev-lang/mujs-1.0.4 - media-libs/freetype:2=[static-libs?] - media-libs/harfbuzz:=[static-libs?] - media-libs/jbig2dec:=[static-libs?] - media-libs/libpng:0=[static-libs?] - >=media-libs/openjpeg-2.1:2=[static-libs?] - virtual/jpeg[static-libs?] - curl? ( net-misc/curl[static-libs?] ) - opengl? ( >=media-libs/freeglut-3.0.0:= ) - ssl? ( - libressl? ( dev-libs/libressl:0=[static-libs?] ) - !libressl? ( dev-libs/openssl:0=[static-libs?] ) - ) - X? ( - x11-libs/libX11[static-libs?] - x11-libs/libXext[static-libs?] - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE=" - opengl? ( !static-libs ) - curl? ( X )" - -S=${WORKDIR}/${P}-source - -PATCHES=( - "${FILESDIR}"/${PN}-1.14-CFLAGS.patch - "${FILESDIR}"/${PN}-1.14-Makefile.patch - "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch - # See bug #662352 - "${FILESDIR}"/${PN}-1.14-openssl-curl-x11.patch - # bug #672998 - "${FILESDIR}"/${PN}-1.14-fix-big-endian.patch -) - -src_prepare() { - xdg_src_prepare - use hppa && append-cflags -ffunction-sections - - use javascript || \ - sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \ - -i include/mupdf/fitz/config.h - - use vanilla || eapply \ - "${FILESDIR}"/${PN}-1.3-zoom-2.patch - - sed -e "1iOS = Linux" \ - -e "1iCC = $(tc-getCC)" \ - -e "1iLD = $(tc-getLD)" \ - -e "1iAR = $(tc-getAR)" \ - -e "1iverbose = yes" \ - -e "1ibuild = debug" \ - -e "1iprefix = ${ED}usr" \ - -e "1ilibdir = ${ED}usr/$(get_libdir)" \ - -e "1idocdir = ${ED}usr/share/doc/${PF}" \ - -i Makerules || die -} - -_emake() { - # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. - emake \ - GENTOO_PV=${PV} \ - HAVE_GLUT=$(usex opengl yes no) \ - WANT_CURL=$(usex curl) \ - WANT_OPENSSL=$(usex ssl) \ - WANT_X11=$(usex X) \ - USE_SYSTEM_LIBS=yes \ - USE_SYSTEM_MUJS=yes \ - HAVE_OBJCOPY=no \ - "$@" -} - -src_compile() { - _emake XCFLAGS="-fpic" - - use curl && _emake extra-apps - - use static-libs && \ - _emake build/debug/lib${PN}.a -} - -src_install() { - if use X || use opengl ; then - domenu platform/debian/${PN}.desktop - doicon platform/debian/${PN}.xpm - else - rm docs/man/${PN}.1 - fi - - _emake install - - dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so - - use static-libs && \ - dolib.a build/debug/lib${PN}.a - if use opengl ; then - einfo "mupdf symlink points to mupdf-gl (bug 616654)" - dosym ${PN}-gl /usr/bin/${PN} - elif use X ; then - einfo "mupdf symlink points to mupdf-x11 (bug 616654)" - dosym ${PN}-x11 /usr/bin/${PN} - fi - use curl && dobin build/debug/${PN}-x11-curl - insinto /usr/$(get_libdir)/pkgconfig - doins platform/debian/${PN}.pc - - dodoc README CHANGES CONTRIBUTORS -} -- cgit v1.2.3-65-gdbad