[arch-commits] Commit in calibre/trunk (PKGBUILD calibre-qt-5.8.patch)
Antonio Rojas
arojas at archlinux.org
Mon Jan 23 22:28:22 UTC 2017
Date: Monday, January 23, 2017 @ 22:28:22
Author: arojas
Revision: 208674
Fix build with Qt 5.8 (WIP)
Added:
calibre/trunk/calibre-qt-5.8.patch
Modified:
calibre/trunk/PKGBUILD
----------------------+
PKGBUILD | 9 +++++-
calibre-qt-5.8.patch | 65 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-23 22:21:39 UTC (rev 208673)
+++ PKGBUILD 2017-01-23 22:28:22 UTC (rev 208674)
@@ -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"
+ calibre-qt-5.8.patch)
sha256sums=('575d1f197d5df95258ac6de3b2b7f6f8706e38d0044dbb4ae791653d229b69c0'
- 'SKIP')
+ 'SKIP'
+ 'a6538289b95156367a1bdb4523b58b73a56744792812ebcbdaeac26812d8f564')
validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
prepare(){
@@ -49,6 +51,9 @@
-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
+
+ # Fix build with Qt 5.8
+ patch -p1 -i ../calibre-qt-5.8.patch
}
build() {
Added: calibre-qt-5.8.patch
===================================================================
--- calibre-qt-5.8.patch (rev 0)
+++ calibre-qt-5.8.patch 2017-01-23 22:28:22 UTC (rev 208674)
@@ -0,0 +1,65 @@
+diff -ru calibre-2.77.0.orig/setup/build.py calibre-2.77.0/setup/build.py
+--- calibre-2.77.0.orig/setup/build.py 2017-01-23 21:50:37.634574707 +0100
++++ calibre-2.77.0/setup/build.py 2017-01-23 22:33:51.460014344 +0100
+@@ -360,8 +360,7 @@
+ TARGET = headless
+ PLUGIN_TYPE = platforms
+ PLUGIN_CLASS_NAME = HeadlessIntegrationPlugin
+- load(qt_plugin)
+- QT += core-private gui-private platformsupport-private
++ QT += core-private gui-private fontdatabase_support_private service_support_private eventdispatcher_support_private
+ HEADERS = {headers}
+ SOURCES = {sources}
+ OTHER_FILES = {others}
+diff -ru calibre-2.77.0.orig/src/calibre/headless/fontconfig_database.cpp calibre-2.77.0/src/calibre/headless/fontconfig_database.cpp
+--- calibre-2.77.0.orig/src/calibre/headless/fontconfig_database.cpp 2017-01-13 04:38:35.000000000 +0100
++++ calibre-2.77.0/src/calibre/headless/fontconfig_database.cpp 2017-01-23 22:36:20.070646584 +0100
+@@ -41,7 +41,7 @@
+ #include <qpa/qplatformintegration.h>
+ #include <qpa/qplatformservices.h>
+
+-#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
++#include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
+ #include <QtGui/private/qfontengine_ft_p.h>
+ #include <QtGui/private/qguiapplication_p.h>
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+diff -ru calibre-2.77.0.orig/src/calibre/headless/fontconfig_database.h calibre-2.77.0/src/calibre/headless/fontconfig_database.h
+--- calibre-2.77.0.orig/src/calibre/headless/fontconfig_database.h 2017-01-13 04:38:35.000000000 +0100
++++ calibre-2.77.0/src/calibre/headless/fontconfig_database.h 2017-01-23 21:49:23.451289356 +0100
+@@ -7,7 +7,7 @@
+ #pragma once
+
+ #include <qpa/qplatformfontdatabase.h>
+-#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
++#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
+
+ QT_BEGIN_NAMESPACE
+
+diff -ru calibre-2.77.0.orig/src/calibre/headless/headless_integration.cpp calibre-2.77.0/src/calibre/headless/headless_integration.cpp
+--- calibre-2.77.0.orig/src/calibre/headless/headless_integration.cpp 2017-01-13 04:38:35.000000000 +0100
++++ calibre-2.77.0/src/calibre/headless/headless_integration.cpp 2017-01-23 22:30:16.295767949 +0100
+@@ -4,10 +4,10 @@
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 1))
+ #include "fontconfig_database.h"
+ #else
+-#include <QtPlatformSupport/private/qfontconfigdatabase_p.h>
++#include <QtFontDatabaseSupport/private/qfontconfigdatabase_p.h>
+ #endif
+ #ifndef Q_OS_WIN
+-#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
++#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
+ #else
+ #include <QtCore/private/qeventdispatcher_win_p.h>
+ #endif
+diff -ru calibre-2.77.0.orig/src/calibre/headless/headless_integration.h calibre-2.77.0/src/calibre/headless/headless_integration.h
+--- calibre-2.77.0.orig/src/calibre/headless/headless_integration.h 2017-01-13 04:38:35.000000000 +0100
++++ calibre-2.77.0/src/calibre/headless/headless_integration.h 2017-01-23 21:48:24.091368423 +0100
+@@ -3,7 +3,7 @@
+ #include <qpa/qplatformintegration.h>
+ #include <qpa/qplatformscreen.h>
+ #include <qpa/qplatformservices.h>
+-#include <QtPlatformSupport/private/qgenericunixservices_p.h>
++#include <QtServiceSupport/private/qgenericunixservices_p.h>
+ #include <QScopedPointer>
+
+ QT_BEGIN_NAMESPACE
More information about the arch-commits
mailing list