[arch-commits] Commit in calibre/trunk (PKGBUILD calibre-qt-5.8.patch)

Antonio Rojas arojas at archlinux.org
Fri Feb 3 18:31:10 UTC 2017


    Date: Friday, February 3, 2017 @ 18:31:09
  Author: arojas
Revision: 209781

podofo 0.9.5 rebuild

Modified:
  calibre/trunk/PKGBUILD
Deleted:
  calibre/trunk/calibre-qt-5.8.patch

----------------------+
 PKGBUILD             |    2 -
 calibre-qt-5.8.patch |   67 -------------------------------------------------
 2 files changed, 1 insertion(+), 68 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-03 18:25:45 UTC (rev 209780)
+++ PKGBUILD	2017-02-03 18:31:09 UTC (rev 209781)
@@ -9,7 +9,7 @@
 
 pkgname=calibre
 pkgver=2.78.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64')
 url="https://calibre-ebook.com/"

Deleted: calibre-qt-5.8.patch
===================================================================
--- calibre-qt-5.8.patch	2017-02-03 18:25:45 UTC (rev 209780)
+++ calibre-qt-5.8.patch	2017-02-03 18:31:09 UTC (rev 209781)
@@ -1,67 +0,0 @@
-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 -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>
- 
--#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 -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
- 
- #include <qpa/qplatformfontdatabase.h>
--#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
-+#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
- 
- QT_BEGIN_NAMESPACE
- 
-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"
- #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 -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>
- #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