diff options
| author | kamil <kamil@pkgsrc.org> | 2019-09-24 16:39:50 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2019-09-24 16:39:50 +0000 |
| commit | 9e9bd6f0a7280d7b708073aea182fde23701ed41 (patch) | |
| tree | 40fe473249bbf7dfb3f20f65f2a5b47373b8b6dd /misc/calibre | |
| parent | e1badc1034607c71f6669765ae0e5f67dad4b5f4 (diff) | |
| download | pkgsrc-9e9bd6f0a7280d7b708073aea182fde23701ed41.tar.gz | |
calibre: Fix qt 5.13 compatibility
Cherry-pick upstream patch:
https://github.com/kovidgoyal/calibre/commit/0a5dc07da1cb0f9409803b4df1a92e497e3c0e95.patch
Diffstat (limited to 'misc/calibre')
| -rw-r--r-- | misc/calibre/distinfo | 3 | ||||
| -rw-r--r-- | misc/calibre/patches/patch-src_calibre_headless_headless__integration.cpp | 20 |
2 files changed, 22 insertions, 1 deletions
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo index 5a6d1602dbe..d12d526637f 100644 --- a/misc/calibre/distinfo +++ b/misc/calibre/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.103 2019/03/25 13:11:56 wiz Exp $ +$NetBSD: distinfo,v 1.104 2019/09/24 16:39:50 kamil Exp $ SHA1 (calibre-3.40.1.tar.xz) = 12cea0bed963dde2b58c9cdd4c3c25c735d6d15a RMD160 (calibre-3.40.1.tar.xz) = 72bf801e4164dcebec22ba36162fe034c9edad54 @@ -6,4 +6,5 @@ SHA512 (calibre-3.40.1.tar.xz) = 1333c24e384ccae79d264055e1e84b8a13919e68d9290a2 Size (calibre-3.40.1.tar.xz) = 38365300 bytes SHA1 (patch-setup_build.py) = f309c8f01af375fce1d09bf5c4bac9610cf4e0c5 SHA1 (patch-setup_build__environment.py) = dd6160233c717e935205649ee685e71df3f1858e +SHA1 (patch-src_calibre_headless_headless__integration.cpp) = 62ab6f5aaf6bd8bcbb875ab56eac1a474d8b446b SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662 diff --git a/misc/calibre/patches/patch-src_calibre_headless_headless__integration.cpp b/misc/calibre/patches/patch-src_calibre_headless_headless__integration.cpp new file mode 100644 index 00000000000..896540cbec3 --- /dev/null +++ b/misc/calibre/patches/patch-src_calibre_headless_headless__integration.cpp @@ -0,0 +1,20 @@ +$NetBSD: patch-src_calibre_headless_headless__integration.cpp,v 1.1 2019/09/24 16:39:51 kamil Exp $ + +Fix Qt 5.13 compat. +https://github.com/kovidgoyal/calibre/commit/0a5dc07da1cb0f9409803b4df1a92e497e3c0e95.patch + +--- src/calibre/headless/headless_integration.cpp.orig 2019-03-08 06:09:34.000000000 +0000 ++++ src/calibre/headless/headless_integration.cpp +@@ -58,7 +58,12 @@ HeadlessIntegration::HeadlessIntegration + mPrimaryScreen->mDepth = 32; + mPrimaryScreen->mFormat = QImage::Format_ARGB32_Premultiplied; + ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)) ++ QWindowSystemInterface::handleScreenAdded(mPrimaryScreen); ++#else + screenAdded(mPrimaryScreen); ++#endif ++ + #ifdef __APPLE__ + m_fontDatabase.reset(new QCoreTextFontDatabase()); + #else |