Date: Fri, 30 Apr 2021 16:13:10 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: ce0c99f57ed8 - main - deskutils/calibre: Update to 5.17.0 Message-ID: <202104301613.13UGDA6D086951@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=ce0c99f57ed8928e98afd5a20db0dfaf21d29adc commit ce0c99f57ed8928e98afd5a20db0dfaf21d29adc Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2021-04-30 16:12:14 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2021-04-30 16:13:05 +0000 deskutils/calibre: Update to 5.17.0 --- deskutils/calibre/Makefile | 2 +- deskutils/calibre/distinfo | 6 +++--- .../files/patch-src_calibre_utils_cpp__binding.h | 20 ++++++++++++++++++++ deskutils/calibre/pkg-plist | 1 - 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 8025cf70e48a..b84d7ed1f81c 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -1,7 +1,7 @@ # Created by: stas PORTNAME= calibre -PORTVERSION= 5.16.1 +PORTVERSION= 5.17.0 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index 2e16ba53a429..80dc9733296a 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618813468 -SHA256 (calibre-5.16.1.tar.xz) = 9535c25b430634e7b379c6863bd736246538ca5c293e605a3174d8de72cd72b1 -SIZE (calibre-5.16.1.tar.xz) = 36757204 +TIMESTAMP = 1619768640 +SHA256 (calibre-5.17.0.tar.xz) = add8812f7637abfd3015f5861388c69166a4815f2103d1e30dc297b28ead56bb +SIZE (calibre-5.17.0.tar.xz) = 36784632 diff --git a/deskutils/calibre/files/patch-src_calibre_utils_cpp__binding.h b/deskutils/calibre/files/patch-src_calibre_utils_cpp__binding.h new file mode 100644 index 000000000000..7367743aac8b --- /dev/null +++ b/deskutils/calibre/files/patch-src_calibre_utils_cpp__binding.h @@ -0,0 +1,20 @@ +--- src/calibre/utils/cpp_binding.h.orig 2021-04-30 02:00:12 UTC ++++ src/calibre/utils/cpp_binding.h +@@ -14,7 +14,7 @@ + + #define arraysz(x) (sizeof(x)/sizeof(x[0])) + +-template<typename T, void free_T(void*), T null=reinterpret_cast<T>(NULL)> ++template<typename T, void free_T(void*), T null=static_cast<T>(NULL)> + class generic_raii { + private: + generic_raii( const generic_raii & ) noexcept; +@@ -45,7 +45,7 @@ typedef generic_raii<wchar_t*, PyMem_Free> wchar_raii; + static inline void python_object_destructor(void *p) { PyObject *x = reinterpret_cast<PyObject*>(p); Py_XDECREF(x); } + typedef generic_raii<PyObject*, python_object_destructor> pyobject_raii; + +-template<typename T, void free_T(void*), size_t sz, T null=reinterpret_cast<T>(NULL)> ++template<typename T, void free_T(void*), size_t sz, T null=static_cast<T>(NULL)> + class generic_raii_array { + private: + generic_raii_array( const generic_raii_array & ) noexcept; diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist index 31951eaa49d3..f4f190c8a151 100644 --- a/deskutils/calibre/pkg-plist +++ b/deskutils/calibre/pkg-plist @@ -145,7 +145,6 @@ lib/calibre/calibre/devices/mtp/unix/sysfs.py lib/calibre/calibre/devices/mtp/unix/upstream/update.py lib/calibre/calibre/devices/mtp/windows/__init__.py lib/calibre/calibre/devices/mtp/windows/driver.py -lib/calibre/calibre/devices/mtp/windows/remote.py lib/calibre/calibre/devices/nokia/__init__.py lib/calibre/calibre/devices/nokia/driver.py lib/calibre/calibre/devices/nook/__init__.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104301613.13UGDA6D086951>