Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at 2019-07-01 10:44:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calibre (Old) and /work/SRC/openSUSE:Factory/.calibre.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calibre" Mon Jul 1 10:44:44 2019 rev:209 rq:712729 version:3.44.0 Changes: -------- --- /work/SRC/openSUSE:Factory/calibre/calibre.changes 2019-06-19 21:02:40.354202992 +0200 +++ /work/SRC/openSUSE:Factory/.calibre.new.4615/calibre.changes 2019-07-01 10:44:44.805513881 +0200 @@ -1,0 +2,6 @@ +Sun Jun 30 17:28:41 UTC 2019 - Ave Milia <[email protected]> + +- fix compilation against Qt 5.13 + * calibre-fix-qt5.13-compat.patch + +------------------------------------------------------------------- New: ---- calibre-fix-qt5.13-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.csALPI/_old 2019-07-01 10:44:45.733515396 +0200 +++ /var/tmp/diff_new_pack.csALPI/_new 2019-07-01 10:44:45.733515396 +0200 @@ -32,6 +32,9 @@ Patch2: %{name}-setup.install.py.diff # PATCH-FIX-OPENSUSE: disabling Autoupdate Searcher Patch3: %{name}-no-update.diff +# Make it build against Qt 5.13. Remove when kovidgoyal/calibre@0a5dc07 is +# included in release version. +Patch4: %{name}-fix-qt5.13-compat.patch BuildRequires: fdupes BuildRequires: help2man BuildRequires: hicolor-icon-theme @@ -175,6 +178,7 @@ %setup -q %patch2 -p1 %patch3 -p1 -b .no-update +%patch4 -p1 # dos2unix newline conversion sed -i 's/\r//' src/calibre/web/feeds/recipes/* ++++++ calibre-fix-qt5.13-compat.patch ++++++ Index: calibre-3.44.0/src/calibre/headless/headless_integration.cpp =================================================================== --- calibre-3.44.0.orig/src/calibre/headless/headless_integration.cpp +++ calibre-3.44.0/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
