Date: Wednesday, January 25, 2017 @ 10:04:15
Author: jelle
Revision: 209020
upgpkg: calibre 2.77.0-4
.
Modified:
calibre/trunk/PKGBUILD
calibre/trunk/calibre-qt-5.8.patch
----------------------+
PKGBUILD | 4 ++--
calibre-qt-5.8.patch | 34 ++++++++++++++++++----------------
2 files changed, 20 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-25 10:00:29 UTC (rev 209019)
+++ PKGBUILD 2017-01-25 10:04:15 UTC (rev 209020)
@@ -9,7 +9,7 @@
pkgname=calibre
pkgver=2.77.0
-pkgrel=3
+pkgrel=4
pkgdesc="Ebook management application"
arch=('i686' 'x86_64')
url="https://calibre-ebook.com/";
@@ -31,7 +31,7 @@
calibre-qt-5.8.patch)
sha256sums=('575d1f197d5df95258ac6de3b2b7f6f8706e38d0044dbb4ae791653d229b69c0'
'SKIP'
- 'a6538289b95156367a1bdb4523b58b73a56744792812ebcbdaeac26812d8f564')
+ '2292db146f4ef020281cd40b31fabaeb377a2bcda49751b6746b5de153ae0d92')
validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
prepare(){
Modified: calibre-qt-5.8.patch
===================================================================
--- calibre-qt-5.8.patch 2017-01-25 10:00:29 UTC (rev 209019)
+++ calibre-qt-5.8.patch 2017-01-25 10:04:15 UTC (rev 209020)
@@ -1,19 +1,21 @@
-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 @@
+diff -aur calibre-2.77.0/setup/build.py calibre-2.77.0.new/setup/build.py
+--- calibre-2.77.0/setup/build.py 2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/setup/build.py 2017-01-25 09:49:28.128533094 +0000
+@@ -360,8 +360,9 @@
TARGET = headless
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = HeadlessIntegrationPlugin
- load(qt_plugin)
- QT += core-private gui-private platformsupport-private
++ TEMPLATE = lib
++ CONFIG += plugin
+ 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
+diff -aur calibre-2.77.0/src/calibre/headless/fontconfig_database.cpp
calibre-2.77.0.new/src/calibre/headless/fontconfig_database.cpp
+--- calibre-2.77.0/src/calibre/headless/fontconfig_database.cpp
2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/fontconfig_database.cpp
2017-01-24 21:12:25.995347259 +0000
@@ -41,7 +41,7 @@
#include <qpa/qplatformintegration.h>
#include <qpa/qplatformservices.h>
@@ -23,9 +25,9 @@
#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
+diff -aur calibre-2.77.0/src/calibre/headless/fontconfig_database.h
calibre-2.77.0.new/src/calibre/headless/fontconfig_database.h
+--- calibre-2.77.0/src/calibre/headless/fontconfig_database.h 2017-01-13
03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/fontconfig_database.h
2017-01-24 21:12:25.998680585 +0000
@@ -7,7 +7,7 @@
#pragma once
@@ -35,9 +37,9 @@
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
+diff -aur calibre-2.77.0/src/calibre/headless/headless_integration.cpp
calibre-2.77.0.new/src/calibre/headless/headless_integration.cpp
+--- calibre-2.77.0/src/calibre/headless/headless_integration.cpp
2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/headless_integration.cpp
2017-01-24 21:12:25.998680585 +0000
@@ -4,10 +4,10 @@
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 1))
#include "fontconfig_database.h"
@@ -51,9 +53,9 @@
#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
+diff -aur calibre-2.77.0/src/calibre/headless/headless_integration.h
calibre-2.77.0.new/src/calibre/headless/headless_integration.h
+--- calibre-2.77.0/src/calibre/headless/headless_integration.h 2017-01-13
03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/headless_integration.h
2017-01-24 21:12:25.998680585 +0000
@@ -3,7 +3,7 @@
#include <qpa/qplatformintegration.h>
#include <qpa/qplatformscreen.h>
