From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- app-text/mupdf/Manifest | 11 +- app-text/mupdf/files/mupdf-1.14-CFLAGS.patch | 13 +++ app-text/mupdf/files/mupdf-1.14-Makefile.patch | 46 ++++++++ .../mupdf/files/mupdf-1.14-openssl-curl-x11.patch | 52 +++++++++ app-text/mupdf/metadata.xml | 12 +- app-text/mupdf/mupdf-1.13.0-r1.ebuild | 4 +- app-text/mupdf/mupdf-1.13.0.ebuild | 4 +- app-text/mupdf/mupdf-1.14.0-r2.ebuild | 122 +++++++++++++++++++++ 8 files changed, 253 insertions(+), 11 deletions(-) create mode 100644 app-text/mupdf/files/mupdf-1.14-CFLAGS.patch create mode 100644 app-text/mupdf/files/mupdf-1.14-Makefile.patch create mode 100644 app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch create mode 100644 app-text/mupdf/mupdf-1.14.0-r2.ebuild (limited to 'app-text/mupdf') diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index c455fb9340d9..9bdd48303898 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -3,9 +3,14 @@ AUX mupdf-1.11-drop-libmupdfthird.patch 579 BLAKE2B a0a1ee93832135663c14a91bb181 AUX mupdf-1.12-CFLAGS.patch 276 BLAKE2B 20a2440cbd5a8b2cbd17204939d876c8e6df3329c54ad477257ce875a9a5483e859be58cc2b4c6b93f7491aa1cbf4ae1444e8c43af161076feefbd570412b09c SHA512 834481f055df4ca8edc2991acade0295e753d72d1f973e4250ce25f81d33ea08bc4c5fafcef203efe686abd313b78512a36b2ce7c4b5b835206136793ab0e9d7 AUX mupdf-1.13-libressl.patch 883 BLAKE2B ab4c59b95f035686b39906fc7a25bc92fa034857bbac30c4f27b97a6ed98e86fa3a39f907c663779d652e7f02e04faf8261c23f045c14f1fe4a835db16232255 SHA512 f1e189d07ac87819541938312efbc11cc4cfb90a35f6cea4a143a9a624b6e361b7dbca254a4de5522eda93d3e465fc11e0536065d9af02c6681be8ac14c6525c AUX mupdf-1.13-openssl-curl-x11.patch 1184 BLAKE2B 27428b976a8f3854f16968fa5b70d0c4df0fb24508bea3c214fd5a0e46b3c43129ab0953ff20f55b23080de54ae6c5760f7eb97b53195794350a832219449acc SHA512 46f28dc5b23831c7125e42224acf16fc4a6cb90a03f719d2bd423d92e22280689bd3d7dc634d123050c2762333062916712cc951634ec5e5a7d2d4fcef7ebabf +AUX mupdf-1.14-CFLAGS.patch 395 BLAKE2B cc841dc186ac09892789664395bf632a33af3fd1e979e6f23809be0de74181004714b7352d52f3e4414147fe565e73ae9a6fe6b35a6674445e88a3d67ef640c8 SHA512 a5029fca7665e417f16062dcad22e084d6d99cd9ff9a6f1ad853d3ba182c8f565c75469d77edda521f7e777e14a55d4126ddd7631e70290c340d9c7411974c47 +AUX mupdf-1.14-Makefile.patch 1294 BLAKE2B 228ab49a5814e24b0fb1995c5137ce513a303f495973699a370a13a2af17e436ad67ecb47bab739740f7593b71087e167461ff188ef0fe8edf3980450d54984a SHA512 33be7134f8f469a4c72daf59d705de2ed2952ba4ff518ab54f5dc44279d4af8c5d05919bd19d4c6b84085f47f3713a752d678e708aa736e703d2f47d94391b84 +AUX mupdf-1.14-openssl-curl-x11.patch 1799 BLAKE2B 62ae64baad844a13379f8dd1e1a1fed7cc0675fafe79e92a1029a968f59aa0aa3557734f2aa8e56d84f9bbeffbd148ae12255538d2f7b27a07fad5030621d33e SHA512 b6892c58c8a0d7561af16cc3e45e666b8bd1a6824f803d7500dd2db09b4bb477c45ab71b955bf76eedea8352d62d062ee656157c55d635514e464afdef1c2583 AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3 AUX mupdf-1.9a-debug-build.patch 159 BLAKE2B da7e5294cb9e348d057d1436d68c6d3ce62aff7d7e0923c1b3c492c8dbaa459f26894c9c0c3c83e6885b7607c42f8c3da68e646f0dee3f83a168c7caab236f39 SHA512 5337c7dc2c5b29200378082651b81f5483475fe5cba997b2c55f60143e3f00901b19fc51216413151be87cef80e8fe452cde81006bfc552bdb6b1e9d6c0309cb DIST mupdf-1.13.0-source.tar.gz 51425034 BLAKE2B 7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a SHA512 d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707 -EBUILD mupdf-1.13.0-r1.ebuild 5214 BLAKE2B 5084a3f581138ec893379dec40cbc29f53bd6d5ab832960d8239ed410050529bfeb2cb0efc97d1e40cc29913fcaa1b144767f232c4e13f2eeef38857d8bde97e SHA512 813feb1aa5267790e9174ba57382b1e7d17c99a7e86a8c621447fb91c03b762edd9391be6c009ce6273a4ca644bc86b6518383a2ac1851eff093ff2a28c2ac77 -EBUILD mupdf-1.13.0.ebuild 5146 BLAKE2B ce63575c46687216ede7db12c924ce953ec80ca632a9218a155ad0854b04b30f19f02208704e3b21c04a6e1d6c616d61aa8ae3a181e6e176b6e6a2477fd208bf SHA512 c6f9e1cf4ebdd127ad07b5125312b75e5eb04f52a6246429ed3983efe498260a667c3b25d931d2f729ee94e3e342ff89704e2e6259fd1b6d1257fbb5cbe78186 -MISC metadata.xml 315 BLAKE2B b143559c33bb6e3b81fe4dd7df802d48470f9080987e6c888b96bfb3f17e51dd3beaeb5501941dbbc47e1a525900a4719dc42d3d457d391d725670ff201e0c5b SHA512 1f3d23236f716a9e02a4f320105a8cd36e0dc84e25e35764677b66f7ae42039e0ae6f82ef06635cb0fe53fbb2e27ab854e54d45280275b8235f186328daa2b4e +DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf +EBUILD mupdf-1.13.0-r1.ebuild 5204 BLAKE2B f62442ec438a0f3245fb8a543a6f68c1474c11ebe2633c1460175c0c700575a6236ac1f4f747f5e85966577cf32d903f56c80353aef8cfa53570b204423ab154 SHA512 753f2e08443b4982f44a644d2be9fd769f9162ca387dae7ac49baaa4a12d906be6741f959bac14a78780085559e92d8ae2722fe2fe8a630d7983c37a171b53c3 +EBUILD mupdf-1.13.0.ebuild 5136 BLAKE2B deb1d486417e37df66461924632349d443f1b4b79a6a1c148c77cf5fc84799ce946a08d8bea7d79948b4a33914d96b30890e353d73cc49791cb6e16d8728ec8a SHA512 c9989b3ec1a39bfda215c798928723d1d099444e1695da24ed3709b355ccd99dc660ab6e7a245c3a5384376810c93649095c09255a6e8106ae599ae5bd55a343 +EBUILD mupdf-1.14.0-r2.ebuild 3051 BLAKE2B ebce615c6dd87355beedc8f8fc7fbd92cdb374bc7b3a37dadc173721c967e72129b1e6bb7e0887c13c3686e39ad88573e78eab9b38211d7d20f2b293376bd15f SHA512 a682a7f6f34bdcf54ab22eb59e6a3d46996d22af79d8c004163c078a6e9e495af8829cfd4421070eceb170a3f8d6ce1b452be1a27a2684fb1e5642c00e50482e +MISC metadata.xml 429 BLAKE2B f2f025000df327431c06219bc8da22fc340cee333318f4006d889722cd089d8492c9b8b9b1b9591622606282574ccdcf4cb5ddea04b0ab9a8f22c22dae7bfe6c SHA512 60b17408d27057c7fa361d1b480d876db73b89850f3d1f1f06e442bd58e1bccd24ca599e25290614bb879898e87ecf6dc74116154c318e6bb1134144f0826e92 diff --git a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch new file mode 100644 index 000000000000..90972e8c53ea --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch @@ -0,0 +1,13 @@ +diff --git a/Makerules b/Makerules +index fc9bf998..82f10b28 100644 +--- a/Makerules ++++ b/Makerules +@@ -21,8 +21,6 @@ SANITIZE_FLAGS += -fsanitize=address + SANITIZE_FLAGS += -fsanitize=leak + + ifeq ($(build),debug) +- CFLAGS += -pipe -g +- LDFLAGS += -g $(LDREMOVEUNREACH) + else ifeq ($(build),release) + CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer + LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s diff --git a/app-text/mupdf/files/mupdf-1.14-Makefile.patch b/app-text/mupdf/files/mupdf-1.14-Makefile.patch new file mode 100644 index 000000000000..a8c4ef770dce --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.14-Makefile.patch @@ -0,0 +1,46 @@ +1. debug build (not sure why...) +2. build shared library +3. add optional static lib target +4. Don't install COPYING +diff --git a/Makefile b/Makefile +index 37fc48e6..4303e9fa 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,7 +3,7 @@ + -include user.make + + ifndef build +- build := release ++ build := debug + endif + + ifndef OUT +@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h + + # --- Library --- + +-MUPDF_LIB = $(OUT)/libmupdf.a +-THIRD_LIB = $(OUT)/libmupdf-third.a ++MUPDF_LIB = libmupdf.so.$(GENTOO_PV) ++MUPDF_STATIC = $(OUT)/libmupdf.a ++THIRD_LIB = + THREAD_LIB = $(OUT)/libmupdf-threads.a + PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a + +-$(MUPDF_LIB) : $(MUPDF_OBJ) +-$(THIRD_LIB) : $(THIRD_OBJ) ++$(MUPDF_LIB): $(MUPDF_OBJ) $(THIRD_OBJ) ++ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -Wl,--no-undefined -o $@ $^ $(THIRD_LIBS) $(LIBS) ++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ) + $(THREAD_LIB) : $(THREAD_OBJ) + $(PKCS7_LIB) : $(PKCS7_OBJ) + +@@ -355,7 +357,7 @@ install: libs apps + + install -d $(DESTDIR)$(docdir) + install -d $(DESTDIR)$(docdir)/examples +- install README COPYING CHANGES $(DESTDIR)$(docdir) ++ install README CHANGES $(DESTDIR)$(docdir) + install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) + install docs/examples/* $(DESTDIR)$(docdir)/examples + 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 new file mode 100644 index 000000000000..a1284a63d670 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch @@ -0,0 +1,52 @@ +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/metadata.xml b/app-text/mupdf/metadata.xml index 96d29f2af06a..38351433e8bd 100644 --- a/app-text/mupdf/metadata.xml +++ b/app-text/mupdf/metadata.xml @@ -1,10 +1,14 @@ - -xmw@gentoo.org -Michael Weber - + + xmw@gentoo.org + Michael Weber + + + vdupras@gentoo.org + Virgil Dupras + Use dev-libs/openssl crypto backend diff --git a/app-text/mupdf/mupdf-1.13.0-r1.ebuild b/app-text/mupdf/mupdf-1.13.0-r1.ebuild index 3f522e8dc86f..e24a2812a4d2 100644 --- a/app-text/mupdf/mupdf-1.13.0-r1.ebuild +++ b/app-text/mupdf/mupdf-1.13.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz" LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla" LIB_DEPEND=" diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild b/app-text/mupdf/mupdf-1.13.0.ebuild index 4c5c9d0cca84..45887a2ebd6c 100644 --- a/app-text/mupdf/mupdf-1.13.0.ebuild +++ b/app-text/mupdf/mupdf-1.13.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz" LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla" LIB_DEPEND=" diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild new file mode 100644 index 000000000000..3ce32300c17c --- /dev/null +++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2018 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 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="X curl +javascript libressl opengl +openssl 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?] ) + !libressl? ( dev-libs/openssl:0=[static-libs?] ) + libressl? ( dev-libs/libressl:0=[static-libs?] ) + opengl? ( >=media-libs/freeglut-3.0.0:= ) + 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 +) + +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 openssl) \ + 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