Date: Fri, 17 Dec 2021 19:09:12 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 63d22470146b - main - deskutils/calibre: Update to 5.34.0 Message-ID: <202112171909.1BHJ9CYQ076785@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=63d22470146b15474ccf4f18e23fe95dae1576d2 commit 63d22470146b15474ccf4f18e23fe95dae1576d2 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2021-12-17 19:06:25 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2021-12-17 19:06:25 +0000 deskutils/calibre: Update to 5.34.0 Import upstream patch to fix installation on FreeBSD. [1] Obtained from: https://github.com/kovidgoyal/calibre/commit/dafa08e9213d3baad41c97e7598592bd0e06894d [1] --- deskutils/calibre/Makefile | 3 +-- deskutils/calibre/distinfo | 6 +++--- deskutils/calibre/files/patch-setup_install.py | 11 +++++++++++ deskutils/calibre/pkg-plist | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 92244231fff9..0643c3606fe6 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -1,8 +1,7 @@ # Created by: stas PORTNAME= calibre -PORTVERSION= 5.33.2 -PORTREVISION= 1 +PORTVERSION= 5.34.0 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index 2a9ae9377853..af07fab9330f 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638635716 -SHA256 (calibre-5.33.2.tar.xz) = c2db77b9c09a16af702e4efd09e0b3db4b4c33a01b2ed6782e7e93c4ec7476f2 -SIZE (calibre-5.33.2.tar.xz) = 37081104 +TIMESTAMP = 1639726652 +SHA256 (calibre-5.34.0.tar.xz) = d4d401eefadc534851df4f3ff247949ffac785dbc993901bd2938c3f2894d7e3 +SIZE (calibre-5.34.0.tar.xz) = 37077184 diff --git a/deskutils/calibre/files/patch-setup_install.py b/deskutils/calibre/files/patch-setup_install.py new file mode 100644 index 000000000000..6ed261733ca7 --- /dev/null +++ b/deskutils/calibre/files/patch-setup_install.py @@ -0,0 +1,11 @@ +--- setup/install.py.orig 2021-12-17 00:40:19 UTC ++++ setup/install.py +@@ -158,7 +158,7 @@ class Develop(Command): + import sysconfig + libdir = os.path.join( + self.opts.staging_root, sysconfig.get_config_var('PLATLIBDIR') or 'lib', +- sysconfig.get_python_version(), 'site-packages') ++ os.path.basename(sysconfig.get_config_var('DESTLIB') or sysconfig.get_config_var('LIBDEST') or f'python{sysconfig.get_python_version()}'), 'site-packages') + try: + if not os.path.exists(libdir): + os.makedirs(libdir) diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist index 224a69df17b7..bb7028ecbf4b 100644 --- a/deskutils/calibre/pkg-plist +++ b/deskutils/calibre/pkg-plist @@ -1465,6 +1465,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/catalog/stylesheet.css %%DATADIR%%/catalog/template.xhtml %%DATADIR%%/changelog.json +%%DATADIR%%/common-english-words.txt %%DATADIR%%/content-server/calibre.png %%DATADIR%%/content-server/empty.html %%DATADIR%%/content-server/index-generated.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112171909.1BHJ9CYQ076785>