[arch-commits] Commit in calibre/trunk (2 files)

[Jelle van der Waa]

    Date: Wednesday, May 31, 2017 @ 18:52:35
  Author: jelle
Revision: 231627

upgpkg: calibre 2.85.1-2

Qt 5.9 rebuild

Added:
  calibre/trunk/0001-Compatibility-with-qt5-5.9.0.patch
Modified:
  calibre/trunk/PKGBUILD

-----------------------------------------+
 0001-Compatibility-with-qt5-5.9.0.patch |   88 ++++++++++++++++++++++++++++++
 PKGBUILD                                |   10 ++-
 2 files changed, 95 insertions(+), 3 deletions(-)

Added: 0001-Compatibility-with-qt5-5.9.0.patch
===================================================================
--- 0001-Compatibility-with-qt5-5.9.0.patch	                        (rev 0)
+++ 0001-Compatibility-with-qt5-5.9.0.patch	2017-05-31 18:52:35 UTC (rev 231627)
@@ -0,0 +1,88 @@
+From 82bd2e1a51df0650cb40894c5dc2b958f601a91d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at 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))
+-- 
+2.13.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-31 18:51:27 UTC (rev 231626)
+++ PKGBUILD	2017-05-31 18:52:35 UTC (rev 231627)
@@ -9,7 +9,7 @@
 
 pkgname=calibre
 pkgver=2.85.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64')
 url="https://calibre-ebook.com/"
@@ -27,9 +27,11 @@
             'poppler: required for converting pdf to html'
 )
 source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
-        "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig")
+        "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig"
+        "0001-Compatibility-with-qt5-5.9.0.patch")
 sha256sums=('8c8db280c51b26284bff1c066fb503ecef9e1f15f7e2e7b4f705c817ee041abd'
-            'SKIP')
+            'SKIP'
+            '65f101c0264748a93909aa767eea198e58cc8522129880cfa3d46bd7f26ffb0f')
 validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
 
 prepare(){
@@ -49,6 +51,8 @@
       -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \
       -e "s/^Name=calibre/Name=Calibre/g" \
       -i  src/calibre/linux.py
+
+  patch -Np1 -i $srcdir/0001-Compatibility-with-qt5-5.9.0.patch
 }
 
 build() {