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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3DE8715813A for ; Wed, 08 Jan 2025 13:20:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9876E07B3; Wed, 08 Jan 2025 13:20:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC18AE07B3 for ; Wed, 08 Jan 2025 13:20:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AAFAA342F64 for ; Wed, 08 Jan 2025 13:20:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE4741BA2 for ; Wed, 08 Jan 2025 13:20:11 +0000 (UTC) From: "Petr Vaněk" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petr Vaněk" Message-ID: <1736342308.917c462f9d1d8e4a13a1185ec40e1f7c3d3c2791.arkamar@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/mupdf/Manifest app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch app-text/mupdf/mupdf-1.24.1.ebuild X-VCS-Directories: app-text/mupdf/files/ app-text/mupdf/ X-VCS-Committer: arkamar X-VCS-Committer-Name: Petr Vaněk X-VCS-Revision: 917c462f9d1d8e4a13a1185ec40e1f7c3d3c2791 X-VCS-Branch: master Date: Wed, 08 Jan 2025 13:20:11 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0a3bf767-e251-43fa-a263-fe1d1c8015e7 X-Archives-Hash: 406fe4f79bfa0097835db124c65dd15b commit: 917c462f9d1d8e4a13a1185ec40e1f7c3d3c2791 Author: Philipp Rösner protonmail com> AuthorDate: Sun Dec 29 20:21:06 2024 +0000 Commit: Petr Vaněk gentoo org> CommitDate: Wed Jan 8 13:18:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917c462f app-text/mupdf: drop 1.24.1 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/39899 Signed-off-by: Petr Vaněk gentoo.org> app-text/mupdf/Manifest | 1 - .../files/mupdf-1.21.0-add-desktop-pc-files.patch | 33 ---- app-text/mupdf/mupdf-1.24.1.ebuild | 166 --------------------- 3 files changed, 200 deletions(-) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 65e2c2b75b68..a72a7385383b 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,3 +1,2 @@ -DIST mupdf-1.24.1-source.tar.gz 55310618 BLAKE2B 33396b0cca6e2beb1b2bc70c606917c8d9b30b6a277645849ef7ba1e7efbf909c21196acdd5d94d964dd20d3ba746c45cab3c899dfbee1b2138de12e32375a4e SHA512 9d6fbd3388173f06c5db4a27753e69afd21ed32d93f263d4448c3be60a3be747b61102edd5430459f0dbe7ae4df2019689a2f3a582acec77ff322b6d41066fba DIST mupdf-1.24.8-source.tar.gz 54039703 BLAKE2B 0fe25d9f0f01a1e387da590c28abac66309247c46c05c7c9b36c4bc911fc16adab681243c2c1d2c50ec91bb76b737022bd3faf06b0b3a803e9120829d9cae5b4 SHA512 17d8fd9fd0e176c8abd1ebc594259a0f7cf822338085ea4574451ba8ec1ac72ba8bd2d5388a1421bbfd4e91257a48d0e0766213ace0933c39d3cb8d774a3860e DIST mupdf-1.25.2-source.tar.gz 54635699 BLAKE2B 08e4c1bd4d8f9a731b10e1368c3f4a62a9b949c4a1842f2ce297ef3a595107f63e184230c31149a6a5db9038838d891fdeb0330323afcdc0b6966bee06046288 SHA512 089bcf228a28e5f47e793d66f6355b22b531c031a6d1feb0dd07a5fee55780fda92d6cde646336ca0200869c32d523be23a8fe2232fad010b38673419c7859f2 diff --git a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch deleted file mode 100644 index 4d449a2fec15..000000000000 --- a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- /dev/null -+++ ./platform/debian/mupdf.desktop -@@ -0,0 +1,15 @@ -+[Desktop Entry] -+Name=MuPDF -+GenericName=PDF file viewer -+Exec=mupdf %f -+TryExec=mupdf -+Icon=new-mupdf-icon -+Terminal=false -+Type=Application -+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff; -+Categories=Viewer;Graphics; -+Actions=View; -+ -+[Desktop Action View] -+Name=View with mupdf -+Exec=mupdf %f ---- /dev/null -+++ ./platform/debian/mupdf.pc -@@ -0,0 +1,12 @@ -+prefix=/usr -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: mupdf -+Description: Library for rendering PDF documents -+Requires: freetype2 libopenjp2 libcrypto -+Version: 0.5.0 -+Libs: -L${libdir} -lmupdf -+Libs.private: -lmupdf-js-none -+Cflags: -I${includedir} diff --git a/app-text/mupdf/mupdf-1.24.1.ebuild b/app-text/mupdf/mupdf-1.24.1.ebuild deleted file mode 100644 index 5f43ffbabd57..000000000000 --- a/app-text/mupdf/mupdf-1.24.1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2024 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 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="archive +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=" - archive? ( app-arch/libarchive ) - 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= - net-misc/curl - 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? ( - media-libs/libglvnd[X] - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND="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}"/${P}-cross-fixes.patch - "${FILESDIR}"/${P}-darwin.patch - # See bugs #662352 - "${FILESDIR}"/${P}-openssl-x11.patch - # General cross fixes from Debian (refreshed) - "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch -) - -src_prepare() { - default - - use hppa && append-cflags -ffunction-sections - - 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.21.0-add-desktop-pc-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 and EPREFIX (bugs #734898, #911965) - sed -i -e "s:/lib:/$(get_libdir):" \ - -e "s:/usr:${EPREFIX}/usr:" platform/debian/${PN}.pc \ - || die "Failed to sed pkgconfig file to respect libdir and EPREFIX in src_install()" - - insinto /usr/$(get_libdir)/pkgconfig - doins platform/debian/${PN}.pc - - dodoc README CHANGES CONTRIBUTORS -}