Bump MuPDF to version 1.20.3 and update packages that depend on it (#7125)

* update recipes for mupdf 1.20.3

* update documentviewer

* revert revision number of documentviewer
This commit is contained in:
Ivan Holmes
2022-08-23 13:15:33 +01:00
committed by GitHub
parent a3b93cc051
commit 6e0d20000a
7 changed files with 75 additions and 43 deletions

View File

@@ -1,32 +0,0 @@
From c65cf1b6eb9791e523e348946c15be8621e22744 Mon Sep 17 00:00:00 2001
From: Ivan Holmes <ivan@ivanholmes.co.uk>
Date: Wed, 13 Apr 2022 13:07:48 +0100
Subject: Add Haiku platform to setup.py
diff --git a/setup.py b/setup.py
index 475bc5d..4647f52 100644
--- a/setup.py
+++ b/setup.py
@@ -104,7 +104,17 @@ elif sys.platform.startswith(("darwin", "freebsd", "openbsd")):
libraries = ["mupdf", "mupdf-third"]
library_dirs = ["/usr/local/lib", "/opt/homebrew/lib"]
extra_link_args = []
-
+
+elif sys.platform.startswith("haiku"):
+ include_dirs = [
+ "/boot/system/develop/headers/x86/mupdf",
+ "/boot/system/develop/headers/mupdf",
+ "/boot/system/develop/headers/x86/freetype2",
+ "/boot/system/develop/headers/freetype2"
+ ]
+ libraries = ["mupdf"]
+ library_dirs = ["/boot/system/lib/x86", "/boot/system/lib"]
+ extra_link_args = []
else:
include_dirs = [
--
2.30.2

View File

@@ -0,0 +1,63 @@
From 0e99319427e7106a24b7a3c5a431b4a37c497344 Mon Sep 17 00:00:00 2001
From: Ivan Holmes <ivan@ivanholmes.co.uk>
Date: Wed, 17 Aug 2022 22:39:41 +0100
Subject: patch setup.py for haiku library paths
diff --git a/setup.py b/setup.py
index fbf775d..94d75c8 100644
--- a/setup.py
+++ b/setup.py
@@ -569,6 +569,7 @@ if ('-h' not in sys.argv and '--help' not in sys.argv
openbsd = sys.platform.startswith( 'openbsd')
freebsd = sys.platform.startswith( 'freebsd')
darwin = sys.platform.startswith( 'darwin')
+ haiku = sys.platform.startswith( 'haiku')
if mupdf_local and (linux or openbsd or freebsd):
# setuptools' link command always seems to put '-L
@@ -625,7 +626,16 @@ if ('-h' not in sys.argv and '--help' not in sys.argv
'freetype',
'harfbuzz',
]
-
+
+ elif haiku:
+ include_dirs.append("/boot/system/develop/headers/x86/mupdf")
+ include_dirs.append("/boot/system/develop/headers/mupdf")
+ include_dirs.append("/boot/system/develop/headers/x86/freetype2")
+ include_dirs.append("/boot/system/develop/headers/freetype2")
+ library_dirs.append("/boot/system/lib/x86")
+ library_dirs.append("/boot/system/lib")
+ libraries = ["mupdf"]
+
else:
# Windows.
assert mupdf_local
--
2.36.1
From ced6643f4b25569aa1ce4c01f2814875caa4e8a5 Mon Sep 17 00:00:00 2001
From: Ivan Holmes <ivan@ivanholmes.co.uk>
Date: Wed, 17 Aug 2022 22:50:41 +0100
Subject: force use of system mupdf
diff --git a/setup.py b/setup.py
index 94d75c8..e1f9bf0 100644
--- a/setup.py
+++ b/setup.py
@@ -484,7 +484,8 @@ if ('-h' not in sys.argv and '--help' not in sys.argv
# Build MuPDF before setuptools runs, so that it can link with the MuPDF
# libraries.
#
- mupdf_local = get_mupdf()
+ # mupdf_local = get_mupdf()
+ mupdf_local = None
if mupdf_local:
if not mupdf_local.endswith( '/'):
mupdf_local += '/'
--
2.36.1

View File

@@ -11,9 +11,9 @@ HOMEPAGE="https://pypi.org/project/PyMuPDF/
COPYRIGHT="2022 Jorj X. McKie and Ruikai Liu"
LICENSE="AGPL-3.0"
REVISION="1"
pypi="032d24e0c774e67742395fda163a172c60e4d0f9875785d5199eb2956d5e"
SOURCE_URI="https://files.pythonhosted.org/packages/9f/1d/$pypi/PyMuPDF-$portVersion.tar.gz"
CHECKSUM_SHA256="ef3d13e27f1585d776f6a2597f113aabd28d36b648b983a72850b21c5399ab08"
pypi="4a/09/6afe87a8ea7acb6e4709223a704270ffe9929497add4d06b12305e229ba8"
SOURCE_URI="https://files.pythonhosted.org/packages/$pypi/PyMuPDF-$portVersion.tar.gz"
CHECKSUM_SHA256="02eedf01f57c6bafb5e8667cea0088a2d2522643c47100f1908bec3a68a84888"
SOURCE_DIR="PyMuPDF-$portVersion"
PATCHES="pymupdf-$portVersion.patchset"
@@ -29,8 +29,9 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libmupdf$secondaryArchSuffix >= 1.19
devel:libmupdf$secondaryArchSuffix >= 1.20
devel:libfreetype$secondaryArchSuffix
swig
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix