[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: 5674d646d7c612b6a5c7f3801c42a38ed2772c89 Author: Philipp Rösner protonmail com> AuthorDate: Mon Aug 19 17:41:53 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Aug 28 06:07:34 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5674d646 app-text/mupdf: add 1.24.8 Add ebuild for 1.24.8. Update icon path and desktop entry. Upstream changelog doesn't state other changes relevant to the ebuild. Signed-off-by: Philipp Rösner protonmail.com> Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/Manifest| 1 + .../files/mupdf-1.24.8-add-desktop-pc-files.patch | 33 app-text/mupdf/mupdf-1.24.8.ebuild | 166 + 3 files changed, 200 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 2d8887e05469..0b182ac1ae41 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,2 +1,3 @@ DIST mupdf-1.23.7-source.tar.gz 55312697 BLAKE2B 7ceb7c1871d33b77d4a3d52ed2d1af514c09349df019a189fa7df8ad09648fae313d63de4c1ce6b0666d17f9a897d5ac788d0be2d8896d9b7e4e6ecf679bad7c SHA512 581a4a5a16041bb405fbd7c1b9fba47da5745f00cbdf30e0e0468bfe67ac542884193b5957b293a4cdfc52f043b4f19612086f294b93dbd242d34735a1088777 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 diff --git a/app-text/mupdf/files/mupdf-1.24.8-add-desktop-pc-files.patch b/app-text/mupdf/files/mupdf-1.24.8-add-desktop-pc-files.patch new file mode 100644 index ..03d5a014fe48 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.24.8-add-desktop-pc-files.patch @@ -0,0 +1,33 @@ +--- /dev/null ./platform/debian/mupdf.desktop +@@ -0,0 +1,15 @@ ++[Desktop Entry] ++Name=MuPDF ++GenericName=PDF file viewer ++Exec=mupdf %f ++TryExec=mupdf ++Icon=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.8.ebuild b/app-text/mupdf/mupdf-1.24.8.ebuild new file mode 100644 index ..7773f50f2acd --- /dev/null +++ b/app-text/mupdf/mupdf-1.24.8.ebuild @@ -0,0 +1,166 @@ +# 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 ~ia64 ~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.patc
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: 1d4920771fbc0ff99ae8bfecfe3704349a567d69 Author: Philipp Rösner protonmail com> AuthorDate: Mon Aug 19 17:48:38 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Aug 28 06:07:39 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d492077 app-text/mupdf: drop 1.23.7-r1 Drop 1.23.7-r1 as its keywords are overshadowed by 1.24.1. Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/38209 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/Manifest| 1 - .../mupdf/files/mupdf-1.23.3-cross-fixes.patch | 120 --- app-text/mupdf/files/mupdf-1.23.3-darwin.patch | 45 -- .../mupdf/files/mupdf-1.23.3-openssl-x11.patch | 19 --- app-text/mupdf/mupdf-1.23.7-r1.ebuild | 165 - 5 files changed, 350 deletions(-) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 0b182ac1ae41..c1805aa70fe3 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,3 +1,2 @@ -DIST mupdf-1.23.7-source.tar.gz 55312697 BLAKE2B 7ceb7c1871d33b77d4a3d52ed2d1af514c09349df019a189fa7df8ad09648fae313d63de4c1ce6b0666d17f9a897d5ac788d0be2d8896d9b7e4e6ecf679bad7c SHA512 581a4a5a16041bb405fbd7c1b9fba47da5745f00cbdf30e0e0468bfe67ac542884193b5957b293a4cdfc52f043b4f19612086f294b93dbd242d34735a1088777 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 diff --git a/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch deleted file mode 100644 index 02fa3bfdd45c.. --- a/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch +++ /dev/null @@ -1,120 +0,0 @@ -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/Makerules -+++ b/Makerules -@@ -9,6 +9,9 @@ ifeq ($(OS),) - OS := $(OS:Darwin=MACOS) - endif - -+PKG_CONFIG ?= pkg-config -+CC_FOR_BUILD ?= $(CC) -+ - WARNING_CFLAGS := -Wall -Wsign-compare - - # Feature configuration options -@@ -190,51 +193,51 @@ else ifeq ($(OS),Linux) - LDFLAGS += -sTOTAL_MEMORY=48MB - 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_OPENJ
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 8eb9a08748f19f53337d8279346d837810785496 Author: Sam James gentoo org> AuthorDate: Tue Jun 25 00:11:01 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jun 25 00:11:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb9a087 app-text/mupdf: Stabilize 1.24.1 amd64, #934810 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.24.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.24.1.ebuild b/app-text/mupdf/mupdf-1.24.1.ebuild index 66c52dc56ee1..872e7958ac1c 100644 --- a/app-text/mupdf/mupdf-1.24.1.ebuild +++ b/app-text/mupdf/mupdf-1.24.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="archive +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 37f23ef222f93c847b9a0af7fa457511f603a2b0 Author: Sam James gentoo org> AuthorDate: Tue Jun 25 00:11:06 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jun 25 00:11:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f23ef2 app-text/mupdf: Stabilize 1.24.1 x86, #934810 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.24.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.24.1.ebuild b/app-text/mupdf/mupdf-1.24.1.ebuild index 32047d518450..7c9115605a66 100644 --- a/app-text/mupdf/mupdf-1.24.1.ebuild +++ b/app-text/mupdf/mupdf-1.24.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="archive +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: cb874c47dd674363506fd5383db8cafd5bd2bd75 Author: Sam James gentoo org> AuthorDate: Tue Jun 25 00:11:04 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jun 25 00:11:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb874c47 app-text/mupdf: Stabilize 1.24.1 ppc64, #934810 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.24.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.24.1.ebuild b/app-text/mupdf/mupdf-1.24.1.ebuild index 7d03c4527e02..32047d518450 100644 --- a/app-text/mupdf/mupdf-1.24.1.ebuild +++ b/app-text/mupdf/mupdf-1.24.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="archive +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 927f90a35c360836c514d77db65f00b916f10745 Author: Sam James gentoo org> AuthorDate: Tue Jun 25 00:11:03 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jun 25 00:11:03 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927f90a3 app-text/mupdf: Stabilize 1.24.1 arm, #934810 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.24.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.24.1.ebuild b/app-text/mupdf/mupdf-1.24.1.ebuild index 872e7958ac1c..7d03c4527e02 100644 --- a/app-text/mupdf/mupdf-1.24.1.ebuild +++ b/app-text/mupdf/mupdf-1.24.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="archive +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 1723ca28c05e66c004fcff52f6a82c4373e5dbf4 Author: Jakov Smolić gentoo org> AuthorDate: Mon Jun 24 17:56:32 2024 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Jun 24 17:56:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1723ca28 app-text/mupdf: Stabilize 1.24.1 ppc, #934810 Signed-off-by: Jakov Smolić gentoo.org> app-text/mupdf/mupdf-1.24.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.24.1.ebuild b/app-text/mupdf/mupdf-1.24.1.ebuild index 932ad8b00368..66c52dc56ee1 100644 --- a/app-text/mupdf/mupdf-1.24.1.ebuild +++ b/app-text/mupdf/mupdf-1.24.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="archive +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 1cd8986a6104d4b6680a350c48f3de0382cfb9a1 Author: Jakov Smolić gentoo org> AuthorDate: Mon Jun 24 17:56:31 2024 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Jun 24 17:56:31 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd8986a app-text/mupdf: Stabilize 1.24.1 arm64, #934810 Signed-off-by: Jakov Smolić gentoo.org> app-text/mupdf/mupdf-1.24.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.24.1.ebuild b/app-text/mupdf/mupdf-1.24.1.ebuild index 25256507c5bc..932ad8b00368 100644 --- a/app-text/mupdf/mupdf-1.24.1.ebuild +++ b/app-text/mupdf/mupdf-1.24.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="archive +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: 2c435680ca5545dfcf3215d7a9d2d646c9209e48 Author: Philipp Rösner protonmail com> AuthorDate: Sat May 4 18:47:19 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 25 07:04:08 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c435680 app-text/mupdf: drop 1.22.0-r1, 1.23.3-r1 Signed-off-by: Philipp Rösner protonmail.com> Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/Manifest| 2 - app-text/mupdf/files/mupdf-1.15-openssl-x11.patch | 18 --- .../mupdf/files/mupdf-1.19.0-cross-fixes.patch | 130 app-text/mupdf/files/mupdf-1.19.0-darwin.patch | 39 - app-text/mupdf/files/mupdf-1.21.1-no-drm.patch | 18 --- app-text/mupdf/mupdf-1.22.0-r1.ebuild | 164 - app-text/mupdf/mupdf-1.23.3-r1.ebuild | 164 - 7 files changed, 535 deletions(-) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index e50372953f7c..2d8887e05469 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,4 +1,2 @@ -DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7 SHA512 ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59 -DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465 SHA512 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737 DIST mupdf-1.23.7-source.tar.gz 55312697 BLAKE2B 7ceb7c1871d33b77d4a3d52ed2d1af514c09349df019a189fa7df8ad09648fae313d63de4c1ce6b0666d17f9a897d5ac788d0be2d8896d9b7e4e6ecf679bad7c SHA512 581a4a5a16041bb405fbd7c1b9fba47da5745f00cbdf30e0e0468bfe67ac542884193b5957b293a4cdfc52f043b4f19612086f294b93dbd242d34735a1088777 DIST mupdf-1.24.1-source.tar.gz 55310618 BLAKE2B 33396b0cca6e2beb1b2bc70c606917c8d9b30b6a277645849ef7ba1e7efbf909c21196acdd5d94d964dd20d3ba746c45cab3c899dfbee1b2138de12e32375a4e SHA512 9d6fbd3388173f06c5db4a27753e69afd21ed32d93f263d4448c3be60a3be747b61102edd5430459f0dbe7ae4df2019689a2f3a582acec77ff322b6d41066fba diff --git a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch deleted file mode 100644 index 3f3aac4c933a.. --- a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch +++ /dev/null @@ -1,18 +0,0 @@ a/Makerules -+++ b/Makerules -@@ -119,13 +119,13 @@ else ifeq ($(OS),Linux) - SYS_GLUT_LIBS := -lglut -lGL - endif - -- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) -+ 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) - endif - -- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) -+ 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) 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 deleted file mode 100644 index 643b6d2c8b1e.. --- a/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch +++ /dev/null @@ -1,130 +0,0 @@ -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 free
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 90d7cb9618e6e19fba048de90d7137cf3d1a5513 Author: Philipp Rösner protonmail com> AuthorDate: Sat May 4 18:48:21 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 25 07:04:08 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d7cb96 app-text/mupdf: remove local use flag drm DRM unlocking has been fixed upstream a while ago. Use flag no longer used. Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/36550 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml index 0e5cd3a8d8d5..44f37887c3a4 100644 --- a/app-text/mupdf/metadata.xml +++ b/app-text/mupdf/metadata.xml @@ -11,6 +11,5 @@ Enable support for CBR and other archive formats using libarchive - Enable support for Digital rights management (DRM)
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: dc4b87e7add0dcdc791e922d28de8b3e36ac80e0 Author: Philipp Rösner protonmail com> AuthorDate: Sat May 4 18:42:51 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 25 07:04:08 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc4b87e7 app-text/mupdf: add 1.24.1 Add local use flag 'archive' for enabling support for various archive format using libarchive. Signed-off-by: Philipp Rösner protonmail.com> Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/Manifest| 1 + .../mupdf/files/mupdf-1.24.1-cross-fixes.patch | 154 +++ app-text/mupdf/files/mupdf-1.24.1-darwin.patch | 20 +++ .../mupdf/files/mupdf-1.24.1-openssl-x11.patch | 19 +++ app-text/mupdf/metadata.xml| 1 + app-text/mupdf/mupdf-1.24.1.ebuild | 166 + 6 files changed, 361 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index a835f7c90abd..e50372953f7c 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,3 +1,4 @@ DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7 SHA512 ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59 DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465 SHA512 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737 DIST mupdf-1.23.7-source.tar.gz 55312697 BLAKE2B 7ceb7c1871d33b77d4a3d52ed2d1af514c09349df019a189fa7df8ad09648fae313d63de4c1ce6b0666d17f9a897d5ac788d0be2d8896d9b7e4e6ecf679bad7c SHA512 581a4a5a16041bb405fbd7c1b9fba47da5745f00cbdf30e0e0468bfe67ac542884193b5957b293a4cdfc52f043b4f19612086f294b93dbd242d34735a1088777 +DIST mupdf-1.24.1-source.tar.gz 55310618 BLAKE2B 33396b0cca6e2beb1b2bc70c606917c8d9b30b6a277645849ef7ba1e7efbf909c21196acdd5d94d964dd20d3ba746c45cab3c899dfbee1b2138de12e32375a4e SHA512 9d6fbd3388173f06c5db4a27753e69afd21ed32d93f263d4448c3be60a3be747b61102edd5430459f0dbe7ae4df2019689a2f3a582acec77ff322b6d41066fba diff --git a/app-text/mupdf/files/mupdf-1.24.1-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.24.1-cross-fixes.patch new file mode 100644 index ..6d87798c2e66 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.24.1-cross-fixes.patch @@ -0,0 +1,154 @@ +# Fix cross compilation issue with pkg-config +--- a/Makerules b/Makerules +@@ -9,6 +9,8 @@ ifeq ($(OS),) + OS := $(OS:Darwin=MACOS) + endif + ++PKG_CONFIG ?= pkg-config ++CC_FOR_BUILD ?= $(CC) + WARNING_CFLAGS := -Wall -Wsign-compare + + # Feature configuration options +@@ -194,13 +196,13 @@ else ifeq ($(OS),MACOS) + ifneq ($(ARCHFLAGS),) + $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.") + HAVE_LIBCRYPTO := no +- else ifeq (, $(shell command -v pkg-config)) ++ else ifeq (, $(shell command -v $(PKG_CONFIG))) + $(warning "No pkg-config found, install it for proper integration of libcrypto") + else +-HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) ++HAVE_LIBCRYPTO := $(shell $(PKG_CONFIG) --exists 'libcrypto >= 1.1.0' && echo yes) + 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 + endif + +@@ -210,82 +212,82 @@ else ifeq ($(LINUX_OR_OPENBSD),yes) + HAVE_OBJCOPY := yes + 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-conf
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: d10deb48ad1af4ba826cf11dbe67c160ffca28e4 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Mar 13 06:26:30 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Mar 13 06:26:30 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d10deb48 app-text/mupdf: Stabilize 1.23.7-r1 amd64, #926846 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.23.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.7-r1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild index 81eae9edf09c..d27ecf8911d4 100644 --- a/app-text/mupdf/mupdf-1.23.7-r1.ebuild +++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 947e246ba8b417e984f12f2958f05101b0baae9b Author: Arthur Zamarin gentoo org> AuthorDate: Tue Mar 12 21:42:41 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Mar 12 21:42:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947e246b app-text/mupdf: Stabilize 1.23.7-r1 x86, #926846 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.23.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.7-r1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild index e4ec97978e1d..81eae9edf09c 100644 --- a/app-text/mupdf/mupdf-1.23.7-r1.ebuild +++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: d4413dcef7dda84184940da245d9448657e5b190 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Mar 12 21:02:18 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Mar 12 21:02:18 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4413dce app-text/mupdf: Stabilize 1.23.7-r1 arm64, #926846 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.23.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.7-r1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild index 04be45dd91cf..e4ec97978e1d 100644 --- a/app-text/mupdf/mupdf-1.23.7-r1.ebuild +++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: c4ea419fd463d9d659c24f893cd2a032e8688983 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Mar 12 19:28:52 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Mar 12 19:28:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ea419f app-text/mupdf: Stabilize 1.23.7-r1 ppc, #926846 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.23.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.7-r1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild index d54e9d7dbaad..04be45dd91cf 100644 --- a/app-text/mupdf/mupdf-1.23.7-r1.ebuild +++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 4e91b92285fd9f0e2b2a2a062d77678402c66ade Author: Arthur Zamarin gentoo org> AuthorDate: Tue Mar 12 19:28:52 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Mar 12 19:28:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e91b922 app-text/mupdf: Stabilize 1.23.7-r1 ppc64, #926846 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.23.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.7-r1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild index 3fbdc777442c..d54e9d7dbaad 100644 --- a/app-text/mupdf/mupdf-1.23.7-r1.ebuild +++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 63a536845b44acfe40fb021fd9f7f2f39cfaf03b Author: Arthur Zamarin gentoo org> AuthorDate: Tue Mar 12 19:28:51 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Mar 12 19:28:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a53684 app-text/mupdf: Stabilize 1.23.7-r1 arm, #926846 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.23.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.7-r1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild index 355cabb0620f..3fbdc777442c 100644 --- a/app-text/mupdf/mupdf-1.23.7-r1.ebuild +++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: e9801b40efe34112bd6cdc32aa5d1c7418e6131e Author: Sam James gentoo org> AuthorDate: Sat Jan 20 12:28:01 2024 + Commit: Sam James gentoo org> CommitDate: Sat Jan 20 12:28:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9801b40 app-text/mupdf: subscribe to gumbo subslot Changed ABI. Signed-off-by: Sam James gentoo.org> app-text/mupdf/{mupdf-1.22.0.ebuild => mupdf-1.22.0-r1.ebuild} | 4 ++-- app-text/mupdf/{mupdf-1.23.3.ebuild => mupdf-1.23.3-r1.ebuild} | 4 ++-- app-text/mupdf/{mupdf-1.23.7.ebuild => mupdf-1.23.7-r1.ebuild} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app-text/mupdf/mupdf-1.22.0.ebuild b/app-text/mupdf/mupdf-1.22.0-r1.ebuild similarity index 98% rename from app-text/mupdf/mupdf-1.22.0.ebuild rename to app-text/mupdf/mupdf-1.22.0-r1.ebuild index 134e69b027cd..fc8bbe571872 100644 --- a/app-text/mupdf/mupdf-1.22.0.ebuild +++ b/app-text/mupdf/mupdf-1.22.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ REQUIRED_USE="opengl? ( javascript )" # bug #653298), the best way to ensure that its dependencies are present is to # install system's freeglut. RDEPEND=" - dev-libs/gumbo + dev-libs/gumbo:= media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= diff --git a/app-text/mupdf/mupdf-1.23.3.ebuild b/app-text/mupdf/mupdf-1.23.3-r1.ebuild similarity index 98% rename from app-text/mupdf/mupdf-1.23.3.ebuild rename to app-text/mupdf/mupdf-1.23.3-r1.ebuild index ec538296fd58..7c7e19d9e75c 100644 --- a/app-text/mupdf/mupdf-1.23.3.ebuild +++ b/app-text/mupdf/mupdf-1.23.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ REQUIRED_USE="opengl? ( javascript )" # bug #653298), the best way to ensure that its dependencies are present is to # install system's freeglut. RDEPEND=" - dev-libs/gumbo + dev-libs/gumbo:= media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= diff --git a/app-text/mupdf/mupdf-1.23.7.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild similarity index 98% rename from app-text/mupdf/mupdf-1.23.7.ebuild rename to app-text/mupdf/mupdf-1.23.7-r1.ebuild index ef850b89b6d9..355cabb0620f 100644 --- a/app-text/mupdf/mupdf-1.23.7.ebuild +++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ REQUIRED_USE="opengl? ( javascript )" # bug #653298), the best way to ensure that its dependencies are present is to # install system's freeglut. RDEPEND=" - dev-libs/gumbo + dev-libs/gumbo:= media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:=
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 72ffabd24a709e3a2dc7aaf1d7432aa278742a4c Author: Philipp Rösner protonmail com> AuthorDate: Wed Nov 1 21:50:59 2023 + Commit: Sam James gentoo org> CommitDate: Sat Jan 20 12:02:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ffabd2 app-text/mupdf: add 1.23.7 Add sed call to make pkgconfig file respect EPREFIX. Closes: https://bugs.gentoo.org/911965 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/33635 Signed-off-by: Sam James gentoo.org> app-text/mupdf/Manifest| 1 + app-text/mupdf/mupdf-1.23.7.ebuild | 165 + 2 files changed, 166 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 604d267216ce..a835f7c90abd 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,2 +1,3 @@ DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7 SHA512 ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59 DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465 SHA512 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737 +DIST mupdf-1.23.7-source.tar.gz 55312697 BLAKE2B 7ceb7c1871d33b77d4a3d52ed2d1af514c09349df019a189fa7df8ad09648fae313d63de4c1ce6b0666d17f9a897d5ac788d0be2d8896d9b7e4e6ecf679bad7c SHA512 581a4a5a16041bb405fbd7c1b9fba47da5745f00cbdf30e0e0468bfe67ac542884193b5957b293a4cdfc52f043b4f19612086f294b93dbd242d34735a1088777 diff --git a/app-text/mupdf/mupdf-1.23.7.ebuild b/app-text/mupdf/mupdf-1.23.7.ebuild new file mode 100644 index ..ef850b89b6d9 --- /dev/null +++ b/app-text/mupdf/mupdf-1.23.7.ebuild @@ -0,0 +1,165 @@ +# 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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= + >=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}"/${PN}-1.23.3-darwin.patch + # See bugs #662352 + "${FILESDIR}"/${PN}-1.23.3-openssl-x11.patch + # General cross fixes from Debian (refreshed) + "${FILESDIR}"/${PN}-1.23.3-cross-fixes.patch + "${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
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 531256acee11473b6a20dd00057958f027babbd8 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Dec 23 14:29:13 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Dec 23 14:29:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531256ac app-text/mupdf: Stabilize 1.23.3 arm, #920480 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.23.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.3.ebuild b/app-text/mupdf/mupdf-1.23.3.ebuild index ae46845d6356..628a5b602fe3 100644 --- a/app-text/mupdf/mupdf-1.23.3.ebuild +++ b/app-text/mupdf/mupdf-1.23.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 41df59a950f1b1566c2197aec81df9ace335da59 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Dec 23 14:29:15 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Dec 23 14:29:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41df59a9 app-text/mupdf: Stabilize 1.23.3 arm64, #920480 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.23.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.3.ebuild b/app-text/mupdf/mupdf-1.23.3.ebuild index c37fa3af504f..ec538296fd58 100644 --- a/app-text/mupdf/mupdf-1.23.3.ebuild +++ b/app-text/mupdf/mupdf-1.23.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: fe0b96f40a29b87323584df04880d7bd87636e9b Author: Arthur Zamarin gentoo org> AuthorDate: Sat Dec 23 14:29:12 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Dec 23 14:29:12 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe0b96f4 app-text/mupdf: Stabilize 1.23.3 ppc, #920480 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.23.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.3.ebuild b/app-text/mupdf/mupdf-1.23.3.ebuild index 37485bed8be5..ae46845d6356 100644 --- a/app-text/mupdf/mupdf-1.23.3.ebuild +++ b/app-text/mupdf/mupdf-1.23.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 6d7b51413e9edb3d3d2cbd51af35701d3ddf9efa Author: Arthur Zamarin gentoo org> AuthorDate: Sat Dec 23 14:29:14 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Dec 23 14:29:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7b5141 app-text/mupdf: Stabilize 1.23.3 ppc64, #920480 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.23.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.3.ebuild b/app-text/mupdf/mupdf-1.23.3.ebuild index 628a5b602fe3..c37fa3af504f 100644 --- a/app-text/mupdf/mupdf-1.23.3.ebuild +++ b/app-text/mupdf/mupdf-1.23.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 1d4c2f3a713dbd4f5dcfc96d75a56c5e051a67b0 Author: Joonas Niilola gentoo org> AuthorDate: Sat Dec 23 07:56:03 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Dec 23 07:56:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4c2f3a app-text/mupdf: Stabilize 1.23.3 x86, #920480 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.23.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.3.ebuild b/app-text/mupdf/mupdf-1.23.3.ebuild index ee5ef32f4445..37485bed8be5 100644 --- a/app-text/mupdf/mupdf-1.23.3.ebuild +++ b/app-text/mupdf/mupdf-1.23.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 20bc1f0c0b06a94c7ec3c0625133ba5af1759f83 Author: Joonas Niilola gentoo org> AuthorDate: Sat Dec 23 07:55:42 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Dec 23 07:56:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20bc1f0c app-text/mupdf: Stabilize 1.23.3 amd64, #920480 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.23.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.23.3.ebuild b/app-text/mupdf/mupdf-1.23.3.ebuild index 7549d72031a4..ee5ef32f4445 100644 --- a/app-text/mupdf/mupdf-1.23.3.ebuild +++ b/app-text/mupdf/mupdf-1.23.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 8dc589bb73695e2b430fefd16f80669c42d2d736 Author: Joonas Niilola gentoo org> AuthorDate: Sun Oct 22 14:49:48 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Oct 22 14:49:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc589bb app-text/mupdf: drop 1.19.1 Bug: https://bugs.gentoo.org/803305 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/Manifest| 1 - app-text/mupdf/mupdf-1.19.1.ebuild | 153 - 2 files changed, 154 deletions(-) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 5898141302e2..604d267216ce 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,3 +1,2 @@ -DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7 DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7 SHA512 ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59 DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465 SHA512 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737 diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild deleted file mode 100644 index f2daed4e1287.. --- a/app-text/mupdf/mupdf-1.19.1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2022 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.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= - >=media-libs/libjpeg-turbo-1.5.3-r2:0 - 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="X? ( x11-base/xorg-proto ) - 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() { - 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()" -} - -_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
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
commit: c2d5f763e01c478515a9b6d416b1b68a3858672c Author: Philipp Rösner protonmail com> AuthorDate: Thu Sep 14 14:36:37 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun Oct 15 08:47:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d5f763 app-text/mupdf: add 1.23.3 Signed-off-by: Philipp Rösner protonmail.com> Signed-off-by: Viorel Munteanu gentoo.org> app-text/mupdf/Manifest| 1 + .../mupdf/files/mupdf-1.23.3-cross-fixes.patch | 120 +++ app-text/mupdf/files/mupdf-1.23.3-darwin.patch | 45 ++ .../mupdf/files/mupdf-1.23.3-openssl-x11.patch | 19 +++ app-text/mupdf/mupdf-1.23.3.ebuild | 164 + 5 files changed, 349 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index add0b2b8ea22..8380bb69f1e2 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -2,3 +2,4 @@ DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb481 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 +DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465 SHA512 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737 diff --git a/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch new file mode 100644 index ..02fa3bfdd45c --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch @@ -0,0 +1,120 @@ +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/Makerules b/Makerules +@@ -9,6 +9,9 @@ ifeq ($(OS),) + OS := $(OS:Darwin=MACOS) + endif + ++PKG_CONFIG ?= pkg-config ++CC_FOR_BUILD ?= $(CC) ++ + WARNING_CFLAGS := -Wall -Wsign-compare + + # Feature configuration options +@@ -190,51 +193,51 @@ else ifeq ($(OS),Linux) + LDFLAGS += -sTOTAL_MEMORY=48MB + 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 ($(sh
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
commit: 0c858240680739e3a08b1957340afe8f6c7eef6a Author: Philipp Rösner protonmail com> AuthorDate: Fri Oct 13 19:42:20 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun Oct 15 08:47:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c858240 app-text/mupdf: drop 1.21.0, 1.21.1-r1 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/32779 Signed-off-by: Viorel Munteanu gentoo.org> app-text/mupdf/Manifest| 2 - .../mupdf-1.10a-add-desktop-pc-xpm-files.patch | 533 - .../files/mupdf-1.21.1-fix-url-processing.patch| 25 - app-text/mupdf/mupdf-1.21.0.ebuild | 159 -- app-text/mupdf/mupdf-1.21.1-r1.ebuild | 167 --- 5 files changed, 886 deletions(-) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 8380bb69f1e2..5898141302e2 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,5 +1,3 @@ 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 DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465 SHA512 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737 diff --git a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch b/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch deleted file mode 100644 index decab5015bf5.. --- a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch +++ /dev/null @@ -1,533 +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=mupdf -+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} /dev/null -+++ ./platform/debian/mupdf.xpm -@@ -0,0 +1,497 @@ -+/* XPM */ -+static char *mupdf[] = { -+/* width height ncolors chars_per_pixel */ -+"48 48 442 2", -+/* colors */ -+" c #00", -+" . c #2E4558", -+" X c #252121", -+" o c #AFAFAF", -+" O c #28313B", -+" + c #231F1F", -+" @ c #68", -+" # c #98BDD7", -+" $ c #201B1C", -+" % c #7CABCC", -+" & c #4487B6", -+" * c #DFDEDE", -+" = c #4285B4", -+" - c #615E5F", -+" ; c #605E5E", -+" : c #23262C", -+" > c #D9D8D8", -+" , c #F7FAFC", -+" < c #D7D6D6", -+" 1 c #BFD6E6", -+" 2 c #6BA0C5", -+" 3 c #232122", -+" 4 c #555253", -+" 5 c #CD", -+" 6 c #E7EFF6", -+" 7 c #4786B2", -+" 8 c #CADDEA", -+" 9 c #4085B5", -+" 0 c #AECBDF", -+" q c #CBCACA", -+" w c #92B9D4", -+" e c #365F7D", -+" r c #5A95BE", -+" t c #3E83B3", -+" y c #304B60", -+" u c #C7C6C6", -+" i c #4D8EBB", -+" p c #F1F6F9", -+" a c #C1C0C0", -+" s c #454243", -+" d c #669CC3", -+" f c #81AECD", -+" g c #7A", -+" h c #434041", -+" j c #3E779F", -+" k c #272E36", -+" l c #413E3F", -+" z c #3F3C3D", -+" x c #5895BF", -+" c c #3D3A3B", -+" v c #C6DBE9", -+" b c #B8B6B7", -+" n c #4282B0", -+" m c #FDFDFE", -+" M c #B7B6B6", -+" N c #8DB5D2", -+" B c #2425
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 64a5b37b270e9b962ccce4aa990c8fc9f7a32fbd Author: Matoro Mahri users noreply github com> AuthorDate: Thu Jul 6 21:57:06 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jul 7 00:44:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a5b37b app-text/mupdf: Keyword 1.22.0 mips, #902735 Signed-off-by: Matoro Mahri users.noreply.github.com> Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.22.0.ebuild b/app-text/mupdf/mupdf-1.22.0.ebuild index 7bd5c1cc0dfd..134e69b027cd 100644 --- a/app-text/mupdf/mupdf-1.22.0.ebuild +++ b/app-text/mupdf/mupdf-1.22.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+drm +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 133755a74d3faa98d46c3a6294345eb7653a106a Author: Sam James gentoo org> AuthorDate: Tue Jun 27 01:22:06 2023 + Commit: Sam James gentoo org> CommitDate: Tue Jun 27 01:22:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133755a7 app-text/mupdf: Stabilize 1.22.0 ppc, #909195 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.22.0.ebuild b/app-text/mupdf/mupdf-1.22.0.ebuild index e786606a29b8..7bd5c1cc0dfd 100644 --- a/app-text/mupdf/mupdf-1.22.0.ebuild +++ b/app-text/mupdf/mupdf-1.22.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+drm +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 6532d4fc73709217a367f49c3ed7537b5c2a0127 Author: Sam James gentoo org> AuthorDate: Mon Jun 26 19:50:31 2023 + Commit: Sam James gentoo org> CommitDate: Mon Jun 26 19:50:31 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6532d4fc app-text/mupdf: Stabilize 1.22.0 arm, #909195 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.22.0.ebuild b/app-text/mupdf/mupdf-1.22.0.ebuild index a30083964c88..d8b517af304e 100644 --- a/app-text/mupdf/mupdf-1.22.0.ebuild +++ b/app-text/mupdf/mupdf-1.22.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+drm +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: a4392103ed1a2ac220315c3ce2047dae44311147 Author: Sam James gentoo org> AuthorDate: Mon Jun 26 19:50:33 2023 + Commit: Sam James gentoo org> CommitDate: Mon Jun 26 19:50:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4392103 app-text/mupdf: Stabilize 1.22.0 arm64, #909195 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.22.0.ebuild b/app-text/mupdf/mupdf-1.22.0.ebuild index d8b517af304e..e786606a29b8 100644 --- a/app-text/mupdf/mupdf-1.22.0.ebuild +++ b/app-text/mupdf/mupdf-1.22.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+drm +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: c7eabac4a5d0933f49023a6a6357bd3257bf96fc Author: Sam James gentoo org> AuthorDate: Mon Jun 26 19:27:21 2023 + Commit: Sam James gentoo org> CommitDate: Mon Jun 26 19:27:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7eabac4 app-text/mupdf: Stabilize 1.22.0 amd64, #909195 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.22.0.ebuild b/app-text/mupdf/mupdf-1.22.0.ebuild index 9c50a864800e..ffb828bab9a6 100644 --- a/app-text/mupdf/mupdf-1.22.0.ebuild +++ b/app-text/mupdf/mupdf-1.22.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+drm +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: d96c6dece0512840d2df41ea387028d55887f9e8 Author: Sam James gentoo org> AuthorDate: Mon Jun 26 19:27:23 2023 + Commit: Sam James gentoo org> CommitDate: Mon Jun 26 19:27:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96c6dec app-text/mupdf: Stabilize 1.22.0 x86, #909195 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.22.0.ebuild b/app-text/mupdf/mupdf-1.22.0.ebuild index ffb828bab9a6..a30083964c88 100644 --- a/app-text/mupdf/mupdf-1.22.0.ebuild +++ b/app-text/mupdf/mupdf-1.22.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+drm +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: b15e09db02dd557905c377e048bd1423db74f81d Author: Arthur Zamarin gentoo org> AuthorDate: Mon Jun 26 18:25:44 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Jun 26 18:25:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b15e09db app-text/mupdf: Stabilize 1.22.0 ppc64, #909195 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.22.0.ebuild b/app-text/mupdf/mupdf-1.22.0.ebuild index 0b55c2f4345b..9c50a864800e 100644 --- a/app-text/mupdf/mupdf-1.22.0.ebuild +++ b/app-text/mupdf/mupdf-1.22.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+drm +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: f31b86c8d773ab8310c3c4f4d135a0cef5fe177e Author: Philipp Rösner protonmail com> AuthorDate: Wed May 10 19:30:34 2023 + Commit: Sam James gentoo org> CommitDate: Sat May 13 03:30:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31b86c8 app-text/mupdf: add 1.22.0 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/30980 Signed-off-by: Sam James 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 ..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.patc
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 789f2da3a8ef38202ca75b0f2f7265d4feca38fc Author: Sam James gentoo org> AuthorDate: Fri Apr 7 18:23:47 2023 + Commit: Sam James gentoo org> CommitDate: Fri Apr 7 18:24:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789f2da3 app-text/mupdf: Keyword 1.21.1-r1 sparc, #761550 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.21.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.21.1-r1.ebuild b/app-text/mupdf/mupdf-1.21.1-r1.ebuild index 590791e7653f..9917968a7e2e 100644 --- a/app-text/mupdf/mupdf-1.21.1-r1.ebuild +++ b/app-text/mupdf/mupdf-1.21.1-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+drm +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 50adce73aaa5123bd4c77baebe28a4269984a5a5 Author: Philipp Rösner protonmail com> AuthorDate: Fri Mar 17 15:01:26 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Mar 29 15:58:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50adce73 app-text/mupdf: drop 1.21.1 Signed-off-by: Philipp Rösner protonmail.com> Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/Manifest| 1 - app-text/mupdf/mupdf-1.20.0.ebuild | 159 app-text/mupdf/mupdf-1.21.1.ebuild | 163 - 3 files changed, 323 deletions(-) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 1c6a62b465b4..c6574b32d531 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,5 +1,4 @@ DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7 -DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4 DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee 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 diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild deleted file mode 100644 index a8b45265f9c4.. --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2022 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 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= - >=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= ) - 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.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 - "${FILESDIR}"/${P}-lcms2.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 Ma
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/
commit: 96848694b023c4b3033d5148188d797920f7018c Author: Philipp Rösner protonmail com> AuthorDate: Fri Mar 17 15:09:33 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Mar 29 15:58:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96848694 app-text/mupdf: remove unused patches Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/30182 Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/files/mupdf-1.20.0-lcms2.patch | 69 --- 1 file changed, 69 deletions(-) diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch deleted file mode 100644 index a5cb30e3b74c.. --- a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch +++ /dev/null @@ -1,69 +0,0 @@ -From d98de0bb0b627772625c1acf050ba0dd4b5ac9df Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Tue, 5 Jul 2022 11:35:28 +0200 -Subject: [PATCH] Perform type punning via union without undefined behavior - -* The previous code from c3d7f491e2daebda2413fb3d2935c51df1c50ac7 - still contains undefined behavior, since it just creates - temporary pointer variables. - src/cmsplugin.c | 31 +++ - 1 file changed, 15 insertions(+), 16 deletions(-) - -This patch slightly differs from the upstream commit, because -the lcms2 version used in mupdf is slightly behind the upstream -version. - -See: https://github.com/mm2/Little-CMS/commit/d98de0bb0b627772625c1acf050ba0dd4b5ac9df.patch - -diff --git a/src/cmsplugin.c b/src/cmsplugin.c -index 556fbc28..b34e3aab 100644 a/thirdparty/lcms2/src/cmsplugin.c -+++ b/thirdparty/lcms2/src/cmsplugin.c -@@ -167,17 +167,20 @@ cmsBool CMSEXPORT _cmsReadUInt32Number(cmsContext ContextID, cmsIOHANDLER* io, - - cmsBool CMSEXPORT _cmsReadFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, cmsFloat32Number* n) - { --cmsUInt32Number tmp; -+union typeConverter { -+cmsUInt32Number integer; -+cmsFloat32Number floating_point; -+} tmp; - - _cmsAssert(io != NULL); - --if (io->Read(ContextID, io, &tmp, sizeof(cmsUInt32Number), 1) != 1) -+if (io->Read(ContextID, io, &tmp.integer, sizeof(cmsUInt32Number), 1) != 1) - return FALSE; - - if (n != NULL) { - --tmp = _cmsAdjustEndianess32(tmp); --*n = *(cmsFloat32Number*)(void*)&tmp; -+tmp.integer = _cmsAdjustEndianess32(tmp.integer); -+*n = tmp.floating_point; - - // Safeguard which covers against absurd values - if (*n > 1E+20 || *n < -1E+20) return FALSE; -@@ -304,13 +307,14 @@ cmsBool CMSEXPORT _cmsWriteUInt32Number(cmsContext ContextID, cmsIOHANDLER* io, - - cmsBool CMSEXPORT _cmsWriteFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, cmsFloat32Number n) - { --cmsUInt32Number tmp; -- --_cmsAssert(io != NULL); -- --tmp = *(cmsUInt32Number*) (void*) &n; --tmp = _cmsAdjustEndianess32(tmp); --if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp) != 1) -+union typeConverter { -+cmsUInt32Number integer; -+cmsFloat32Number floating_point; -+} tmp; -+ -+tmp.floating_point = n; -+tmp.integer = _cmsAdjustEndianess32(tmp.integer); -+if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp.integer) != 1) - return FALSE; - - return TRUE;
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 31644bdc597349e9d380a310328e656d14e56d5f Author: Philipp Rösner protonmail com> AuthorDate: Fri Mar 17 15:03:37 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Mar 29 15:58:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31644bdc app-text/mupdf: drop 1.20.3 Signed-off-by: Philipp Rösner protonmail.com> Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/Manifest| 1 - app-text/mupdf/mupdf-1.20.3.ebuild | 160 - 2 files changed, 161 deletions(-) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index c6574b32d531..49aa8a04247e 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,4 +1,3 @@ DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7 -DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee 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 diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild deleted file mode 100644 index bd19f33ee9aa.. --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2022 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="+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.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 - "${FILESDIR}"/${PN}-1.20.0-lcms2.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.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() {
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: 2d0b50425eb4184f10e275934e8c6939c9bffea8 Author: Philipp Rösner protonmail com> AuthorDate: Mon Feb 13 21:42:05 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Feb 26 06:59:58 2023 + 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 protonmail.com> Signed-off-by: Joonas Niilola 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 ..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 +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 ..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 v
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: cfdba5f0f221176f4110b181cda8325f11c25ac4 Author: Philipp Rösner protonmail com> AuthorDate: Mon Feb 13 21:47:33 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Feb 26 07:00:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfdba5f0 app-text/mupdf: fix QA excessive line length in 1.21.1-r1 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/29574 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.21.1-r1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.21.1-r1.ebuild b/app-text/mupdf/mupdf-1.21.1-r1.ebuild index e8c3ad893fa4..590791e7653f 100644 --- a/app-text/mupdf/mupdf-1.21.1-r1.ebuild +++ b/app-text/mupdf/mupdf-1.21.1-r1.ebuild @@ -157,7 +157,8 @@ src_install() { 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()" + 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
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 510b43e929167b9827e7f8910a509f44b2babc3e Author: Joonas Niilola gentoo org> AuthorDate: Fri Jan 20 07:27:23 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Jan 20 07:27:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510b43e9 app-text/mupdf: $P -> ${P} on 1.21.1 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.21.1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild index 5eb70637cf2a..0d782560357f 100644 --- a/app-text/mupdf/mupdf-1.21.1.ebuild +++ b/app-text/mupdf/mupdf-1.21.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -52,8 +52,8 @@ PATCHES=( "${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 + "${FILESDIR}"/${P}-no-drm.patch + "${FILESDIR}"/${P}-fix-aliasing-violation.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: ee611bbfc7743f0e819a37bef9588daa1c3d93a7 Author: Sam James gentoo org> AuthorDate: Fri Jan 20 01:37:11 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 20 01:37:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee611bbf app-text/mupdf: Stabilize 1.21.0 arm64, #891415 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.21.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild index 0f6c12e71d38..cbc4147b439e 100644 --- a/app-text/mupdf/mupdf-1.21.0.ebuild +++ b/app-text/mupdf/mupdf-1.21.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 9f12ac11dfafbf16f8bc85f5537e6927c2ea2839 Author: Sam James gentoo org> AuthorDate: Fri Jan 20 01:34:16 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 20 01:34:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f12ac11 app-text/mupdf: Stabilize 1.21.0 arm, #891415 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.21.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild index 6ed49b395d63..0f6c12e71d38 100644 --- a/app-text/mupdf/mupdf-1.21.0.ebuild +++ b/app-text/mupdf/mupdf-1.21.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 726242b2f9bc9bfd21b103b721570715fd9e38ab Author: Sam James gentoo org> AuthorDate: Fri Jan 20 01:16:45 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 20 01:16:45 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726242b2 app-text/mupdf: Stabilize 1.21.0 ppc, #891415 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.21.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild index dd9f20bd1744..6e14c81b9a6a 100644 --- a/app-text/mupdf/mupdf-1.21.0.ebuild +++ b/app-text/mupdf/mupdf-1.21.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 384bb0d9ec0b7f6d6b9dfa9a73bcd96713d71911 Author: Sam James gentoo org> AuthorDate: Fri Jan 20 01:16:46 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 20 01:16:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384bb0d9 app-text/mupdf: Stabilize 1.21.0 x86, #891415 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.21.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild index 6e14c81b9a6a..6ed49b395d63 100644 --- a/app-text/mupdf/mupdf-1.21.0.ebuild +++ b/app-text/mupdf/mupdf-1.21.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 6880b9abf1d3332f644206c0e8b74005ec28695e Author: Sam James gentoo org> AuthorDate: Fri Jan 20 01:16:43 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 20 01:16:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6880b9ab app-text/mupdf: Stabilize 1.21.0 ppc64, #891415 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.21.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild index f1b964d3e2cb..4e156bbb1161 100644 --- a/app-text/mupdf/mupdf-1.21.0.ebuild +++ b/app-text/mupdf/mupdf-1.21.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 13f7199485310742e3e35a38d33864c894b902bb Author: Sam James gentoo org> AuthorDate: Fri Jan 20 01:16:44 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 20 01:16:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f71994 app-text/mupdf: Stabilize 1.21.0 amd64, #891415 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.21.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild index 4e156bbb1161..dd9f20bd1744 100644 --- a/app-text/mupdf/mupdf-1.21.0.ebuild +++ b/app-text/mupdf/mupdf-1.21.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 7f7e9b0b38aaad6c79427600f6d9579056f46c0c Author: Mike Frysinger gentoo org> AuthorDate: Sat Jan 7 06:20:50 2023 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Jan 7 06:53:37 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f7e9b0b app-text/mupdf: require newer mujs version The code relies on defines that don't exist in mujs-1.1 (JS_VERSION defines), so require mujs-1.2 to fix. Signed-off-by: Mike Frysinger gentoo.org> app-text/mupdf/mupdf-1.20.0.ebuild | 2 +- app-text/mupdf/mupdf-1.20.3.ebuild | 2 +- app-text/mupdf/mupdf-1.21.0.ebuild | 2 +- app-text/mupdf/mupdf-1.21.1.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index c541f96f9cd6..a8b45265f9c4 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -30,7 +30,7 @@ RDEPEND=" media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0 - javascript? ( >=dev-lang/mujs-1.0.7:= ) + javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild index 578687ddd9de..bd19f33ee9aa 100644 --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ b/app-text/mupdf/mupdf-1.20.3.ebuild @@ -30,7 +30,7 @@ RDEPEND=" media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= - javascript? ( >=dev-lang/mujs-1.0.7:= ) + javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild index c2d55d2bd989..f1b964d3e2cb 100644 --- a/app-text/mupdf/mupdf-1.21.0.ebuild +++ b/app-text/mupdf/mupdf-1.21.0.ebuild @@ -30,7 +30,7 @@ RDEPEND=" media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= - javascript? ( >=dev-lang/mujs-1.0.7:= ) + javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild index 718ebd6ed15a..5eb70637cf2a 100644 --- a/app-text/mupdf/mupdf-1.21.1.ebuild +++ b/app-text/mupdf/mupdf-1.21.1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= - javascript? ( >=dev-lang/mujs-1.0.7:= ) + javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: 6208b6698adad4d24c7cad780efb95349fb5e2da Author: Philipp Rösner protonmail com> AuthorDate: Fri Dec 30 22:22:33 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jan 4 05:48:12 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6208b669 app-text/mupdf-1.21.1: patch aliasing violation Add patch fixing an aliasing violation build error in the thirdparty freeglut module. See: https://bugs.gentoo.org/859847 See: https://github.com/FreeGLUTProject/freeglut/pull/112/commits/8c6f6bf3ad2fd33d15de6ee96175cd29bf804d9f Closes: https://bugs.gentoo.org/888998 Suggested-by: Matt Turner gentoo.org> Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/28903 Signed-off-by: Sam James gentoo.org> .../mupdf-1.21.1-fix-aliasing-violation.patch | 63 ++ app-text/mupdf/mupdf-1.21.1.ebuild | 1 + 2 files changed, 64 insertions(+) diff --git a/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch b/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch new file mode 100644 index ..4f51f72deb1e --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch @@ -0,0 +1,63 @@ +https://bugs.gentoo.org/859847 + +From 8c6f6bf3ad2fd33d15de6ee96175cd29bf804d9f Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Tue, 26 Jul 2022 15:47:02 -0400 +Subject: [PATCH] Fix aliasing violation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Noticed when compiling with link-time optimizations. + +include/GL/freeglut_std.h:240:18: error: type of `glutBitmapHelvetica18` does not match original declaration [-Werror=lto-type-mismatch] + 240 | extern void* glutBitmapHelvetica18; + | ^ +src/x11/fg_glutfont_definitions_x11.c:103:27: note: `glutBitmapHelvetica18` was previously declared here + 103 | struct freeglutBitmapFont glutBitmapHelvetica18 ; + | ^ +src/x11/fg_glutfont_definitions_x11.c:103:27: note: code may be misoptimized unless `-fno-strict-aliasing` is used +--- + src/x11/fg_glutfont_definitions_x11.c | 29 ++- + 1 file changed, 20 insertions(+), 9 deletions(-) + +--- a/thirdparty/freeglut/src/x11/fg_glutfont_definitions_x11.c b/thirdparty/freeglut/src/x11/fg_glutfont_definitions_x11.c +@@ -91,14 +91,25 @@ struct freeglutBitmapFont + }; + + +-struct freeglutStrokeFont glutStrokeRoman ; +-struct freeglutStrokeFont glutStrokeMonoRoman ; ++static struct freeglutStrokeFont glutStrokeRoman_ ; ++static struct freeglutStrokeFont glutStrokeMonoRoman_ ; + +-struct freeglutBitmapFont glutBitmap9By15 ; +-struct freeglutBitmapFont glutBitmap8By13 ; +-struct freeglutBitmapFont glutBitmapTimesRoman10 ; +-struct freeglutBitmapFont glutBitmapTimesRoman24 ; +-struct freeglutBitmapFont glutBitmapHelvetica10 ; +-struct freeglutBitmapFont glutBitmapHelvetica12 ; +-struct freeglutBitmapFont glutBitmapHelvetica18 ; ++static struct freeglutBitmapFont glutBitmap9By15_ ; ++static struct freeglutBitmapFont glutBitmap8By13_ ; ++static struct freeglutBitmapFont glutBitmapTimesRoman10_ ; ++static struct freeglutBitmapFont glutBitmapTimesRoman24_ ; ++static struct freeglutBitmapFont glutBitmapHelvetica10_ ; ++static struct freeglutBitmapFont glutBitmapHelvetica12_ ; ++static struct freeglutBitmapFont glutBitmapHelvetica18_ ; + ++ ++void *glutStrokeRoman = &glutStrokeRoman_ ; ++void *glutStrokeMonoRoman = &glutStrokeMonoRoman_ ; ++ ++void *glutBitmap9By15 = &glutBitmap9By15_ ; ++void *glutBitmap8By13 = &glutBitmap8By13_ ; ++void *glutBitmapTimesRoman10 = &glutBitmapTimesRoman10_ ; ++void *glutBitmapTimesRoman24 = &glutBitmapTimesRoman24_ ; ++void *glutBitmapHelvetica10 = &glutBitmapHelvetica10_ ; ++void *glutBitmapHelvetica12 = &glutBitmapHelvetica12_ ; ++void *glutBitmapHelvetica18 = &glutBitmapHelvetica18_ ; +-- +2.35.1 + diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild index ac2702bc5da4..718ebd6ed15a 100644 --- a/app-text/mupdf/mupdf-1.21.1.ebuild +++ b/app-text/mupdf/mupdf-1.21.1.ebuild @@ -53,6 +53,7 @@ PATCHES=( # 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 ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: 9581bec40fed2aaf7cce58fa0f4d64ce9db887aa Author: Philipp Rösner protonmail com> AuthorDate: Fri Dec 23 15:51:49 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Dec 29 20:48:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9581bec4 app-text/mupdf-1.21.1: allow disabling DRM checking MuPDF by default blocks DRM content, see: https://github.com/ArtifexSoftware/mupdf/commit/2b3bd1b7dbbf13f82b70587676809f189354c77a Add patch and local use flag `drm` for allowing/disallowing DRM content in PDF files. Suggested-by: William Rabbermann gmail.com> Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/28772 Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/files/mupdf-1.21.1-no-drm.patch | 18 ++ app-text/mupdf/metadata.xml| 3 +++ app-text/mupdf/mupdf-1.21.1.ebuild | 5 - 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch new file mode 100644 index ..356ee4b852dd --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch @@ -0,0 +1,18 @@ +diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c +index f764242..83888dc 100644 +--- a/source/html/epub-doc.c b/source/html/epub-doc.c +@@ -692,10 +692,12 @@ epub_parse_header(fz_context *ctx, epub_document *doc) + epub_chapter **tailp; + int i; + ++ #ifdef drm + if (fz_has_archive_entry(ctx, zip, "META-INF/rights.xml")) + fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM"); + if (fz_has_archive_entry(ctx, zip, "META-INF/encryption.xml")) + fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM"); ++ #endif + + fz_var(buf); + fz_var(container_xml); + diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml index 5d2f87cc3174..c0d61774dbcf 100644 --- a/app-text/mupdf/metadata.xml +++ b/app-text/mupdf/metadata.xml @@ -9,4 +9,7 @@ proxy-ma...@gentoo.org Proxy Maintainers + + Enable support for Digital rights management (DRM) + diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild index 87efa898ece6..5b4674fadf25 100644 --- a/app-text/mupdf/mupdf-1.21.1.ebuild +++ b/app-text/mupdf/mupdf-1.21.1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" -IUSE="+javascript opengl ssl X" +IUSE="+drm +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )" # Although we use the bundled, patched version of freeglut in mupdf (because of @@ -52,6 +52,7 @@ PATCHES=( "${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 ) src_prepare() { @@ -59,6 +60,8 @@ src_prepare() { use hppa && append-cflags -ffunction-sections + use drm && append-cflags -Ddrm + append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)" sed -e "1iOS = Linux" \
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: 4a46119e0149990be553c6ee7723cdeb16410c7f Author: Florian Schmaus gentoo org> AuthorDate: Thu Dec 29 20:48:22 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Dec 29 20:48:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a46119e app-text/mupdf: rename drm macro to GENTOO_MUPDF_DRM Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/files/mupdf-1.21.1-no-drm.patch | 2 +- app-text/mupdf/mupdf-1.21.1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch index 356ee4b852dd..9f2b9d692f4e 100644 --- a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch +++ b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch @@ -6,7 +6,7 @@ index f764242..83888dc 100644 epub_chapter **tailp; int i; -+ #ifdef drm ++ #ifdef GENTOO_MUPDF_DRM if (fz_has_archive_entry(ctx, zip, "META-INF/rights.xml")) fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM"); if (fz_has_archive_entry(ctx, zip, "META-INF/encryption.xml")) diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild index 5b4674fadf25..ac2702bc5da4 100644 --- a/app-text/mupdf/mupdf-1.21.1.ebuild +++ b/app-text/mupdf/mupdf-1.21.1.ebuild @@ -60,7 +60,7 @@ src_prepare() { use hppa && append-cflags -ffunction-sections - use drm && append-cflags -Ddrm + use drm && append-cflags -DGENTOO_MUPDF_DRM append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 3029d9864c39200a34e945b0b7b3b5b09bf5b990 Author: Philipp Rösner protonmail com> AuthorDate: Thu Dec 15 22:37:26 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Dec 19 11:04:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3029d986 app-text/mupdf: add 1.21.1 Add patch release mupdf-1.21.1 which includes several bug fixes: - Garbage collection problem causing file bloat on clean. - Don't assume sorted objects in pdf_objcmp. - Don't layout empty documents. - Type 3 font char bboxes. Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/28678 Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/Manifest| 1 + app-text/mupdf/mupdf-1.21.1.ebuild | 159 + 2 files changed, 160 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index d8c5009e58bd..1c6a62b465b4 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -2,3 +2,4 @@ DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb481 DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4 DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee 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 diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild new file mode 100644 index ..87efa898ece6 --- /dev/null +++ b/app-text/mupdf/mupdf-1.21.1.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2022 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="+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.0.7:= ) + 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 +) + +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
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: ad7ab6b8307c3616775f9747ef4e2113f09ee9b7 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 4 18:07:22 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 4 18:07:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7ab6b8 app-text/mupdf: Stabilize 1.20.3 arm64, #884215 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.20.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild index a033e83668a1..741185a4d0cb 100644 --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ b/app-text/mupdf/mupdf-1.20.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 30b49537ab7aafe5e04f62ba223f8ba71d2a7ea8 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 4 18:07:22 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 4 18:07:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30b49537 app-text/mupdf: Stabilize 1.20.3 ppc, #884215 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.20.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild index 741185a4d0cb..fc1d61dcca80 100644 --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ b/app-text/mupdf/mupdf-1.20.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: a00bf6901ce525d4df1f14581b4c5a8995714033 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 4 18:07:23 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 4 18:07:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a00bf690 app-text/mupdf: Stabilize 1.20.3 arm, #884215 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.20.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild index fc1d61dcca80..578687ddd9de 100644 --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ b/app-text/mupdf/mupdf-1.20.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 4d1a9098fc8e0c3d3cf4627e0d729b866c5f9992 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 4 17:56:06 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 4 17:56:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d1a9098 app-text/mupdf: Stabilize 1.20.3 ppc64, #884215 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.20.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild index 4ae490af4eb7..a033e83668a1 100644 --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ b/app-text/mupdf/mupdf-1.20.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
commit: 68a51347c5983bdddb0f1c8a5f748528e8e9996b Author: Philipp Rösner protonmail com> AuthorDate: Mon Nov 28 20:18:46 2022 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Dec 4 14:49:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a51347 app-text/mupdf: add high resolution icon As pointed out by gentoo.org> a high resolution icon for MuPDF is available at docs/logo. Closes: https://bugs.gentoo.org/882701 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/28467 Signed-off-by: Pacho Ramos gentoo.org> .../files/mupdf-1.21.0-add-desktop-pc-files.patch | 33 ++ app-text/mupdf/mupdf-1.21.0.ebuild | 4 +-- 2 files changed, 35 insertions(+), 2 deletions(-) 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 new file mode 100644 index ..4d449a2fec15 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch @@ -0,0 +1,33 @@ +--- /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.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild index 0eaa99a07eba..c2d55d2bd989 100644 --- a/app-text/mupdf/mupdf-1.21.0.ebuild +++ b/app-text/mupdf/mupdf-1.21.0.ebuild @@ -46,7 +46,7 @@ BDEPEND="X? ( x11-base/xorg-proto ) 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}"/${P}-add-desktop-pc-files.patch "${FILESDIR}"/${PN}-1.19.0-darwin.patch # See bugs #662352 "${FILESDIR}"/${PN}-1.15-openssl-x11.patch @@ -126,7 +126,7 @@ src_compile() { src_install() { if use opengl || use X ; then domenu platform/debian/${PN}.desktop - doicon platform/debian/${PN}.xpm + 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
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 03a550734ecebf86bf48dc6c2066840aa60b92c0 Author: Joonas Niilola gentoo org> AuthorDate: Sun Dec 4 06:50:25 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Dec 4 06:52:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03a55073 app-text/mupdf: Stabilize 1.20.3 amd64, #884215 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.20.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild index 3658be0e67b6..5c950a053992 100644 --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ b/app-text/mupdf/mupdf-1.20.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: a2c804074f1d34ce87644e781fb4539b9001add6 Author: Joonas Niilola gentoo org> AuthorDate: Sun Dec 4 06:51:40 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Dec 4 06:52:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c80407 app-text/mupdf: Stabilize 1.20.3 x86, #884215 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.20.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild index 5c950a053992..4ae490af4eb7 100644 --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ b/app-text/mupdf/mupdf-1.20.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: c5a15e29a1999c15771b9b01ccaee49051c9fffd Author: Philipp Rösner protonmail com> AuthorDate: Wed Nov 16 21:55:00 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Nov 21 07:10:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a15e29 app-text/mupdf: add 1.21.0 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/28303 Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/Manifest| 1 + app-text/mupdf/mupdf-1.21.0.ebuild | 159 + 2 files changed, 160 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index f87bb21f3f63..d8c5009e58bd 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.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4 DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee +DIST mupdf-1.21.0-source.tar.gz 54753613 BLAKE2B bb531f165a9dd8af22aa6e1d65b57d7900bb5128d0c8ad235518ed0b1e446234b147fdd3937f3dd49f627ed2cfb49c4e325baf320f698adbbde68de466f61660 SHA512 a711489e236437e4e7c21373d8624118a5308941148be31cd57a0bbed708b44b1d4030aed71ccb82143159fc3a23e5524738e7fc6177058e6bdaf94a36beaf64 diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild new file mode 100644 index ..0eaa99a07eba --- /dev/null +++ b/app-text/mupdf/mupdf-1.21.0.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2022 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="+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.0.7:= ) + 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.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() { + 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.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" +} + +_em
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: c0fb619641b53954cf21710599aa839940c3ae2f Author: WANG Xuerui gentoo org> AuthorDate: Wed Nov 2 10:18:28 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Thu Nov 3 02:04:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fb6196 app-text/mupdf: keyword 1.20.3 for ~loong Signed-off-by: WANG Xuerui gentoo.org> app-text/mupdf/mupdf-1.20.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild index 44f07ffa3073..3658be0e67b6 100644 --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ b/app-text/mupdf/mupdf-1.20.3.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/
commit: 0baadd00adc34d9744d9e25ecb5b9be05254cb9c Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Oct 7 20:19:22 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Fri Oct 7 21:02:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0baadd00 app-text/mupdf: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/27687 Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/files/mupdf-1.18-Makefile.patch | 42 --- .../mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch | 51 .../mupdf/files/mupdf-1.18.0-cross-fixes.patch | 128 - app-text/mupdf/files/mupdf-1.18.0-darwin.patch | 41 --- .../files/mupdf-1.18.0-fix-oob-in-pdf-layer.c | 102 .../mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c | 41 --- 6 files changed, 405 deletions(-) diff --git a/app-text/mupdf/files/mupdf-1.18-Makefile.patch b/app-text/mupdf/files/mupdf-1.18-Makefile.patch deleted file mode 100644 index 32ee7e57c493.. --- a/app-text/mupdf/files/mupdf-1.18-Makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/Makefile b/Makefile -index b0fb617..528e117 100644 a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ - -include user.make - - ifndef build -- build := release -+ build := debug - endif - - ifndef OUT -@@ -214,13 +214,15 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO) - - $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ) - else --MUPDF_LIB = $(OUT)/libmupdf.a --THIRD_LIB = $(OUT)/libmupdf-third.a -+MUPDF_LIB = libmupdf.so.$(GENTOO_PV) -+MUPDF_STATIC = $(OUT)/libmupdf.a -+THIRD_LIB = - 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) - $(THREAD_LIB) : $(THREAD_OBJ) - $(PKCS7_LIB) : $(PKCS7_OBJ) - endif -@@ -374,7 +376,7 @@ install: libs apps - - install -d $(DESTDIR)$(docdir) - install -d $(DESTDIR)$(docdir)/examples -- install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir) -+ install -m 644 README CHANGES $(DESTDIR)$(docdir) - install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) - install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples - diff --git a/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch b/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch deleted file mode 100644 index 566ee562389c.. --- a/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://bugs.gentoo.org/772311 - -From cee7cefc610d42fd383b3c80c12cbc675443176a Mon Sep 17 00:00:00 2001 -From: Robin Watts -Date: Fri, 22 Jan 2021 17:05:15 + -Subject: [PATCH 1/1] Bug 703366: Fix double free of object during - linearization. - -This appears to happen because we parse an illegal object from -a broken file and assign it to object 0, which is defined to -be free. - -Here, we fix the parsing code so this can't happen. - source/pdf/pdf-parse.c | 6 ++ - source/pdf/pdf-xref.c | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c -index 7abc8c3d4..5761c3351 100644 a/source/pdf/pdf-parse.c -+++ b/source/pdf/pdf-parse.c -@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc, - fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d ? obj)", num); - } - gen = buf->i; -+ if (gen < 0 || gen >= 65536) -+ { -+ if (try_repair) -+ *try_repair = 1; -+ fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number (%d)", gen); -+ } - - tok = pdf_lex(ctx, file, buf); - if (tok != PDF_TOK_OBJ) -diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c -index 1b2bdcd59..30197b4b8 100644 a/source/pdf/pdf-xref.c -+++ b/source/pdf/pdf-xref.c -@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf) - { - ofs = fz_tell(ctx, doc->file); - trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, &num, &gen, &stm_ofs, NULL); -+ if (num == 0) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number cannot be 0\n"); - } - fz_catch(ctx) - { --- -2.17.1 - diff --git a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch deleted file mode 100644 index 0576033a03a2.. --- a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch +++ /dev/null @@ -1,128 +0,0 @@ -Refreshed patches based on: -https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 570e04393e44924ef2f915295f169c7fd19ad8b8 Author: Florian Schmaus gentoo org> AuthorDate: Wed Oct 5 07:46:03 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Oct 5 07:46:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570e0439 app-text/mupdf: drop 1.18.0-r4, 1.19.0 Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/Manifest | 2 - app-text/mupdf/mupdf-1.18.0-r4.ebuild | 156 -- app-text/mupdf/mupdf-1.19.0.ebuild| 153 - 3 files changed, 311 deletions(-) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 3ac67461ea5f..f87bb21f3f63 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,5 +1,3 @@ -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 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7 DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4 DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee diff --git a/app-text/mupdf/mupdf-1.18.0-r4.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild deleted file mode 100644 index 85aad834e2c2.. --- a/app-text/mupdf/mupdf-1.18.0-r4.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# 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.18-Makefile.patch - "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch - "${FILESDIR}"/${PN}-1.18.0-darwin.patch - # See bugs #662352 - "${FILESDIR}"/${PN}-1.15-openssl-x11.patch - # General cross fixes from Debian (refreshed) - "${FILESDIR}"/${PN}-1.18.0-cross-fixes.patch - # Additional security patches post-1.18.0 - "${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c - "${FILESDIR}"/${P}-fix-oob-in-pixmap.c - "${FILESDIR}"/${P}-CVE-2021-3407.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 "1iver
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 8a7c56c094c55ac91c7b455f5c7f8b812cc919b2 Author: Philipp Rösner protonmail com> AuthorDate: Tue Oct 4 21:56:28 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Oct 5 07:46:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a7c56c0 app-text/mupdf: add 1.20.3 Furthermore, adjust slots of media-libs/freetype and media-libs/libpjeg-turbo and add sys-libs/zlib runtime dependency. Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/27628 Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/Manifest| 1 + app-text/mupdf/mupdf-1.20.3.ebuild | 160 + 2 files changed, 161 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 71a4a94d3840..3ac67461ea5f 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -2,3 +2,4 @@ DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c387 DIST mupdf-1.19.0-source.tar.xz 64077324 BLAKE2B 4c30cfc004b4f354ae349e5460327775a4dbdd689e561888c156e9e69e22b45ea1f260dfed8d2d8c017fe65a1e83cabc8ff29dad8de47a2c541f9e335bf11285 SHA512 421e8e49f83cf00bfb2c86b5425939056fe866a048cf18e4c8f5764cdee9829974eea655c944d0f3f5a9407347cceaef34030f4079aa399e798da3ff849230e7 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7 DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4 +DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild new file mode 100644 index ..44f07ffa3073 --- /dev/null +++ b/app-text/mupdf/mupdf-1.20.3.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2022 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 ~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= + >=media-libs/libjpeg-turbo-1.5.3-r2:0= + javascript? ( >=dev-lang/mujs-1.0.7:= ) + 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.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 + "${FILESDIR}"/${PN}-1.20.0-lcms2.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
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 7920aae0505e0b1c3c47ab5e6e61a111065c6c0e Author: Arthur Zamarin gentoo org> AuthorDate: Wed Aug 10 10:56:13 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Aug 10 10:56:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7920aae0 app-text/mupdf: Stabilize 1.20.0 arm, #864507 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.20.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index 075d11b2f385..c541f96f9cd6 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: d00067ddbaf55454d7662ffceffd3b8acceefa88 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Aug 10 10:56:13 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Aug 10 10:56:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d00067dd app-text/mupdf: Stabilize 1.20.0 arm64, #864507 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.20.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index 83cb7e685586..075d11b2f385 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 03fb05b56f1b92cc7d04012c7f5b0aca737f8e3f Author: Arthur Zamarin gentoo org> AuthorDate: Wed Aug 10 07:52:54 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Aug 10 08:04:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fb05b5 app-text/mupdf: Stabilize 1.20.0 ppc64, #864507 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.20.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index 6347f263402a..3908e9322304 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 6a9a4bcf62e48bf7caa408d0f19144591be6f594 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Aug 10 07:52:54 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Aug 10 08:04:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9a4bcf app-text/mupdf: Stabilize 1.20.0 ppc, #864507 Signed-off-by: Arthur Zamarin gentoo.org> app-text/mupdf/mupdf-1.20.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index 3908e9322304..83cb7e685586 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: f380517bbdc7159ecf7027f831b9b4d4fda7cde9 Author: Joonas Niilola gentoo org> AuthorDate: Wed Aug 10 07:32:41 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Aug 10 07:35:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f380517b app-text/mupdf: Stabilize 1.20.0 amd64, #864507 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.20.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index 447778adb9d5..3285979ba866 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 87313dfc5301080b0c692528027c944a343abba6 Author: Joonas Niilola gentoo org> AuthorDate: Wed Aug 10 07:35:43 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Aug 10 07:35:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87313dfc app-text/mupdf: Stabilize 1.20.0 x86, #864507 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.20.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index 3285979ba866..6347f263402a 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 293635e0ea12a4002027c0f9834f4bd3ab9cce04 Author: Philipp Rösner protonmail com> AuthorDate: Tue Jul 19 20:38:22 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Sun Jul 24 06:51:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=293635e0 app-text/mupdf-1.20.0: fix version in .pc file A wrong MuPDF version (0.5.0) was specified in the pkgconfig file mupdf.pc, which is now fixed via a sed substitution. Closes: https://bugs.gentoo.org/859262 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/26490 Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/mupdf-1.20.0.ebuild | 5 + 1 file changed, 5 insertions(+) diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index 216bbfaa79e7..447778adb9d5 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -69,6 +69,11 @@ src_prepare() { -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() {
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: a8ca257f22f4ca2eddaec6b04906d2a805c86134 Author: Philipp Rösner protonmail com> AuthorDate: Wed Jun 29 19:36:48 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Tue Jul 19 07:35:54 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ca257f app-text/mupdf: fix strict-aliasing violations Fix two issues in thirdparty/lcms2/src/cmsplugin.c regarding strinct-aliasing rule violations. Issue: https://github.com/mm2/Little-CMS/issues/303 PR: https://github.com/mm2/Little-CMS/pull/323 Closes: https://bugs.gentoo.org/855020 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/26152 Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/files/mupdf-1.20.0-lcms2.patch | 69 +++ app-text/mupdf/mupdf-1.20.0.ebuild| 1 + 2 files changed, 70 insertions(+) diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch new file mode 100644 index ..a5cb30e3b74c --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch @@ -0,0 +1,69 @@ +From d98de0bb0b627772625c1acf050ba0dd4b5ac9df Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Tue, 5 Jul 2022 11:35:28 +0200 +Subject: [PATCH] Perform type punning via union without undefined behavior + +* The previous code from c3d7f491e2daebda2413fb3d2935c51df1c50ac7 + still contains undefined behavior, since it just creates + temporary pointer variables. +--- + src/cmsplugin.c | 31 +++ + 1 file changed, 15 insertions(+), 16 deletions(-) + +This patch slightly differs from the upstream commit, because +the lcms2 version used in mupdf is slightly behind the upstream +version. + +See: https://github.com/mm2/Little-CMS/commit/d98de0bb0b627772625c1acf050ba0dd4b5ac9df.patch + +diff --git a/src/cmsplugin.c b/src/cmsplugin.c +index 556fbc28..b34e3aab 100644 +--- a/thirdparty/lcms2/src/cmsplugin.c b/thirdparty/lcms2/src/cmsplugin.c +@@ -167,17 +167,20 @@ cmsBool CMSEXPORT _cmsReadUInt32Number(cmsContext ContextID, cmsIOHANDLER* io, + + cmsBool CMSEXPORT _cmsReadFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, cmsFloat32Number* n) + { +-cmsUInt32Number tmp; ++union typeConverter { ++cmsUInt32Number integer; ++cmsFloat32Number floating_point; ++} tmp; + + _cmsAssert(io != NULL); + +-if (io->Read(ContextID, io, &tmp, sizeof(cmsUInt32Number), 1) != 1) ++if (io->Read(ContextID, io, &tmp.integer, sizeof(cmsUInt32Number), 1) != 1) + return FALSE; + + if (n != NULL) { + +-tmp = _cmsAdjustEndianess32(tmp); +-*n = *(cmsFloat32Number*)(void*)&tmp; ++tmp.integer = _cmsAdjustEndianess32(tmp.integer); ++*n = tmp.floating_point; + + // Safeguard which covers against absurd values + if (*n > 1E+20 || *n < -1E+20) return FALSE; +@@ -304,13 +307,14 @@ cmsBool CMSEXPORT _cmsWriteUInt32Number(cmsContext ContextID, cmsIOHANDLER* io, + + cmsBool CMSEXPORT _cmsWriteFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, cmsFloat32Number n) + { +-cmsUInt32Number tmp; +- +-_cmsAssert(io != NULL); +- +-tmp = *(cmsUInt32Number*) (void*) &n; +-tmp = _cmsAdjustEndianess32(tmp); +-if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp) != 1) ++union typeConverter { ++cmsUInt32Number integer; ++cmsFloat32Number floating_point; ++} tmp; ++ ++tmp.floating_point = n; ++tmp.integer = _cmsAdjustEndianess32(tmp.integer); ++if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp.integer) != 1) + return FALSE; + + return TRUE; diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index 3d7f8f3e2946..216bbfaa79e7 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -51,6 +51,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.15-openssl-x11.patch # General cross fixes from Debian (refreshed) "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch + "${FILESDIR}"/${P}-lcms2.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: 3b49a6d09605a565ec329c53ee4e5adcc8c9c2b0 Author: Florian Schmaus gentoo org> AuthorDate: Thu Jun 30 13:30:19 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Jun 30 13:33:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b49a6d0 app-text/mupdf: Revert "fix strict-aliasing violations" Sam pointed out that the patch my be wrong (although correct from a strict aliasing view). This reverts commit e69ffe486e072430217eb921a1886f93d8d74534. Signed-off-by: Florian Schmaus gentoo.org> Suggested-by: Sam James gentoo.org> app-text/mupdf/files/mupdf-1.20.0-lcms2.patch | 20 app-text/mupdf/mupdf-1.20.0.ebuild| 1 - 2 files changed, 21 deletions(-) diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch deleted file mode 100644 index a975d42d15e9.. --- a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch +++ /dev/null @@ -1,20 +0,0 @@ a/thirdparty/lcms2/src/cmsplugin.c -+++ b/thirdparty/lcms2/src/cmsplugin.c -@@ -177,7 +177,7 @@ cmsBool CMSEXPORT _cmsReadFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, - if (n != NULL) { - - tmp = _cmsAdjustEndianess32(tmp); --*n = *(cmsFloat32Number*)(void*)&tmp; -+*n = (cmsFloat32Number)tmp; - - // Safeguard which covers against absurd values - if (*n > 1E+20 || *n < -1E+20) return FALSE; -@@ -308,7 +308,7 @@ cmsBool CMSEXPORT _cmsWriteFloat32Number(cmsContext ContextID, cmsIOHANDLER* io - - _cmsAssert(io != NULL); - --tmp = *(cmsUInt32Number*) (void*) &n; -+tmp = (cmsUInt32Number)n; - tmp = _cmsAdjustEndianess32(tmp); - if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp) != 1) - return FALSE; diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index 216bbfaa79e7..3d7f8f3e2946 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -51,7 +51,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.15-openssl-x11.patch # General cross fixes from Debian (refreshed) "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch - "${FILESDIR}"/${P}-lcms2.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
commit: e69ffe486e072430217eb921a1886f93d8d74534 Author: Philipp Rösner protonmail com> AuthorDate: Wed Jun 29 19:36:48 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Jun 30 12:43:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69ffe48 app-text/mupdf: fix strict-aliasing violations Fix two issues in thirdparty/lcms2/src/cmsplugin.c regarding strinct-aliasing rule violations. Closes: https://bugs.gentoo.org/855020 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/26152 Signed-off-by: Florian Schmaus gentoo.org> app-text/mupdf/files/mupdf-1.20.0-lcms2.patch | 20 app-text/mupdf/mupdf-1.20.0.ebuild| 1 + 2 files changed, 21 insertions(+) diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch new file mode 100644 index ..a975d42d15e9 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch @@ -0,0 +1,20 @@ +--- a/thirdparty/lcms2/src/cmsplugin.c b/thirdparty/lcms2/src/cmsplugin.c +@@ -177,7 +177,7 @@ cmsBool CMSEXPORT _cmsReadFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, + if (n != NULL) { + + tmp = _cmsAdjustEndianess32(tmp); +-*n = *(cmsFloat32Number*)(void*)&tmp; ++*n = (cmsFloat32Number)tmp; + + // Safeguard which covers against absurd values + if (*n > 1E+20 || *n < -1E+20) return FALSE; +@@ -308,7 +308,7 @@ cmsBool CMSEXPORT _cmsWriteFloat32Number(cmsContext ContextID, cmsIOHANDLER* io + + _cmsAssert(io != NULL); + +-tmp = *(cmsUInt32Number*) (void*) &n; ++tmp = (cmsUInt32Number)n; + tmp = _cmsAdjustEndianess32(tmp); + if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp) != 1) + return FALSE; diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index 3d7f8f3e2946..216bbfaa79e7 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -51,6 +51,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.15-openssl-x11.patch # General cross fixes from Debian (refreshed) "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch + "${FILESDIR}"/${P}-lcms2.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 9d68dc60d93eee90a3dd03d4b1ca902f2d0993d7 Author: Philipp Rösner protonmail com> AuthorDate: Fri Jun 17 21:47:36 2022 + Commit: Sam James gentoo org> CommitDate: Mon Jun 20 02:58:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d68dc60 app-text/mupdf: add 1.20.0 Bug: https://bugs.gentoo.org/792528 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/25945 Signed-off-by: Sam James gentoo.org> app-text/mupdf/Manifest| 1 + app-text/mupdf/mupdf-1.20.0.ebuild | 153 + 2 files changed, 154 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 5c05a175105b..71a4a94d3840 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,3 +1,4 @@ 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 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7 +DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4 diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild new file mode 100644 index ..3d7f8f3e2946 --- /dev/null +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2022 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 ~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= + >=media-libs/libjpeg-turbo-1.5.3-r2:0 + 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="X? ( x11-base/xorg-proto ) + 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() { + 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()" +} + +_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
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 9ae7aaf2b004d75396a1f8bcbe3bc3f14fb3517d Author: Jakov Smolić gentoo org> AuthorDate: Wed Jun 1 11:07:03 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Jun 1 11:07:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae7aaf2 app-text/mupdf: Stabilize 1.19.1 ppc64, #848846 Signed-off-by: Jakov Smolić gentoo.org> app-text/mupdf/mupdf-1.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild index 0c4759724fbe..f2daed4e1287 100644 --- a/app-text/mupdf/mupdf-1.19.1.ebuild +++ b/app-text/mupdf/mupdf-1.19.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: fe9403a144f24e9edf91ee92bb7809c5b1a020a6 Author: Jakov Smolić gentoo org> AuthorDate: Wed Jun 1 08:32:30 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Jun 1 08:32:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9403a1 app-text/mupdf: Stabilize 1.19.1 ppc, #848846 Signed-off-by: Jakov Smolić gentoo.org> app-text/mupdf/mupdf-1.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild index 112291922c4a..0c4759724fbe 100644 --- a/app-text/mupdf/mupdf-1.19.1.ebuild +++ b/app-text/mupdf/mupdf-1.19.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 5b0d1a6756b96354eda3df9846ef493d4f2294d5 Author: Joonas Niilola gentoo org> AuthorDate: Wed Jun 1 07:04:43 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Jun 1 07:05:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0d1a67 app-text/mupdf: Stabilize 1.19.1 x86, #848846 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild index 2681973610e0..112291922c4a 100644 --- a/app-text/mupdf/mupdf-1.19.1.ebuild +++ b/app-text/mupdf/mupdf-1.19.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: e93c612137ccc70e6b51ca254dd158e01b8f8e0c Author: Joonas Niilola gentoo org> AuthorDate: Wed Jun 1 06:00:16 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Jun 1 06:00:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93c6121 app-text/mupdf: Stabilize 1.19.1 amd64, #848846 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild index 7d1e4e761769..2681973610e0 100644 --- a/app-text/mupdf/mupdf-1.19.1.ebuild +++ b/app-text/mupdf/mupdf-1.19.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 275ff991c3bdf5e2e738d533e7f2196871d5caf7 Author: Sam James gentoo org> AuthorDate: Wed Jun 1 05:24:44 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 1 05:24:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275ff991 app-text/mupdf: Stabilize 1.19.1 arm, #848846 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild index 6c5aca039bea..7d1e4e761769 100644 --- a/app-text/mupdf/mupdf-1.19.1.ebuild +++ b/app-text/mupdf/mupdf-1.19.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 1cc72499921388fb0c5d503c123655f58ba9986e Author: Sam James gentoo org> AuthorDate: Wed Jun 1 05:24:42 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 1 05:24:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc72499 app-text/mupdf: Stabilize 1.19.1 arm64, #848846 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild index 6fb208168306..6c5aca039bea 100644 --- a/app-text/mupdf/mupdf-1.19.1.ebuild +++ b/app-text/mupdf/mupdf-1.19.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: eefad90cc1eea905f4700a25c5a62b9caa18e80f Author: Philipp Rösner protonmail com> AuthorDate: Mon Apr 25 21:05:13 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Apr 29 07:03:16 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eefad90c app-text/mupdf: Bump to 1.19.1 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/25202 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/Manifest| 1 + app-text/mupdf/mupdf-1.19.1.ebuild | 153 + 2 files changed, 154 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index c901a64470da..5c05a175105b 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,2 +1,3 @@ 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 +DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7 diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild new file mode 100644 index ..6fb208168306 --- /dev/null +++ b/app-text/mupdf/mupdf-1.19.1.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2022 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.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= + >=media-libs/libjpeg-turbo-1.5.3-r2:0 + 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="X? ( x11-base/xorg-proto ) + 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() { + 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()" +} + +_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 + # + # *
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: cc6a62cb2986ce596ab175392d1b73ba1894b3ef Author: Philipp Rösner protonmail com> AuthorDate: Fri Feb 4 21:58:53 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Feb 5 06:52:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc6a62cb app-text/mupdf: fixed unconditional BDEPEND The x11-base/xorg-proto is only needed if the X use flag is enabled. Closes: https://bugs.gentoo.org/832628 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Philipp Rösner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/24082 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.19.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild index f88096d3c7b6..6dfeb8c2ecc4 100644 --- a/app-text/mupdf/mupdf-1.19.0.ebuild +++ b/app-text/mupdf/mupdf-1.19.0.ebuild @@ -39,7 +39,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND}" -BDEPEND="x11-base/xorg-proto +BDEPEND="X? ( x11-base/xorg-proto ) virtual/pkgconfig" PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 17e56e92b2ebef5415f4ee7dd55acef1500df8bf Author: Sam James gentoo org> AuthorDate: Tue Jan 25 21:25:11 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jan 25 21:25:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e56e92 app-text/mupdf: Stabilize 1.19.0 arm64, #831850 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.19.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild index 0fbdb269b9cb..f88096d3c7b6 100644 --- a/app-text/mupdf/mupdf-1.19.0.ebuild +++ b/app-text/mupdf/mupdf-1.19.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 0a96224b840d3b30a77b595809060578c901590c Author: Sam James gentoo org> AuthorDate: Mon Jan 24 14:41:46 2022 + Commit: Sam James gentoo org> CommitDate: Mon Jan 24 14:41:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a96224b app-text/mupdf: Stabilize 1.19.0 arm, #831850 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.19.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild index 414447da0f34..0fbdb269b9cb 100644 --- a/app-text/mupdf/mupdf-1.19.0.ebuild +++ b/app-text/mupdf/mupdf-1.19.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: d77c1172abe403650e4ff05b92d0b87bf7f791ef Author: Sam James gentoo org> AuthorDate: Mon Jan 24 03:42:23 2022 + Commit: Sam James gentoo org> CommitDate: Mon Jan 24 03:42:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d77c1172 app-text/mupdf: Stabilize 1.19.0 ppc64, #831850 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.19.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild index 57172574b8d2..414447da0f34 100644 --- a/app-text/mupdf/mupdf-1.19.0.ebuild +++ b/app-text/mupdf/mupdf-1.19.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: fabd38d299f8a93f6c46a71ce5c4078fb86774bc Author: Sam James gentoo org> AuthorDate: Mon Jan 24 03:41:55 2022 + Commit: Sam James gentoo org> CommitDate: Mon Jan 24 03:41:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fabd38d2 app-text/mupdf: Stabilize 1.19.0 ppc, #831850 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.19.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild index 7f58eb0d0b5e..57172574b8d2 100644 --- a/app-text/mupdf/mupdf-1.19.0.ebuild +++ b/app-text/mupdf/mupdf-1.19.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 060ab7a5340b2924bbecc33027beff0a6b1a9a96 Author: Sam James gentoo org> AuthorDate: Sun Jan 23 15:21:55 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jan 23 15:21:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060ab7a5 app-text/mupdf: Stabilize 1.19.0 amd64, #831850 Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.19.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild index fe24b78f70e7..7f58eb0d0b5e 100644 --- a/app-text/mupdf/mupdf-1.19.0.ebuild +++ b/app-text/mupdf/mupdf-1.19.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 96d0836307998163d2f4e6b2e18e90b4c2db7de0 Author: Jakov Smolić gentoo org> AuthorDate: Sun Jan 23 13:08:46 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Sun Jan 23 13:08:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96d08363 app-text/mupdf: Stabilize 1.19.0 x86, #831850 Signed-off-by: Jakov Smolić gentoo.org> app-text/mupdf/mupdf-1.19.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild index 9d1dae31213a..fe24b78f70e7 100644 --- a/app-text/mupdf/mupdf-1.19.0.ebuild +++ b/app-text/mupdf/mupdf-1.19.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 9110a9e30beca811f3e1cba5e232bb803e11407b Author: Philipp Rösner protonmail com> AuthorDate: Mon Dec 6 00:26:07 2021 + Commit: Sam James gentoo org> CommitDate: Mon Dec 6 22:45:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9110a9e3 app-text/mupdf: Added messages to die calls As pointed out in PR #23174 calls to die didn't have meaningful error messages attached. Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Philipp Roesner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/23193 Signed-off-by: Sam James gentoo.org> app-text/mupdf/metadata.xml| 9 - app-text/mupdf/mupdf-1.19.0.ebuild | 8 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml index 115e9d64a669..5d2f87cc3174 100644 --- a/app-text/mupdf/metadata.xml +++ b/app-text/mupdf/metadata.xml @@ -1,5 +1,12 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + + rndxelem...@protonmail.com + Philipp Rösner + + + proxy-ma...@gentoo.org + Proxy Maintainers + diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild index 88ff8063033b..9d1dae31213a 100644 --- a/app-text/mupdf/mupdf-1.19.0.ebuild +++ b/app-text/mupdf/mupdf-1.19.0.ebuild @@ -67,7 +67,7 @@ src_prepare() { -e "1iAR = $(tc-getAR)" \ -e "1iverbose = yes" \ -e "1ibuild = debug" \ - -i Makerules || die + -i Makerules || die "Failed adding build variables to Makerules in src_prepare()" } _emake() { @@ -122,14 +122,14 @@ src_install() { domenu platform/debian/${PN}.desktop doicon platform/debian/${PN}.xpm else - rm docs/man/${PN}.1 || die + 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 + -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()" _emake install @@ -144,7 +144,7 @@ src_install() { fi # Respect libdir (bug #734898) - sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die + 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
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 91ef587a7ceb00a595f31be3c22f42dea5a4b2cf Author: Joonas Niilola gentoo org> AuthorDate: Sat Dec 4 08:19:39 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Dec 4 08:19:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ef587a app-text/mupdf: update EAPI 7 -> 8, add missing BDEPEND on 1.19.0 Signed-off-by: Joonas Niilola gentoo.org> app-text/mupdf/mupdf-1.19.0.ebuild | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild index e98b869cc5e1..88ff8063033b 100644 --- a/app-text/mupdf/mupdf-1.19.0.ebuild +++ b/app-text/mupdf/mupdf-1.19.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # Please check upstream git regularly for relevant security-related commits # to backport. @@ -39,7 +39,8 @@ RDEPEND=" ) " DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" +BDEPEND="x11-base/xorg-proto + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.15-CFLAGS.patch @@ -53,7 +54,7 @@ PATCHES=( ) src_prepare() { - xdg_src_prepare + default use hppa && append-cflags -ffunction-sections
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: 59271a38de883bea2a0ebdc0f42dd1ca458b11f0 Author: Philipp Roesner protonmail com> AuthorDate: Fri Dec 3 23:59:47 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Dec 4 08:18:21 2021 + 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 protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/23174 Signed-off-by: Joonas Niilola 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 ..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 ..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
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: e886c58ec9d19a36317a3a539a2f5d6102b5a222 Author: Sam James gentoo org> AuthorDate: Wed Oct 6 02:23:47 2021 + Commit: Sam James gentoo org> CommitDate: Wed Oct 6 02:23:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e886c58e app-text/mupdf: add note re security backports Signed-off-by: Sam James gentoo.org> app-text/mupdf/mupdf-1.18.0-r4.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-text/mupdf/mupdf-1.18.0-r4.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild index 66511fc715f..85aad834e2c 100644 --- a/app-text/mupdf/mupdf-1.18.0-r4.ebuild +++ b/app-text/mupdf/mupdf-1.18.0-r4.ebuild @@ -3,6 +3,9 @@ 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"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 60e1222da22e853e370f13bbdad66021c8b29d0e Author: Sam James gentoo org> AuthorDate: Wed Oct 6 02:22:20 2021 + Commit: Sam James gentoo org> CommitDate: Wed Oct 6 02:22:20 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60e1222d app-text/mupdf: drop myself as a maintainer Signed-off-by: Sam James gentoo.org> app-text/mupdf/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml index 641cbd3703e..115e9d64a66 100644 --- a/app-text/mupdf/metadata.xml +++ b/app-text/mupdf/metadata.xml @@ -1,8 +1,5 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - s...@gentoo.org - Sam James - +
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 0f632b56576c3ae07a5bb74252646f203caae520 Author: Yixun Lan gentoo org> AuthorDate: Sat Jul 17 04:30:17 2021 + Commit: Yixun Lan gentoo org> CommitDate: Mon Jul 19 14:23:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f632b56 app-text/mupdf: keyword ~riscv Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Yixun Lan gentoo.org> app-text/mupdf/mupdf-1.18.0-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.18.0-r4.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild index db2b4ba6fd9..66511fc715f 100644 --- a/app-text/mupdf/mupdf-1.18.0-r4.ebuild +++ b/app-text/mupdf/mupdf-1.18.0-r4.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )"
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 93c80397c520bc551280769a492bf02e66a3623f Author: David Seifert gentoo org> AuthorDate: Sat Jun 12 13:41:14 2021 + Commit: David Seifert gentoo org> CommitDate: Sat Jun 12 13:41:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c80397 app-text/mupdf: drop inactive maintainer Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> app-text/mupdf/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml index 82b29f9cae6..979bcc7aec9 100644 --- a/app-text/mupdf/metadata.xml +++ b/app-text/mupdf/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - j...@gentoo.org - Johannes Huber - s...@gentoo.org Sam James
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 290dcded7736a703c703de3f70ce70f57d1cdd4d Author: Sam James gentoo org> AuthorDate: Thu Apr 15 07:24:35 2021 + Commit: Sam James gentoo org> CommitDate: Thu Apr 15 08:00:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=290dcded app-text/mupdf: fix symlink (revert back to ${PV}) Worked fine on Darwin, interestingly enough? Closes: https://bugs.gentoo.org/782931 Signed-off-by: Sam James gentoo.org> app-text/mupdf/{mupdf-1.18.0-r3.ebuild => mupdf-1.18.0-r4.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mupdf/mupdf-1.18.0-r3.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild similarity index 99% rename from app-text/mupdf/mupdf-1.18.0-r3.ebuild rename to app-text/mupdf/mupdf-1.18.0-r4.ebuild index 60145d9c3d3..db2b4ba6fd9 100644 --- a/app-text/mupdf/mupdf-1.18.0-r3.ebuild +++ b/app-text/mupdf/mupdf-1.18.0-r4.ebuild @@ -97,7 +97,7 @@ _emake() { # [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=${PF} + GENTOO_PV=${PV} HAVE_GLUT=$(usex opengl) HAVE_LIBCRYPTO=$(usex ssl) HAVE_X11=$(usex X)
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/
commit: 179ae2aff7affd4cc9e273ae1c7ec4ef3b443578 Author: Sam James gentoo org> AuthorDate: Wed Apr 14 21:37:36 2021 + Commit: Sam James gentoo org> CommitDate: Wed Apr 14 22:00:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179ae2af app-text/mupdf: improve build on Darwin, ${ED} usage, libressl-- Not quite there on Darwin, need to fix -soname usage, but a lot further than before. We also fix incorrect ${ED} usage, export ${PKG_CONFIG}, and drop USE=libressl. Signed-off-by: Sam James gentoo.org> app-text/mupdf/files/mupdf-1.18.0-darwin.patch | 41 +++ app-text/mupdf/mupdf-1.18.0-r3.ebuild | 45 +++--- 2 files changed, 67 insertions(+), 19 deletions(-) diff --git a/app-text/mupdf/files/mupdf-1.18.0-darwin.patch b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch new file mode 100644 index 000..cdd8ccf0f40 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch @@ -0,0 +1,41 @@ +--- a/Makerules b/Makerules +@@ -117,11 +117,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 + + else ifeq ($(OS),Linux) + HAVE_OBJCOPY := yes +--- a/Makerules b/Makerules +@@ -122,9 +122,7 @@ else ifeq ($(OS),MACOS) + AR ?= xcrun ar + LD ?= xcrun ld + RANLIB ?= xcrun ranlib +- +-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) +@@ -197,8 +195,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.18.0-r3.ebuild b/app-text/mupdf/mupdf-1.18.0-r3.ebuild index 8c96cdb6255..60145d9c3d3 100644 --- a/app-text/mupdf/mupdf-1.18.0-r3.ebuild +++ b/app-text/mupdf/mupdf-1.18.0-r3.ebuild @@ -8,18 +8,17 @@ 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" +S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86" -IUSE="+javascript libressl opengl ssl X" +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. -BDEPEND="virtual/pkgconfig" RDEPEND=" dev-libs/gumbo media-libs/freetype:2= @@ -30,21 +29,20 @@ RDEPEND=" virtual/jpeg javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) - ssl? ( - libressl? ( >=dev-libs/libressl-3.1.4:0= ) - !libressl? ( >=dev-libs/openssl-1.1: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.18-Makefile.patch "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch + "${FILESDIR}"/${PN}-1.18.0-darwin.patch # See bugs #662352 "${FILESDIR}"/${PN}-1.15-openssl-x11.patch # General cross fixes from Debian (refreshed) @@ -69,14 +67,12 @@ src_prepare() { -e "1iAR = $(tc-getAR)" \ -e "1iverbose = yes" \ -e "1ibuild = debug" \ - -e "1iprefix = ${ED}/usr" \ - -e "1ilibdir = ${ED}/usr/$(get_libdir)" \ - -e "1idocdir = ${ED}/usr/share/doc/${PF}" \ -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 @@ -100,19 +96,24 @@ _emake() { # # [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 - emake \ - GENTOO_PV=${PF} \ - HAVE_GLUT=$(usex opengl) \ - HAVE_LIBCRYPTO=$(usex ssl) \ - HAVE_X11=$(usex X) \ - USE_SYSTEM_LIBS=yes \ -