commit: 59271a38de883bea2a0ebdc0f42dd1ca458b11f0 Author: Philipp Roesner <rndxelement <AT> protonmail <DOT> com> AuthorDate: Fri Dec 3 23:59:47 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sat Dec 4 08:18:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59271a38
app-text/mupdf: bump to 1.19.0 We version bumped the package to mupdf-1.19.0. Several patches were removed because they were fixed upstream. Closes: https://bugs.gentoo.org/827957 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Philipp Roesner <rndxelement <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/23174 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> app-text/mupdf/Manifest | 1 + app-text/mupdf/files/mupdf-1.19.0-Makefile.patch | 37 +++++ .../mupdf/files/mupdf-1.19.0-cross-fixes.patch | 130 ++++++++++++++++++ app-text/mupdf/files/mupdf-1.19.0-darwin.patch | 39 ++++++ app-text/mupdf/mupdf-1.19.0.ebuild | 152 +++++++++++++++++++++ 5 files changed, 359 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index acda2b0eb4e3..c901a64470da 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1 +1,2 @@ DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8 +DIST mupdf-1.19.0-source.tar.xz 64077324 BLAKE2B 4c30cfc004b4f354ae349e5460327775a4dbdd689e561888c156e9e69e22b45ea1f260dfed8d2d8c017fe65a1e83cabc8ff29dad8de47a2c541f9e335bf11285 SHA512 421e8e49f83cf00bfb2c86b5425939056fe866a048cf18e4c8f5764cdee9829974eea655c944d0f3f5a9407347cceaef34030f4079aa399e798da3ff849230e7 diff --git a/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch new file mode 100644 index 000000000000..b266655aaeca --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch @@ -0,0 +1,37 @@ +diff --git a/Makefile b/Makefile +index 7fa74b3..e842374 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,7 +3,7 @@ + -include user.make + + ifndef build +- build := release ++ build := debug + endif + + default: all +@@ -252,17 +252,19 @@ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ) + $(THREAD_LIB) : $(THREAD_OBJ) + $(PKCS7_LIB) : $(PKCS7_OBJ) + else +-MUPDF_LIB = $(OUT)/libmupdf.a ++MUPDF_LIB = libmupdf.so.$(GENTOO_PV) + LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB) +-THIRD_LIB = $(OUT)/libmupdf-third.a ++THIRD_LIB = ++MUPDF_STATIC = $(OUT)/libmupdf.a + ifneq ($(USE_SYSTEM_GLUT),yes) + THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a + endif + THREAD_LIB = $(OUT)/libmupdf-threads.a + PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a + +-$(MUPDF_LIB) : $(MUPDF_OBJ) +-$(THIRD_LIB) : $(THIRD_OBJ) ++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) ++ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS) ++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ) + $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ) + $(THREAD_LIB) : $(THREAD_OBJ) + $(PKCS7_LIB) : $(PKCS7_OBJ) diff --git a/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch new file mode 100644 index 000000000000..643b6d2c8b1e --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch @@ -0,0 +1,130 @@ +Refreshed patches based on: +https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/ +https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/ +--- a/Makefile ++++ b/Makefile +@@ -147,6 +147,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o) + + HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe + ++$(HEXDUMP_EXE): scripts/hexdump.c ++ $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $< ++ + FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff)) + FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc)) + FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf)) +--- a/Makerules ++++ b/Makerules +@@ -6,6 +6,9 @@ OS := $(OS:MSYS%=MINGW) + OS := $(OS:Windows_NT=MINGW) + OS := $(OS:Darwin=MACOS) + ++PKG_CONFIG ?= pkg-config ++CC_FOR_BUILD ?= $(CC) ++ + WARNING_CFLAGS := -Wall -Wsign-compare + + # Feature configuration options +@@ -156,51 +159,51 @@ else ifeq ($(OS),MACOS) + endif + endif + +- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) +- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) +- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) ++ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes) ++ SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2) ++ SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2) + endif +- ifeq ($(shell pkg-config --exists gumbo && echo yes),yes) +- SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo) +- SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo) ++ ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes) ++ SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo) ++ SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo) + endif +- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes) +- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) +- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) ++ ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes) ++ SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz) ++ SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz) + endif +- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes) +- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2) +- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2) ++ ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes) ++ SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2) ++ SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2) + endif +- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes) +- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg) +- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg) ++ ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes) ++ SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg) ++ SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg) + endif +- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) +- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) +- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) ++ ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes) ++ SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2) ++ SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2) + endif +- ifeq ($(shell pkg-config --exists zlib && echo yes),yes) +- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib) +- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) ++ ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes) ++ SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib) ++ SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib) + endif + +- HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes) ++ HAVE_SYS_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes) + ifeq ($(HAVE_SYS_LEPTONICA),yes) +- SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept) +- SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept) ++ SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept) ++ SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept) + endif + +- HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes) ++ HAVE_SYS_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract >= 4.0.0' && echo yes) + ifeq ($(HAVE_SYS_TESSERACT),yes) +- SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract) +- SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract) ++ SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract) ++ SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract) + endif + +- HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) ++ HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes) + ifeq ($(HAVE_SYS_CURL),yes) +- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) +- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) ++ SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl) ++ SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl) + endif + + HAVE_GLUT := yes +@@ -209,16 +212,16 @@ endif + SYS_GLUT_LIBS := -lglut -lGL + endif + + HAVE_X11 := not-unless-portage-tells-me + ifeq ($(HAVE_X11),yes) +- X11_CFLAGS := $(shell pkg-config --cflags x11 xext) +- X11_LIBS := $(shell pkg-config --libs x11 xext) ++ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext) ++ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext) + endif + + HAVE_LIBCRYPTO := not-unless-portage-tells-me + ifeq ($(HAVE_LIBCRYPTO),yes) +- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO +- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) ++ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO ++ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto) + endif + + HAVE_PTHREAD := yes diff --git a/app-text/mupdf/files/mupdf-1.19.0-darwin.patch b/app-text/mupdf/files/mupdf-1.19.0-darwin.patch new file mode 100644 index 000000000000..a81c7a008e44 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.19.0-darwin.patch @@ -0,0 +1,39 @@ +--- a/Makerules ++++ b/Makerules +@@ -139,11 +139,11 @@ ifeq ($(OS),MINGW) + else ifeq ($(OS),MACOS) + HAVE_GLUT := yes + SYS_GLUT_CFLAGS := -Wno-deprecated-declarations +- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL +- CC = xcrun cc +- AR = xcrun ar +- LD = xcrun ld +- RANLIB = xcrun ranlib ++ SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL ++ CC ?= xcrun cc ++ AR ?= xcrun ar ++ LD ?= xcrun ld ++ RANLIB ?= xcrun ranlib + + ifeq (, $(shell which pkg-config)) + $(warning "No pkg-config found, install it for proper integration of libcrypto") +@@ -154,9 +154,7 @@ else ifeq ($(OS),MACOS) + LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) + endif + endif +- +-else ifeq ($(OS),Linux) +- HAVE_OBJCOPY := yes ++endif + + ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) + SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) +@@ -229,8 +227,6 @@ else ifeq ($(OS),Linux) + PTHREAD_LIBS := -lpthread + endif + +-endif +- + # The following section has various cross compilation configurations. + # + # Invoke these as: diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild new file mode 100644 index 000000000000..e98b869cc5e1 --- /dev/null +++ b/app-text/mupdf/mupdf-1.19.0.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# 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.xz"; +S="${WORKDIR}"/${P}-source + +LICENSE="AGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" +IUSE="+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= + virtual/jpeg + javascript? ( >=dev-lang/mujs-1.0.7:= ) + opengl? ( >=media-libs/freeglut-3.0.0 ) + ssl? ( >=dev-libs/openssl-1.1:0= ) + X? ( + x11-libs/libX11 + x11-libs/libXext + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.15-CFLAGS.patch + "${FILESDIR}"/${PN}-1.19.0-Makefile.patch + "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-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 +) + +src_prepare() { + xdg_src_prepare + + 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 +} + +_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 platform/debian/${PN}.xpm + else + rm docs/man/${PN}.1 || die + fi + + sed -i \ + -e "1iprefix = ${ED}/usr" \ + -e "1ilibdir = ${ED}/usr/$(get_libdir)" \ + -e "1idocdir = ${ED}/usr/share/doc/${PF}" \ + -i Makerules || die + + _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 + + insinto /usr/$(get_libdir)/pkgconfig + doins platform/debian/${PN}.pc + + dodoc README CHANGES CONTRIBUTORS +}
