From cdf77af628ad24d46c00f5212bbe705c19ab7b97 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Fri, 10 May 2019 23:49:52 +0000 Subject: [PATCH 1/2] dev-lang/mujs: Version bump (1.0.6_pre20190404104104). Bug: https://bugs.gentoo.org/685590 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- dev-lang/mujs/Manifest | 1 + .../mujs/mujs-1.0.6_pre20190404104104.ebuild | 64 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 dev-lang/mujs/mujs-1.0.6_pre20190404104104.ebuild diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest index 0200ee406a7..8e5c9a61135 100644 --- a/dev-lang/mujs/Manifest +++ b/dev-lang/mujs/Manifest @@ -1 +1,2 @@ DIST mujs-1.0.5.tar.gz 119353 BLAKE2B 48f1b598e50d5804b0d64230cdd6b4d3f719187ea0906f45c9f45baee2c8df59c6fd09dc25afc9e1ce4e20a9866d158d16a4632bec552fddd8fac70b20e2363f SHA512 c1c59b5e80e0e5f580f30dfc0b4707b6a1e44a73c746b9783bb24d91429ddf8ed670a7663478300cc568cfc15a511720b6d18be2ade40a3a66fc7ab8f3933c2d +DIST mujs-1.0.6_pre20190404104104.tar.gz 121343 BLAKE2B 8cf523ad30f510f1eea0ddeaa69e7ae944653b5ee5a195f690cbc861a0cd00bb7ab47ad0a83d3a36ffec28836911b561ae37e36b3a3896508db193d510769e5f SHA512 360d1b88f9a84e06923eabadcafb1eaab5b77a99777e11650d0e38268d0d63c1b3a592707f659f2f7388fb4d97e661bd3ca5b4cca8c89bcf04b573bfea70fc32 diff --git a/dev-lang/mujs/mujs-1.0.6_pre20190404104104.ebuild b/dev-lang/mujs/mujs-1.0.6_pre20190404104104.ebuild new file mode 100644 index 00000000000..eed353a3af0 --- /dev/null +++ b/dev-lang/mujs/mujs-1.0.6_pre20190404104104.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic multilib toolchain-funcs + +DESCRIPTION="An embeddable Javascript interpreter in C." +HOMEPAGE=" + http://mujs.com/ + https://github.com/ccxvii/mujs/ +" +if [[ ${PV} == *_pre* ]]; then + MUJS_GIT_REVISION="00d4606c3baf813b7b1c176823b2729bf51002a2" + SRC_URI="https://github.com/ccxvii/${PN}/archive/${MUJS_GIT_REVISION}.tar.gz -> ${P}.tar.gz" +else + SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="AGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="static-libs" + +RDEPEND="sys-libs/readline:0=" +DEPEND="${RDEPEND}" + +if [[ ${PV} == *_pre* ]]; then + S="${WORKDIR}/${PN}-${MUJS_GIT_REVISION}" +fi + +PATCHES=( + "${FILESDIR}/${PN}-1.0.5-flags.patch" +) + +src_prepare() { + default + + tc-export AR CC + + append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV} +} + +src_compile() { + emake VERSION=${PV} prefix=/usr shared +} + +src_install() { + local myeconfargs=( + DESTDIR="${ED}" + install-shared + libdir="/usr/$(get_libdir)" + prefix="/usr" + VERSION="${PV}" + $(usex static-libs install-static '') + ) + + emake "${myeconfargs[@]}" + + mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die + + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1} +} -- 2.21.0 From 093ed2a006e2332adac5fdb648aac7c14763a384 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Fri, 10 May 2019 23:53:34 +0000 Subject: [PATCH 2/2] app-text/mupdf: Use snapshot of dev-lang/mujs instead of bundled copy. Fixes: https://bugs.gentoo.org/685590 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- app-text/mupdf/mupdf-1.15.0-r1.ebuild | 125 ++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 app-text/mupdf/mupdf-1.15.0-r1.ebuild diff --git a/app-text/mupdf/mupdf-1.15.0-r1.ebuild b/app-text/mupdf/mupdf-1.15.0-r1.ebuild new file mode 100644 index 00000000000..0410b58e2e5 --- /dev/null +++ b/app-text/mupdf/mupdf-1.15.0-r1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs xdg desktop + +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 +javascript libressl opengl ssl static-libs vanilla" + +# mujs version with js_repr() and js_tryrepr() functions required which were added in: +# https://github.com/ccxvii/mujs/commit/603977ae5bad97d544725cd6c36f9af30e6aef4e +RDEPEND=" + >=dev-lang/mujs-1.0.6_pre20190322130020:= + media-libs/freetype:2=[static-libs?] + media-libs/harfbuzz:=[static-libs?,truetype] + media-libs/jbig2dec:=[static-libs?] + media-libs/libpng:0=[static-libs?] + >=media-libs/openjpeg-2.1:2=[static-libs?] + virtual/jpeg[static-libs?] + ssl? ( + libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] ) + !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) + ) + X? ( + x11-libs/libX11[static-libs?] + x11-libs/libXext[static-libs?] + )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +REQUIRED_USE="opengl? ( !static-libs )" + +S=${WORKDIR}/${P}-source + +PATCHES=( + "${FILESDIR}"/${PN}-1.15-CFLAGS.patch + "${FILESDIR}"/${PN}-1.15-Makefile.patch + "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch + # See bugs #662352 + "${FILESDIR}"/${PN}-1.15-openssl-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 + + # See bug #670832 + use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.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. + + # We don't use system's freeglut because upstream has a special modified + # version of it that gives mupdf clipboard support. See bug #653298 + emake \ + GENTOO_PV=${PV} \ + HAVE_GLUT=$(usex opengl) \ + HAVE_LIBCRYPTO=$(usex ssl) \ + HAVE_X11=$(usex X) \ + USE_SYSTEM_LIBS=yes \ + USE_SYSTEM_MUJS=yes \ + USE_SYSTEM_GLUT=no \ + HAVE_OBJCOPY=no \ + "$@" +} + +src_compile() { + _emake XCFLAGS="-fpic" + + 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 + insinto /usr/$(get_libdir)/pkgconfig + doins platform/debian/${PN}.pc + + dodoc README CHANGES CONTRIBUTORS +} -- 2.21.0