diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-06-23 12:33:20 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-06-23 12:33:20 +0000 |
| commit | d8207b6bd82ae5bdb4f6c4d62c892e122cafc20a (patch) | |
| tree | 7dbb9053a11a089d7e5faec5b630a2600872abc4 /calibre2 | |
| parent | c1c60a602e1da963ecaa703bd4694b056be4b21b (diff) | |
| download | asb-d8207b6bd82ae5bdb4f6c4d62c892e122cafc20a.tar.gz asb-d8207b6bd82ae5bdb4f6c4d62c892e122cafc20a.tar.xz | |
Initial revision
Diffstat (limited to 'calibre2')
| -rw-r--r-- | calibre2/build/patches2/calibre_qt59.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/calibre2/build/patches2/calibre_qt59.patch b/calibre2/build/patches2/calibre_qt59.patch new file mode 100644 index 00000000..882a05cb --- /dev/null +++ b/calibre2/build/patches2/calibre_qt59.patch @@ -0,0 +1,88 @@ +Taken from https://github.com/kovidgoyal/calibre/commit/82bd2e1a51df0650cb40894c5dc2b958f601a91d.patch + +From 82bd2e1a51df0650cb40894c5dc2b958f601a91d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +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 <qpa/qplatformservices.h> + + #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) +-#include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h> ++# include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h> + #else +-#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h> ++# include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h> ++#endif ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) ++# include <QtFontDatabaseSupport/private/qfontengine_ft_p.h> ++#else ++# include <QtGui/private/qfontengine_ft_p.h> + #endif +-#include <QtGui/private/qfontengine_ft_p.h> + #include <QtGui/private/qguiapplication_p.h> + #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) +-#include <QtGui/private/qhighdpiscaling_p.h> ++# include <QtGui/private/qhighdpiscaling_p.h> + #endif + + #include <QtGui/qguiapplication.h> +@@ -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<QFontEngineFT*>(QBasicFontDatabase::fontEngine(fontData, pixelSize, hintingPreference)); ++ QFontEngineFT *engine = static_cast<QFontEngineFT*>(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 <qpa/qplatformfontdatabase.h> +-#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) +-#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h> ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) ++# include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h> ++#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) ++# include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h> ++# define QFreeTypeFontDatabase QBasicFontDatabase + #else +-#include <QtPlatformSupport/private/qbasicfontdatabase_p.h> ++# include <QtPlatformSupport/private/qbasicfontdatabase_p.h> ++# 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)) + |