public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
Date: Sat, 13 May 2023 03:31:57 +0000 (UTC)	[thread overview]
Message-ID: <1683948609.f31b86c8d773ab8310c3c4f4d135a0cef5fe177e.sam@gentoo> (raw)

commit:     f31b86c8d773ab8310c3c4f4d135a0cef5fe177e
Author:     Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Wed May 10 19:30:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 13 03:30:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31b86c8

app-text/mupdf: add 1.22.0

Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30980
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/mupdf/Manifest            |   1 +
 app-text/mupdf/mupdf-1.22.0.ebuild | 164 +++++++++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 49aa8a04247e..add0b2b8ea22 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,3 +1,4 @@
 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
 DIST mupdf-1.21.0-source.tar.gz 54753613 BLAKE2B bb531f165a9dd8af22aa6e1d65b57d7900bb5128d0c8ad235518ed0b1e446234b147fdd3937f3dd49f627ed2cfb49c4e325baf320f698adbbde68de466f61660 SHA512 a711489e236437e4e7c21373d8624118a5308941148be31cd57a0bbed708b44b1d4030aed71ccb82143159fc3a23e5524738e7fc6177058e6bdaf94a36beaf64
 DIST mupdf-1.21.1-source.tar.gz 57243762 BLAKE2B 9ec79e380af40020d37e4a2a6372175f19b63a47e9f6f55cff777a827f0fba89507d19d4f86394e13209ca8eb9d812c2fc4664f44ed012c91727c9c442bce97c SHA512 11eeea409e0b44d3f754a44b00b15522c2ae2d94171b8c7067efa7acbb1d597eefe1e27607fab90a56bf6c73579bbfb77b7599080fc2504a5881aaf7cc1957c7
+DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7 SHA512 ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59

diff --git a/app-text/mupdf/mupdf-1.22.0.ebuild b/app-text/mupdf/mupdf-1.22.0.ebuild
new file mode 100644
index 000000000000..0b55c2f4345b
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.22.0.ebuild
@@ -0,0 +1,164 @@
+# 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 ~sparc ~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}"/${PN}-1.21.1-no-drm.patch
+	"${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.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
+}


             reply	other threads:[~2023-05-13  3:32 UTC|newest]

Thread overview: 204+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-13  3:31 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-25  0:11 [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/ Sam James
2024-06-25  0:11 Sam James
2024-06-25  0:11 Sam James
2024-06-25  0:11 Sam James
2024-06-24 17:56 Jakov Smolić
2024-06-24 17:56 Jakov Smolić
2024-05-25  7:06 Arthur Zamarin
2024-03-13  6:26 Arthur Zamarin
2024-03-12 21:42 Arthur Zamarin
2024-03-12 21:02 Arthur Zamarin
2024-03-12 19:29 Arthur Zamarin
2024-03-12 19:29 Arthur Zamarin
2024-03-12 19:29 Arthur Zamarin
2024-01-20 12:29 Sam James
2024-01-20 12:04 Sam James
2023-12-23 14:29 Arthur Zamarin
2023-12-23 14:29 Arthur Zamarin
2023-12-23 14:29 Arthur Zamarin
2023-12-23 14:29 Arthur Zamarin
2023-12-23  7:56 Joonas Niilola
2023-12-23  7:56 Joonas Niilola
2023-10-22 14:50 Joonas Niilola
2023-07-07  0:45 Sam James
2023-06-27  1:38 Sam James
2023-06-26 19:50 Sam James
2023-06-26 19:50 Sam James
2023-06-26 19:27 Sam James
2023-06-26 19:27 Sam James
2023-06-26 18:26 Arthur Zamarin
2023-04-07 18:25 Sam James
2023-03-29 15:58 Florian Schmaus
2023-03-29 15:58 Florian Schmaus
2023-02-26  7:02 Joonas Niilola
2023-01-20  7:27 Joonas Niilola
2023-01-20  1:37 Sam James
2023-01-20  1:34 Sam James
2023-01-20  1:17 Sam James
2023-01-20  1:17 Sam James
2023-01-20  1:17 Sam James
2023-01-20  1:17 Sam James
2023-01-07  6:53 Mike Frysinger
2022-12-19 11:05 Florian Schmaus
2022-12-04 18:07 Arthur Zamarin
2022-12-04 18:07 Arthur Zamarin
2022-12-04 18:07 Arthur Zamarin
2022-12-04 17:56 Arthur Zamarin
2022-12-04  6:52 Joonas Niilola
2022-12-04  6:52 Joonas Niilola
2022-11-21  7:10 Florian Schmaus
2022-11-03  2:05 WANG Xuerui
2022-10-05  7:46 Florian Schmaus
2022-10-05  7:46 Florian Schmaus
2022-08-10 10:56 Arthur Zamarin
2022-08-10 10:56 Arthur Zamarin
2022-08-10  8:04 Arthur Zamarin
2022-08-10  8:04 Arthur Zamarin
2022-08-10  7:36 Joonas Niilola
2022-08-10  7:36 Joonas Niilola
2022-07-24  6:55 Florian Schmaus
2022-06-20  2:59 Sam James
2022-06-01 11:07 Jakov Smolić
2022-06-01  8:32 Jakov Smolić
2022-06-01  7:05 Joonas Niilola
2022-06-01  6:00 Joonas Niilola
2022-06-01  5:25 Sam James
2022-06-01  5:25 Sam James
2022-04-29  7:03 Joonas Niilola
2022-02-05  6:53 Joonas Niilola
2022-01-25 21:25 Sam James
2022-01-24 14:42 Sam James
2022-01-24  3:42 Sam James
2022-01-24  3:42 Sam James
2022-01-23 15:22 Sam James
2022-01-23 13:09 Jakov Smolić
2021-12-06 22:45 Sam James
2021-12-04  8:20 Joonas Niilola
2021-10-06  2:24 Sam James
2021-10-06  2:24 Sam James
2021-07-19 14:24 Yixun Lan
2021-06-12 13:42 David Seifert
2021-04-15  8:02 Sam James
2021-04-14 22:03 Sam James
2021-03-23  4:53 Sam James
2021-03-04  4:58 Sam James
2021-02-25 11:19 Sam James
2021-02-25  7:31 Sam James
2021-02-24 20:27 Sam James
2021-02-24 20:26 Sam James
2021-02-24 20:25 Sam James
2021-02-24 20:24 Sam James
2021-02-05 10:37 Sam James
2021-01-18  0:47 Sam James
2021-01-09  3:19 Sam James
2020-12-13  1:06 Sam James
2020-12-07  2:25 Matt Turner
2020-11-10 16:50 Sam James
2020-11-10  5:18 Sam James
2020-11-03  7:44 Sergei Trofimovich
2020-11-03  4:06 Sam James
2020-11-01 15:24 Sam James
2020-10-28 22:34 Sam James
2020-10-20 17:41 Sergei Trofimovich
2020-10-19  3:19 Sam James
2020-10-18 23:55 Sam James
2020-10-18 15:11 Thomas Deutschmann
2020-10-15 22:33 Sergei Trofimovich
2020-10-15 22:29 Sergei Trofimovich
2020-10-15 22:24 Sergei Trofimovich
2020-10-14 19:53 Sam James
2020-10-14 19:30 Sam James
2020-10-14 18:32 Sam James
2020-10-14 18:32 Sam James
2020-10-13 23:21 Sam James
2020-08-14 23:53 Aaron Bauman
2020-01-26 13:39 Johannes Huber
2019-11-22  9:47 Mikle Kolyada
2019-11-17  7:21 Matt Turner
2019-11-14 11:55 Agostino Sarubbo
2019-11-13 22:45 Aaron Bauman
2019-11-13 16:08 Agostino Sarubbo
2019-11-13 16:07 Agostino Sarubbo
2019-11-13 16:07 Agostino Sarubbo
2019-11-13 16:06 Agostino Sarubbo
2019-11-13  8:43 Agostino Sarubbo
2019-10-13 10:51 Mikle Kolyada
2019-07-29 14:49 Mikle Kolyada
2019-07-05 19:05 Virgil Dupras
2019-06-06  6:58 Agostino Sarubbo
2019-06-05 13:10 Agostino Sarubbo
2019-06-04 21:02 Agostino Sarubbo
2019-06-04 14:36 Agostino Sarubbo
2019-06-04  7:53 Tobias Klausmann
2019-05-19 13:14 Thomas Deutschmann
2019-05-17  2:47 Aaron Bauman
2019-05-13 17:06 Mikle Kolyada
2019-05-11 19:18 Virgil Dupras
2019-05-07 11:31 Virgil Dupras
2019-04-27 20:28 David Seifert
2019-03-20 19:06 Mikle Kolyada
2018-12-12 12:59 Mikle Kolyada
2018-12-07  9:43 Mikle Kolyada
2018-11-29 17:44 Tobias Klausmann
2018-11-28 22:28 Sergei Trofimovich
2018-11-28  6:48 Mikle Kolyada
2018-11-27 21:55 Thomas Deutschmann
2018-11-25 18:07 Mikle Kolyada
2018-10-15 20:10 Virgil Dupras
2018-10-08 20:03 Virgil Dupras
2018-10-07 17:43 Virgil Dupras
2018-09-17 23:20 Matt Turner
2018-09-17 23:20 Matt Turner
2018-07-31  0:00 Mikle Kolyada
2018-07-28 13:25 Thomas Deutschmann
2018-07-27  6:35 Sergei Trofimovich
2018-07-25  8:24 Agostino Sarubbo
2018-05-14 11:49 Tobias Klausmann
2018-04-16 21:57 Mikle Kolyada
2018-04-14 14:54 Aaron Bauman
2018-04-14  9:16 Sergei Trofimovich
2018-04-12  0:54 Thomas Deutschmann
2018-04-11 20:23 Thomas Deutschmann
2018-02-04 22:49 Patrice Clement
2017-09-16 12:27 Andreas Sturmlechner
2017-06-22 23:22 Michael Weber
2017-06-22 23:18 Michael Weber
2017-05-23 13:36 Tobias Klausmann
2017-05-13 22:46 Michael Weber
2017-05-13  6:24 Markus Meier
2017-05-10 15:44 Agostino Sarubbo
2017-05-10  9:32 Agostino Sarubbo
2017-05-08 16:25 Jeroen Roovers
2017-05-07 10:36 Agostino Sarubbo
2017-05-06 13:26 Agostino Sarubbo
2017-05-06 10:11 Jeroen Roovers
2017-04-29  9:09 Jeroen Roovers
2017-03-10 12:35 Michael Weber
2017-03-10 12:35 Michael Weber
2017-03-10 10:59 Agostino Sarubbo
2017-03-10  9:09 Agostino Sarubbo
2017-03-08  5:30 Jeroen Roovers
2017-02-13 17:05 Michael Weber
2017-02-13 16:36 Agostino Sarubbo
2017-02-12 22:00 Michael Weber
2017-02-12 17:01 Agostino Sarubbo
2017-02-12 14:48 Agostino Sarubbo
2017-02-11 13:56 Jeroen Roovers
2017-02-05 16:58 Markus Meier
2017-02-01  7:33 Michael Weber
2017-01-29 22:35 Michael Weber
2017-01-24  5:27 Jeroen Roovers
2017-01-23 14:48 Agostino Sarubbo
2017-01-23 14:48 Agostino Sarubbo
2017-01-23  0:37 Michael Weber
2016-10-30  8:17 Pacho Ramos
2016-06-05 11:45 Michael Weber
2016-05-30 20:11 Michael Weber
2016-04-29  5:57 Jeroen Roovers
2016-04-18  0:36 Michael Weber
2016-04-10  8:45 Jeroen Roovers
2016-01-09 11:04 Jeroen Roovers
2016-01-09 10:11 Jeroen Roovers
2015-10-05 14:28 Julian Ospald
2015-08-11 10:29 Michael Weber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1683948609.f31b86c8d773ab8310c3c4f4d135a0cef5fe177e.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox