aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2019-07-11 12:30:28 +0800
committerTobias C. Berner <tcberner@FreeBSD.org>2019-07-11 12:30:28 +0800
commited63df8a2ce6ddfd4513c4fc184d156c2e46f7b9 (patch)
tree2a293ad87992d62acf6c43877a251bd968da127c /deskutils
parent3a8e481066e1b78016d4218e8b5e6af43712f2d2 (diff)
downloadfreebsd-ports-gnome-ed63df8a2ce6ddfd4513c4fc184d156c2e46f7b9.tar.gz
freebsd-ports-gnome-ed63df8a2ce6ddfd4513c4fc184d156c2e46f7b9.tar.zst
freebsd-ports-gnome-ed63df8a2ce6ddfd4513c4fc184d156c2e46f7b9.zip
deskutils/calibre: prepare for Qt 5.13
PR: 238782
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/calibre/files/patch-git_0a5dc030
1 files changed, 30 insertions, 0 deletions
diff --git a/deskutils/calibre/files/patch-git_0a5dc0 b/deskutils/calibre/files/patch-git_0a5dc0
new file mode 100644
index 000000000000..dfcd446f59ae
--- /dev/null
+++ b/deskutils/calibre/files/patch-git_0a5dc0
@@ -0,0 +1,30 @@
+From 0a5dc07da1cb0f9409803b4df1a92e497e3c0e95 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Wed, 19 Jun 2019 11:04:06 -0400
+Subject: [PATCH] fix qt 5.13 compatibility
+
+In https://github.com/qt/qtbase/commit/01e1df90a7debd333314720fdd5cf6cd9964d796,
+screenAdded was deprecated, and as of qt 5.13 it is fully removed. Adapt
+to this change by using the new API in QWindowSystemInterface.
+---
+ src/calibre/headless/headless_integration.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/calibre/headless/headless_integration.cpp b/src/calibre/headless/headless_integration.cpp
+index 7dc2fce583..c35bb52dd3 100644
+--- src/calibre/headless/headless_integration.cpp
++++ src/calibre/headless/headless_integration.cpp
+@@ -64,7 +64,12 @@ HeadlessIntegration::HeadlessIntegration(const QStringList &parameters)
+ 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__
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
+ m_fontDatabase.reset(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>());
+