diff --git a/0001-Compatibility-with-qt5-5.9.0.patch b/0001-Compatibility-with-qt5-5.9.0.patch new file mode 100644 index 0000000..628f406 --- /dev/null +++ b/0001-Compatibility-with-qt5-5.9.0.patch @@ -0,0 +1,88 @@ +From 82bd2e1a51df0650cb40894c5dc2b958f601a91d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 16 May 2017 14:20:51 -0400 +Subject: [PATCH] Compatibility with qt5-5.9.0 + +--- + src/calibre/headless/fontconfig_database.cpp | 16 ++++++++++------ + src/calibre/headless/fontconfig_database.h | 12 ++++++++---- + 2 files changed, 18 insertions(+), 10 deletions(-) + +diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp +index 4e87b8f81b..33defd0b48 100644 +--- a/src/calibre/headless/fontconfig_database.cpp ++++ b/src/calibre/headless/fontconfig_database.cpp +@@ -48,14 +48,18 @@ + #include + + #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) +-#include ++# include + #else +-#include ++# include ++#endif ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) ++# include ++#else ++# include + #endif +-#include + #include + #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) +-#include ++# include + #endif + + #include +@@ -763,7 +767,7 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, void *usrPtr) + + QFontEngine *QFontconfigDatabase::fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) + { +- QFontEngineFT *engine = static_cast(QBasicFontDatabase::fontEngine(fontData, pixelSize, hintingPreference)); ++ QFontEngineFT *engine = static_cast(QFreeTypeFontDatabase::fontEngine(fontData, pixelSize, hintingPreference)); + if (engine == 0) + return 0; + +@@ -915,7 +919,7 @@ QStringList QFontconfigDatabase::addApplicationFont(const QByteArray &fontData, + + QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const + { +- QString resolved = QBasicFontDatabase::resolveFontFamilyAlias(family); ++ QString resolved = QFreeTypeFontDatabase::resolveFontFamilyAlias(family); + if (!resolved.isEmpty() && resolved != family) + return resolved; + FcPattern *pattern = FcPatternCreate(); +diff --git a/src/calibre/headless/fontconfig_database.h b/src/calibre/headless/fontconfig_database.h +index e2fecff724..62afc129cf 100644 +--- a/src/calibre/headless/fontconfig_database.h ++++ b/src/calibre/headless/fontconfig_database.h +@@ -7,17 +7,21 @@ + #pragma once + + #include +-#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) +-#include ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) ++# include ++#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) ++# include ++# define QFreeTypeFontDatabase QBasicFontDatabase + #else +-#include ++# include ++# define QFreeTypeFontDatabase QBasicFontDatabase + #endif + + QT_BEGIN_NAMESPACE + + class QFontEngineFT; + +-class QFontconfigDatabase : public QBasicFontDatabase ++class QFontconfigDatabase : public QFreeTypeFontDatabase + { + public: + #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) +-- +2.13.0.67.g10c78a162f + diff --git a/calibre.spec b/calibre.spec index 2ab10ef..51c5fb9 100644 --- a/calibre.spec +++ b/calibre.spec @@ -33,6 +33,7 @@ Patch1: %{name}-no-update.patch # This is so gnome-software only 'sees' calibre once. # Patch3: calibre-nodisplay.patch +Patch4: 0001-Compatibility-with-qt5-5.9.0.patch BuildRequires: python >= 2.7 BuildRequires: python-devel >= 2.7 @@ -124,13 +125,7 @@ Supported input formats are: MOBI, LIT, PRC, EPUB, CHM, ODT, HTML, CBR, CBZ, RTF, TXT, PDF and LRS. %prep -%setup -q -n %{name}-%{version} - -# don't check for new upstream version (that's what packagers do) -%patch1 -p1 -b .no-update -# Hide individual launchers for ebook-edit, ebook-viewer and lrfviewer as they -# are all accessible in the main calibre GUI. -%patch3 -p1 -b .nodisplay +%autosetup -n %{name}-%{version} -p1 # dos2unix newline conversion sed -i 's/\r//' src/calibre/web/feeds/recipes/* @@ -335,6 +330,9 @@ ln -s %{_jsdir}/mathjax %{_datadir}/%{name}/viewer/ %{_datadir}/appdata/calibre*.appdata.xml %changelog +* Tue May 16 2017 Zbigniew Jędrzejewski-Szmek - 2.83.0-2 +- Add patch to build under qt 5.9.0 + * Fri May 12 2017 Rex Dieter - 2.83.0-2 - rebuild (qt5)