From d94fef9a5708b8e64f363f4a71f0b56caef5efe4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 Jan 2025 06:41:15 +0000 Subject: gentoo auto-resync : 09:01:2025 - 06:41:15 --- app-text/mupdf/Manifest | 5 +- .../files/mupdf-1.21.0-add-desktop-pc-files.patch | 33 ---- app-text/mupdf/mupdf-1.24.1.ebuild | 166 -------------------- app-text/mupdf/mupdf-1.25.2.ebuild | 167 +++++++++++++++++++++ 4 files changed, 169 insertions(+), 202 deletions(-) delete mode 100644 app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch delete mode 100644 app-text/mupdf/mupdf-1.24.1.ebuild create mode 100644 app-text/mupdf/mupdf-1.25.2.ebuild (limited to 'app-text/mupdf') diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 5393d0436b65..753c959ba486 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,14 +1,13 @@ AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed AUX mupdf-1.19.0-Makefile.patch 1043 BLAKE2B 7f449713700d57c0bf072661babcb5122d09be82a0b89520999618e22c7b44ae950f0e9fd653330d34078229da8bd36f8e5fd273c5110cbeaeb47347b3e4f666 SHA512 ddbc11d3bf7a1480effd57c9587b85d735c97c5215dbf9dc66bac535356f9cbc5ecc0dd1003c367d6e60d969383afdd9014a66e8fb51384632be407fe01694d4 -AUX mupdf-1.21.0-add-desktop-pc-files.patch 845 BLAKE2B 8fa08810dd0b797af517c7932a2b81c080721155f607970664ca68a8eb4ec53bcfdda417790bf002aff1b1e1e8257d67c3a2e6bf6d500ee50cc03a7f440b60c6 SHA512 96835698141898a9509321c6125d5bfce1b31d3a0329d3c2be55d9026cff65204112a8ac0774ece1ac1ca7a1ce3dc534437aca1a76eb7716317b2c7e648e549f AUX mupdf-1.21.1-fix-aliasing-violation.patch 2651 BLAKE2B 649b9cde7eefdf16ba5a57e40128dc57710d63a04281bae4f26f2ee9dc19933628826d52ff4aee95fd7e6141b35c59efe883439b852758bc5075e30a89507564 SHA512 deccc9193d9266a9add6e1d80eb289f4576e12703d8a0af640ebdbfc698cbb3a15ac9da3b752b1f6beb4ad901aa3bfd43d08d34738b5c7545182bf20200ecaac AUX mupdf-1.24.1-cross-fixes.patch 7098 BLAKE2B a97c6c0454e9e1b2b0476c36387709b925901075dc01ec2df5af6629e05c5c435a7fdfdb683a83ba4cda7f1d22582ce77d2ca75f3c272fa3d84826c9e9d4045f SHA512 4a40334b6957cc349fb12feeee98bfea3b2c4aaf04c64814020021468dfe93d8b8ff163e995dd5030799e07a5517046970e79c6084ee14a228025a277d9d638a AUX mupdf-1.24.1-darwin.patch 604 BLAKE2B 47421e731a53eaa12f963e928900a978db651325dd9ac180861494ed7a4456afed90953ca1b5ebd51310144f383d72ae95726d6feebbda73b17be46f1a656804 SHA512 e239d15b68fced7ff51d85fa67afdbdaf5da77d67be1ca45d49f91080d87a7e2bd583b70678be9a6ed7c5ef69121aa2bc45bb26c7ed4bef3a0121aee5865f7d3 AUX mupdf-1.24.1-openssl-x11.patch 660 BLAKE2B 5fc5d680e05d9ebdf0243ed7cbf44cbf69d836725288059b894fec7c47d8bffa621099303270d8298b966cbbbde49a0fb18a6d1e47ced7558558439b19b31b74 SHA512 24117446375fb8222a4adcef0955cb5e79cdef033faa9fe9331d29eeea85849206eae40bdb9f5e4ff8e8cd98261c28e6bf8f16f218fb3c78adf0fa6e60e8b9fb AUX mupdf-1.24.8-add-desktop-pc-files.patch 841 BLAKE2B ec5bb8c70fb01fd54e58952123f1c1f9ba07a18e9d2718a1d7ef4d5a847049e49578556ebdfb5afca228e0abb4312b07bbed814b267c6401583309357cd5c135 SHA512 78f2c0662caccec43a8b83e9402cb24a6c24efe730860be64157595474e7a738389a11ee1695a22abe5f904aa3587ad4e11940f4c2677f7823ea2545018efd88 AUX mupdf-1.24.8-c23.patch 782 BLAKE2B da6da463c77cb58256327c98c9db04581c115c57009598e74517d6912ee33f11089e35c392312afae0c709bb716c4898d2fcee4766dc26c20460c6d8df6454a6 SHA512 bd4bde8468010841fc22abe445e5a78d35cbb01333378512c045367b58895354631bb1e694b6fe5809a3f844eeaed8719a606db57b64cb6c03965768e7388454 -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 -EBUILD mupdf-1.24.1.ebuild 4966 BLAKE2B d8470b8685706eeac458eb4a49271a25415c4921ff398501dbc7b629630d69fdc2b93f1397c94dc0449ada79b3f0cfa6186d5840b7676a2b0a719a6d4d309186 SHA512 2d039fa41bd7c971127760a6beec47c8cfda2f4d737fad0eeec755469e2197dfe52e3a10a4fb892e44110f9961bd785c228baa31e2b7f4c97176ce073ac18552 +DIST mupdf-1.25.2-source.tar.gz 54635699 BLAKE2B 08e4c1bd4d8f9a731b10e1368c3f4a62a9b949c4a1842f2ce297ef3a595107f63e184230c31149a6a5db9038838d891fdeb0330323afcdc0b6966bee06046288 SHA512 089bcf228a28e5f47e793d66f6355b22b531c031a6d1feb0dd07a5fee55780fda92d6cde646336ca0200869c32d523be23a8fe2232fad010b38673419c7859f2 EBUILD mupdf-1.24.8.ebuild 5016 BLAKE2B 7ad624151e5f4285eb9cd18ad5426a6ab1917f39810ff1441ce13fa1099b2d4d786582ff87e592a3e8f52514d4e758ddde921b42a37f595ddbabe3a8eaa27433 SHA512 c5bb133077d468362feca0aadb2c85dfae28976ae42da0f16480d45bb4de2b7e5a0598457d66e6f9811a7abb37ae591032396bd4921ef4d090c6d7fc781b123e +EBUILD mupdf-1.25.2.ebuild 5023 BLAKE2B d775893b3197771b94017ee8c3e2817be85104761a850b60d33bf567e180406e5662db071159a16accabf600cf9cbfc848687c423eadbf8e86fb34ac252b1e8b SHA512 4e2deaedbd69c738407f0bd4c908d3e0e491733a570b6a4491079faf4d8c94b3f4ab6552b607e61b664ee8ed5703c642d6185a9e4c846438ef2a0cda10e0becb MISC metadata.xml 516 BLAKE2B ad2fb06efd79889747566fbef91a71dcdc3452443dc6edbf077510b494b74b75a153262390c09eb625e54d6c13b63e557acdf11b0843ab35337ff581536fccb8 SHA512 d823f015eb0c9e5354845adf5296de8c52bc33c135b17fba04955ed85b6c5f2ff7c4c630fbf6010b4cd98728591a7340f30e2d6bd90573c1a9f2b3a47ae9a537 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 -} diff --git a/app-text/mupdf/mupdf-1.25.2.ebuild b/app-text/mupdf/mupdf-1.25.2.ebuild new file mode 100644 index 000000000000..f35a2e91fa71 --- /dev/null +++ b/app-text/mupdf/mupdf-1.25.2.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2025 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.24.8-add-desktop-pc-files.patch + "${FILESDIR}"/${PN}-1.24.1-cross-fixes.patch + "${FILESDIR}"/${PN}-1.24.1-darwin.patch + # See bugs #662352 + "${FILESDIR}"/${PN}-1.24.1-openssl-x11.patch + # General cross fixes from Debian (refreshed) + "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch + "${FILESDIR}"/${PN}-1.24.8-c23.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 + # [...]-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/${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 +} -- cgit v1.2.3