From owner-svn-ports-all@freebsd.org Thu Jul 11 04:30:29 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D6FA15EBA28; Thu, 11 Jul 2019 04:30:29 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 02CF88AB3F; Thu, 11 Jul 2019 04:30:29 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEFAE215AD; Thu, 11 Jul 2019 04:30:28 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6B4USr6049955; Thu, 11 Jul 2019 04:30:28 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6B4US9H049954; Thu, 11 Jul 2019 04:30:28 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201907110430.x6B4US9H049954@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Thu, 11 Jul 2019 04:30:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506398 - head/deskutils/calibre/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/deskutils/calibre/files X-SVN-Commit-Revision: 506398 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 02CF88AB3F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jul 2019 04:30:29 -0000 Author: tcberner Date: Thu Jul 11 04:30:28 2019 New Revision: 506398 URL: https://svnweb.freebsd.org/changeset/ports/506398 Log: deskutils/calibre: prepare for Qt 5.13 PR: 238782 Added: head/deskutils/calibre/files/patch-git_0a5dc0 (contents, props changed) Added: head/deskutils/calibre/files/patch-git_0a5dc0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calibre/files/patch-git_0a5dc0 Thu Jul 11 04:30:28 2019 (r506398) @@ -0,0 +1,30 @@ +From 0a5dc07da1cb0f9409803b4df1a92e497e3c0e95 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +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 ¶meters) + 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()); +