cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update fontconfig database for Qt 5.15

Browse Source 
db7007a25f
This commit is contained in:
rsadowski 2021-01-19 06:36:19 +00:00
parent 25fa87411f
commit dd719e40f5
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
textproc/calibre/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.79 2021/01/16 21:21:04 sthen Exp $
# $OpenBSD: Makefile,v 1.80 2021/01/19 06:36:19 rsadowski Exp $
COMMENT = ebook management application
@ -7,7 +7,7 @@ V = 2.85.1
DISTNAME = calibre-$V
CATEGORIES = textproc
EXTRACT_SUFX = .tar.xz
REVISION = 14
REVISION = 15
HOMEPAGE = https://calibre-ebook.com/

54
textproc/calibre/patches/patch-src_calibre_headless_fontconfig_database_cpp
View File

@ -1,37 +1,24 @@
$OpenBSD: patch-src_calibre_headless_fontconfig_database_cpp,v 1.3 2020/02/28 19:25:27 rsadowski Exp $
Subject: [PATCH] Compatibility with qt5-5.9.0
Commit-Id: 82bd2e1a51df0650cb40894c5dc2b958f601a91d
$OpenBSD: patch-src_calibre_headless_fontconfig_database_cpp,v 1.4 2021/01/19 06:36:19 rsadowski Exp $
Qt 5.11 compatibility
Commit-Id: 68bbec179abc980ebcb3f13854d2e4fd46f489
Update fontconfig database for Qt 5.15
https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d
Index: src/calibre/headless/fontconfig_database.cpp
--- src/calibre/headless/fontconfig_database.cpp.orig
+++ 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>
@@ -52,7 +52,11 @@
#else
-#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
+# include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
#endif
-#include <QtGui/private/qfontengine_ft_p.h>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
+# include <QtFontDatabaseSupport/private/qfontengine_ft_p.h>
+#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h>
+#else
+# include <QtGui/private/qfontengine_ft_p.h>
#include <QtGui/private/qfontengine_ft_p.h>
+#endif
#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>
@@ -280,7 +284,21 @@ static const char specialLanguages[][6] = {
#include <QtGui/private/qhighdpiscaling_p.h>
@@ -280,7 +284,40 @@ static const char specialLanguages[][6] = {
"", // Hatran
"", // Multani
"", // OldHungarian
@ -46,14 +33,33 @@ Index: src/calibre/headless/fontconfig_database.cpp
+ "", // MasaramGondi
+ "", // Nushu
+ "", // Soyombo
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+ "", // ZanabazarSquare
+ "", // Dogra
+ "", // GunjalaGondi
+ "", // HanifiRohingya
+ "", // Makasar
+ "", // Medefaidrin
+ "", // OldSogdian
+ "", // Sogdian
+ "", // Elymaic
+ "", // Nandinagari
+ "", // NyiakengPuachueHmong
+ "", // Wancho
+ "", // Chorasmian
+ "", // DivesAkuru
+ "", // KhitanSmallScript
+ "" // Yezidi
+#else
+ "" // ZanabazarSquare
+#endif // Qt >= 5.15
+#else
"" // SignWriting
+#endif // Qt >= 5.11
#else
"hoc" // WarangCiti
#endif // Qt >= 5.6.0
@@ -763,7 +781,7 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFo
@@ -763,7 +800,7 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFo
QFontEngine *QFontconfigDatabase::fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference)
{
@ -62,7 +68,7 @@ Index: src/calibre/headless/fontconfig_database.cpp
if (engine == 0)
return 0;
@@ -915,7 +933,7 @@ QStringList QFontconfigDatabase::addApplicationFont(co
@@ -915,7 +952,7 @@ QStringList QFontconfigDatabase::addApplicationFont(co
QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const
{