commit: 2d0b50425eb4184f10e275934e8c6939c9bffea8 Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com> AuthorDate: Mon Feb 13 21:42:05 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Feb 26 06:59:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0b5042
app-text/mupdf: fix url processing in 1.21.1 In <=app-text/mupdf-1.21.1 built with USE=opengl trying to open an URL in a PDF file results in "warning: cannot spawn browser 'xdg-open': No such file or directory". Apply fix from upstream to resolve the issue until the next release of MuPDF. Closes: https://bugs.gentoo.org/893604 Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../files/mupdf-1.21.1-fix-url-processing.patch | 25 ++++ app-text/mupdf/mupdf-1.21.1-r1.ebuild | 166 +++++++++++++++++++++ 2 files changed, 191 insertions(+) diff --git a/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch b/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch new file mode 100644 index 000000000000..bebdf3909e81 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch @@ -0,0 +1,25 @@ +From 37757db262425d793b17b63821d9014d3655e50a Mon Sep 17 00:00:00 2001 +From: Sebastian Rasmussen <[email protected]> +Date: Thu, 1 Dec 2022 00:04:40 +0100 +Subject: [PATCH] gl: Use posix_spawnp() in order to search PATH for binaries. + +--- + platform/gl/gl-main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c +index d5ae69c95..271ac43a6 100644 +--- a/platform/gl/gl-main.c ++++ b/platform/gl/gl-main.c +@@ -122,7 +122,7 @@ static void open_browser(const char *uri) + argv[0] = (char*) browser; + argv[1] = (char*) uri; + argv[2] = NULL; +- err = posix_spawn(&pid, browser, NULL, NULL, argv, environ); ++ err = posix_spawnp(&pid, browser, NULL, NULL, argv, environ); + if (err) + fz_warn(ctx, "cannot spawn browser '%s': %s", browser, strerror(err)); + +-- +2.39.1 + diff --git a/app-text/mupdf/mupdf-1.21.1-r1.ebuild b/app-text/mupdf/mupdf-1.21.1-r1.ebuild new file mode 100644 index 000000000000..e8c3ad893fa4 --- /dev/null +++ b/app-text/mupdf/mupdf-1.21.1-r1.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please check upstream git regularly for relevant security-related commits +# to backport. + +inherit desktop flag-o-matic toolchain-funcs xdg + +DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C" +HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"; +SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"; +S="${WORKDIR}"/${P}-source + +LICENSE="AGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" +IUSE="+drm +javascript opengl ssl X" +REQUIRED_USE="opengl? ( javascript )" + +# Although we use the bundled, patched version of freeglut in mupdf (because of +# bug #653298), the best way to ensure that its dependencies are present is to +# install system's freeglut. +RDEPEND=" + dev-libs/gumbo + media-libs/freetype:2 + media-libs/harfbuzz:=[truetype] + media-libs/jbig2dec:= + media-libs/libpng:0= + >=media-libs/openjpeg-2.1:2= + >=media-libs/libjpeg-turbo-1.5.3-r2:0= + javascript? ( >=dev-lang/mujs-1.2.0:= ) + opengl? ( >=media-libs/freeglut-3.0.0 ) + ssl? ( >=dev-libs/openssl-1.1:0= ) + sys-libs/zlib + X? ( + x11-libs/libX11 + x11-libs/libXext + ) +" +DEPEND="${RDEPEND}" +BDEPEND="X? ( x11-base/xorg-proto ) + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.15-CFLAGS.patch + "${FILESDIR}"/${PN}-1.19.0-Makefile.patch + "${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch + "${FILESDIR}"/${PN}-1.19.0-darwin.patch + # See bugs #662352 + "${FILESDIR}"/${PN}-1.15-openssl-x11.patch + # General cross fixes from Debian (refreshed) + "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch + "${FILESDIR}"/${P}-no-drm.patch + "${FILESDIR}"/${P}-fix-aliasing-violation.patch + # See bug 893604 + # Fixed in upcoming release + "${FILESDIR}"/${P}-fix-url-processing.patch +) + +src_prepare() { + default + + use hppa && append-cflags -ffunction-sections + + use drm && append-cflags -DGENTOO_MUPDF_DRM + + append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)" + + sed -e "1iOS = Linux" \ + -e "1iCC = $(tc-getCC)" \ + -e "1iCXX = $(tc-getCXX)" \ + -e "1iLD = $(tc-getLD)" \ + -e "1iAR = $(tc-getAR)" \ + -e "1iverbose = yes" \ + -e "1ibuild = debug" \ + -i Makerules || die "Failed adding build variables to Makerules in src_prepare()" + + # Adjust MuPDF version in .pc file created by the + # mupdf-1.10a-add-desktop-pc-xpm-files.patch file + sed -e "s/Version: \(.*\)/Version: ${PV}/" \ + -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc" +} + +_emake() { + # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. + # + # Bundled libs + # * General + # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's + # recommendations. It does not mean "always use system libs". + # See [0] below for what it means in a specific version. + # + # * freeglut + # We don't use system's freeglut because upstream has a special modified + # version of it that gives mupdf clipboard support. See bug #653298 + # + # * mujs + # As of v1.15.0, mupdf started using symbols in mujs that were not part + # of any release. We then went back to using the bundled version of it. + # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk + # when bumping and check! + # See bug #685244 + # + # * lmms2 + # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1]. + # It is therefore not appropriate for us to unbundle it at this time. + # + # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9 + # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt + local myemakeargs=( + GENTOO_PV=${PV} + HAVE_GLUT=$(usex opengl) + HAVE_LIBCRYPTO=$(usex ssl) + HAVE_X11=$(usex X) + USE_SYSTEM_LIBS=yes + USE_SYSTEM_MUJS=$(usex javascript) + USE_SYSTEM_GLUT=no + HAVE_OBJCOPY=no + "$@" + ) + + emake "${myemakeargs[@]}" +} + +src_compile() { + tc-export PKG_CONFIG + + _emake XCFLAGS="-fPIC" +} + +src_install() { + if use opengl || use X ; then + domenu platform/debian/${PN}.desktop + doicon -s scalable docs/logo/new-${PN}-icon.svg + else + rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()" + fi + + sed -i \ + -e "1iprefix = ${ED}/usr" \ + -e "1ilibdir = ${ED}/usr/$(get_libdir)" \ + -e "1idocdir = ${ED}/usr/share/doc/${PF}" \ + -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()" + + _emake install + + dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so + + 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 + + # Respect libdir (bug #734898) + sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()" + + insinto /usr/$(get_libdir)/pkgconfig + doins platform/debian/${PN}.pc + + dodoc README CHANGES CONTRIBUTORS +}
