diff options
Diffstat (limited to 'libre/calibre')
| -rw-r--r-- | libre/calibre/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/calibre/calibre-qt-5.8.patch | 65 |
2 files changed, 74 insertions, 4 deletions
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index 201500e5f..2c84e4ba4 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 208356 2017-01-22 03:42:44Z bgyorgy $ +# $Id: PKGBUILD 208674 2017-01-23 22:28:22Z arojas $ # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl> # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> @@ -11,7 +11,7 @@ pkgname=calibre pkgver=2.77.0 -pkgrel=2.parabola1 +pkgrel=3.parabola1 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" arch=('i686' 'x86_64' 'armv7h') url="https://calibre-ebook.com/" @@ -33,11 +33,13 @@ conflicts=($pkgname-libre) mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz" "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig") source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.xz" - 'libre.patch') + 'libre.patch' + 'calibre-qt-5.8.patch') mksha256sums=('575d1f197d5df95258ac6de3b2b7f6f8706e38d0044dbb4ae791653d229b69c0' 'SKIP') sha256sums=('5e59e43603477983c1a272bf71f20306b2640063ab30459a4de435c99abdae91' - '566a190f7675584acab4ceb84d504d939760a5d8644b79b4c76e68fb24515caa') + '566a190f7675584acab4ceb84d504d939760a5d8644b79b4c76e68fb24515caa' + 'a6538289b95156367a1bdb4523b58b73a56744792812ebcbdaeac26812d8f564') validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') mksource(){ @@ -70,6 +72,9 @@ prepare(){ -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() { diff --git a/libre/calibre/calibre-qt-5.8.patch b/libre/calibre/calibre-qt-5.8.patch new file mode 100644 index 000000000..76925d16c --- /dev/null +++ b/libre/calibre/calibre-qt-5.8.patch @@ -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 |