cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to calibre-5.14.0

Browse Source
This commit is contained in:
sthen 2021-03-27 14:35:12 +00:00
parent 29ec6acc42
commit 56bf8e313f
7 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
textproc/calibre/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.87 2021/03/23 22:19:59 sthen Exp $
# $OpenBSD: Makefile,v 1.88 2021/03/27 14:35:12 sthen Exp $
COMMENT = ebook management application
V = 5.13.0
V = 5.14.0
DISTNAME = calibre-$V
REVISION = 0
CATEGORIES = textproc

4
textproc/calibre/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (calibre-5.13.0.tar.xz) = GDFAZxZmkio7e7kVjhYqhNdhXIlUPJF0iMWVl0uWVCM=
SIZE (calibre-5.13.0.tar.xz) = 36746972
SHA256 (calibre-5.14.0.tar.xz) = GGzOV7aZCvCwFCgvodPZFP/8EeQNhJXqQ9kUhVNOEnE=
SIZE (calibre-5.14.0.tar.xz) = 36712348

3
textproc/calibre/patches/patch-setup___init___py
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-setup___init___py,v 1.7 2021/02/24 14:13:48 rsadowski Exp $
$OpenBSD: patch-setup___init___py,v 1.8 2021/03/27 14:35:12 sthen Exp $
Index: setup/__init__.py
--- setup/__init__.py.orig
+++ setup/__init__.py

37
textproc/calibre/patches/patch-setup_build_py
View File

@ -1,8 +1,9 @@
$OpenBSD: patch-setup_build_py,v 1.5 2021/02/24 14:13:48 rsadowski Exp $
$OpenBSD: patch-setup_build_py,v 1.6 2021/03/27 14:35:12 sthen Exp $
Index: setup/build.py
--- setup/build.py.orig
+++ setup/build.py
@@ -65,15 +65,7 @@ class Extension(object):
@@ -71,15 +71,7 @@ class Extension(object):
self.ldflags = d['ldflags'] = kwargs.get('ldflags', [])
self.optional = d['options'] = kwargs.get('optional', False)
@ -18,11 +19,8 @@ Index: setup/build.py
def lazy_load(name):
if name.startswith('!'):
name = name[1:]
@@ -184,8 +176,11 @@ def init_env():
ldflags.append('-shared')
@@ -194,6 +186,8 @@ def init_env(debug=False, sanitize=False):
if isbsd:
+ sipdir = os.environ.get('SIP_DIR', '')
cflags.append('-pthread')
ldflags.append('-shared')
+ cflags.append('-I'+os.path.join(sysconfig.PREFIX, 'include'))
@ -30,30 +28,3 @@ Index: setup/build.py
if ishaiku:
cflags.append('-lpthread')
@@ -221,8 +216,8 @@ def init_env():
cflags.append('-I%s'%sysconfig.get_python_inc())
ldflags.append('/LIBPATH:'+os.path.join(sysconfig.PREFIX, 'libs'))
linker = msvc.linker
- return namedtuple('Environment', 'cc cxx cflags ldflags linker make')(
- cc=cc, cxx=cxx, cflags=cflags, ldflags=ldflags, linker=linker, make=NMAKE if iswindows else 'make')
+ return namedtuple('Environment', 'cc cxx cflags ldflags linker make sipdir')(
+ cc=cc, cxx=cxx, cflags=cflags, ldflags=ldflags, linker=linker, make=NMAKE if iswindows else 'make', sipdir=sipdir if isbsd else '')
class Build(Command):
@@ -487,6 +482,7 @@ project-factory = "pyqtbuild:PyQtProject"
[tool.sip.project]
sip-files-dir = "."
+sip-include-dirs = [ "{self.env.sipdir}" ]
[tool.sip.bindings.pictureflow]
headers = {ext.headers}
@@ -495,6 +491,7 @@ exceptions = {needs_exceptions}
include-dirs = {ext.inc_dirs}
qmake-QT = ["widgets"]
sip-file = "{os.path.basename(sipf)}"
+tags = ["WS_X11"]
''')
shutil.copy2(sipf, src_dir)

5
textproc/calibre/patches/patch-setup_install_py
View File

@ -1,7 +1,4 @@
$OpenBSD: patch-setup_install_py,v 1.5 2021/02/24 14:13:48 rsadowski Exp $
don't allow an updated patch to change the python shebang lines,
they're correct with "env" here (handled in infrastructure).
$OpenBSD: patch-setup_install_py,v 1.6 2021/03/27 14:35:12 sthen Exp $
Index: setup/install.py
--- setup/install.py.orig

4
textproc/calibre/patches/patch-src_calibre_gui2_update_py
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_calibre_gui2_update_py,v 1.2 2021/02/24 14:13:48 rsadowski Exp $
$OpenBSD: patch-src_calibre_gui2_update_py,v 1.3 2021/03/27 14:35:12 sthen Exp $
upstream's repo is not a useful source of updates for OpenBSD.
- upstream's repo is not a useful source of updates for OpenBSD.
Index: src/calibre/gui2/update.py
--- src/calibre/gui2/update.py.orig

6
textproc/calibre/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.38 2021/03/17 08:22:29 sthen Exp $
@comment $OpenBSD: PLIST,v 1.39 2021/03/27 14:35:12 sthen Exp $
bin/calibre
bin/calibre-complete
bin/calibre-customize
@ -2668,6 +2668,7 @@ lib/calibre/calibre/srv/tests/${MODPY_PYCACHE}ajax.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/srv/tests/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/srv/tests/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/srv/tests/${MODPY_PYCACHE}content.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/srv/tests/${MODPY_PYCACHE}fast_css_transform.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/srv/tests/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/srv/tests/${MODPY_PYCACHE}loop.${MODPY_PYC_MAGIC_TAG}pyc
lib/calibre/calibre/srv/tests/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
@ -2677,6 +2678,7 @@ lib/calibre/calibre/srv/tests/ajax.py
lib/calibre/calibre/srv/tests/auth.py
lib/calibre/calibre/srv/tests/base.py
lib/calibre/calibre/srv/tests/content.py
lib/calibre/calibre/srv/tests/fast_css_transform.py
lib/calibre/calibre/srv/tests/http.py
lib/calibre/calibre/srv/tests/loop.py
lib/calibre/calibre/srv/tests/main.py
@ -3515,7 +3517,6 @@ share/calibre/images/wizard.png
share/calibre/jacket/
share/calibre/jacket/stylesheet.css
share/calibre/jacket/template.xhtml
share/calibre/jquery.simulate.js
share/calibre/localization/
share/calibre/localization/iso3166.calibre_msgpack
share/calibre/localization/iso639.calibre_msgpack
@ -6074,6 +6075,7 @@ share/calibre/recipes/ynet.recipe
share/calibre/recipes/yomiuri.png
share/calibre/recipes/yomiuri.recipe
share/calibre/recipes/yomiuri_world.recipe
share/calibre/recipes/zackzack.recipe
share/calibre/recipes/zadolba_li.png
share/calibre/recipes/zadolba_li.recipe
share/calibre/recipes/zaman.png