Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39d089524ff3b8cc0deb568942a06ce0dd0344fe

commit 39d089524ff3b8cc0deb568942a06ce0dd0344fe
Author: crazy <[email protected]>
Date:   Mon Jun 26 11:34:59 2017 +0200

calibre-3.1.1-1-x86_64
* Version bump

diff --git a/source/xapps-extra/calibre/FrugalBuild 
b/source/xapps-extra/calibre/FrugalBuild
index e04c4d4..7e00ba1 100644
--- a/source/xapps-extra/calibre/FrugalBuild
+++ b/source/xapps-extra/calibre/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Melko <[email protected]>

pkgname=calibre
-pkgver=2.85.1
-pkgrel=2
+pkgver=3.1.1
+pkgrel=1
pkgdesc="Ebook management application"
#url="http://calibre.kovidgoyal.net/";
depends=('python>=2.7' 'imagemagick>=6.8.9' 'xz>=5.0.3' 'libtool' 
'libuuid>=2.28.2-2' 'poppler-glib>=0.53.0' \
@@ -24,16 +24,15 @@ 
source=($url/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz \
$pkgname-viewer.png \
$pkgname-lrf.png \
$pkgname-gui.png \
-       $pkgname.xml qt5.9.0.patch)
-sha1sums=('31d880c9da01ad16a2d6f0502b41b77ff32c13a9' \
+       $pkgname.xml)
+sha1sums=('1737870f2bdb5861c2e448f6bc6a994ea5b33336' \
'1323d95691289b41e25fd191dc1d18f1c58e02d2' \
'e7eb837ad8733ecb813b5f897484324cd7160426' \
'2a675529ef6f034eb20bc48620802b60796d689d' \
'816cabb72ffb9a94e28910a1a48507a3064f0b7e' \
'55c454cf6aac258ff7663ead89883e3a721c8078' \
'9e5b649495e42e1778a9a433eac630173a0069e2' \
-          '03b4412f2acf256fd4478f2b94f024617c488e02' \
-          '92f6de94be9dd9da8b78ae3460cc54a8af49b501')
+          '03b4412f2acf256fd4478f2b94f024617c488e02')
build() {
Fcd
CFLAGS+=" -fPIC"
diff --git a/source/xapps-extra/calibre/qt5.9.0.patch 
b/source/xapps-extra/calibre/qt5.9.0.patch
deleted file mode 100644
index 0215ea9..0000000
--- a/source/xapps-extra/calibre/qt5.9.0.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 82bd2e1a51df0650cb40894c5dc2b958f601a91d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]>
-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
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to