svn commit: r557845 - in head/deskutils/calibre: . files
Guido Falsi
madpilot at FreeBSD.org
Sat Dec 12 18:32:05 UTC 2020
Author: madpilot
Date: Sat Dec 12 18:32:04 2020
New Revision: 557845
URL: https://svnweb.freebsd.org/changeset/ports/557845
Log:
Update calibre to 5.7.2
Deleted:
head/deskutils/calibre/files/patch-icu68
Modified:
head/deskutils/calibre/Makefile
head/deskutils/calibre/distinfo
head/deskutils/calibre/files/patch-setup_build.py
head/deskutils/calibre/pkg-plist
Modified: head/deskutils/calibre/Makefile
==============================================================================
--- head/deskutils/calibre/Makefile Sat Dec 12 18:32:03 2020 (r557844)
+++ head/deskutils/calibre/Makefile Sat Dec 12 18:32:04 2020 (r557845)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= calibre
-PORTVERSION= 5.6.0
-PORTREVISION= 1
+PORTVERSION= 5.7.2
CATEGORIES= deskutils python
MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/
Modified: head/deskutils/calibre/distinfo
==============================================================================
--- head/deskutils/calibre/distinfo Sat Dec 12 18:32:03 2020 (r557844)
+++ head/deskutils/calibre/distinfo Sat Dec 12 18:32:04 2020 (r557845)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606469769
-SHA256 (calibre-5.6.0.tar.xz) = 484a2e120fdbcff6c544d4c216afef0ff784c7665d3fd44d98acb0420d8f5e55
-SIZE (calibre-5.6.0.tar.xz) = 36653328
+TIMESTAMP = 1607774840
+SHA256 (calibre-5.7.2.tar.xz) = 3cdbc526071e16b5d974b98c1e9a80b7716127764164285884e37e5e52a9ebae
+SIZE (calibre-5.7.2.tar.xz) = 36627468
Modified: head/deskutils/calibre/files/patch-setup_build.py
==============================================================================
--- head/deskutils/calibre/files/patch-setup_build.py Sat Dec 12 18:32:03 2020 (r557844)
+++ head/deskutils/calibre/files/patch-setup_build.py Sat Dec 12 18:32:04 2020 (r557845)
@@ -1,6 +1,14 @@
---- setup/build.py.orig 2020-10-10 16:20:32 UTC
+--- setup/build.py.orig 2020-12-12 08:56:45 UTC
+++ setup/build.py
-@@ -496,6 +496,7 @@ exceptions = {needs_exceptions}
+@@ -487,6 +487,7 @@ project-factory = "pyqtbuild:PyQtProject"
+
+ [tool.sip.project]
+ sip-files-dir = "."
++sip-module = "PyQt5.sip"
+
+ [tool.sip.bindings.pictureflow]
+ headers = {ext.headers}
+@@ -495,6 +496,7 @@ exceptions = {needs_exceptions}
include-dirs = {ext.inc_dirs}
qmake-QT = ["widgets"]
sip-file = "{os.path.basename(sipf)}"
@@ -8,3 +16,19 @@
''')
shutil.copy2(sipf, src_dir)
+@@ -523,6 +525,15 @@ sip-file = "{os.path.basename(sipf)}"
+ cwd = os.getcwd()
+ try:
+ os.chdir(os.path.join(src_dir, 'build'))
++ if ext.needs_exceptions:
++ # bug in sip-build
++ for q in walk('.'):
++ if os.path.basename(q) in ('Makefile',):
++ with open(q, 'r+') as f:
++ raw = f.read()
++ raw = raw.replace('-fno-exceptions', '-fexceptions')
++ f.seek(0), f.truncate()
++ f.write(raw)
+ self.check_call([self.env.make] + ([] if iswindows else ['-j%d'%(os.cpu_count() or 1)]))
+ e = 'pyd' if iswindows else 'so'
+ m = glob.glob(f'{ext.name}/{ext.name}.*{e}')
Modified: head/deskutils/calibre/pkg-plist
==============================================================================
--- head/deskutils/calibre/pkg-plist Sat Dec 12 18:32:03 2020 (r557844)
+++ head/deskutils/calibre/pkg-plist Sat Dec 12 18:32:04 2020 (r557845)
@@ -530,7 +530,6 @@ lib/calibre/calibre/ebooks/pdf/render/gradients.py
lib/calibre/calibre/ebooks/pdf/render/graphics.py
lib/calibre/calibre/ebooks/pdf/render/links.py
lib/calibre/calibre/ebooks/pdf/render/serialize.py
-lib/calibre/calibre/ebooks/pdf/test_html_writer.py
lib/calibre/calibre/ebooks/pml/__init__.py
lib/calibre/calibre/ebooks/pml/pmlconverter.py
lib/calibre/calibre/ebooks/pml/pmlml.py
@@ -1035,8 +1034,11 @@ lib/calibre/calibre/gui2/tts/develop.py
lib/calibre/calibre/gui2/tts/errors.py
lib/calibre/calibre/gui2/tts/implementation.py
lib/calibre/calibre/gui2/tts/linux.py
+lib/calibre/calibre/gui2/tts/linux_config.py
lib/calibre/calibre/gui2/tts/macos.py
+lib/calibre/calibre/gui2/tts/macos_config.py
lib/calibre/calibre/gui2/tts/windows.py
+lib/calibre/calibre/gui2/tts/windows_config.py
lib/calibre/calibre/gui2/tweak_book/__init__.py
lib/calibre/calibre/gui2/tweak_book/boss.py
lib/calibre/calibre/gui2/tweak_book/char_select.py
@@ -1113,6 +1115,7 @@ lib/calibre/calibre/gui2/viewer/search.py
lib/calibre/calibre/gui2/viewer/shortcuts.py
lib/calibre/calibre/gui2/viewer/toc.py
lib/calibre/calibre/gui2/viewer/toolbars.py
+lib/calibre/calibre/gui2/viewer/tts.py
lib/calibre/calibre/gui2/viewer/ui.py
lib/calibre/calibre/gui2/viewer/web_view.py
lib/calibre/calibre/gui2/viewer/widgets.py
@@ -1514,6 +1517,7 @@ lib/calibre/tinycss/version.py
%%DATADIR%%/images/book.png
%%DATADIR%%/images/bookmarks.png
%%DATADIR%%/images/books_in_series.png
+%%DATADIR%%/images/bullhorn.png
%%DATADIR%%/images/catalog.png
%%DATADIR%%/images/chapters.png
%%DATADIR%%/images/character-set.png
More information about the svn-ports-all
mailing list