[arch-commits] Commit in calibre/trunk (PKGBUILD calibre-qt5.15.patch)

[Eli Schwartz]

    Date: Sunday, June 7, 2020 @ 16:47:11
  Author: eschwartz
Revision: 640078

upgpkg: calibre 4.18.0-1: upstream release

Modified:
  calibre/trunk/PKGBUILD
Deleted:
  calibre/trunk/calibre-qt5.15.patch

----------------------+
 PKGBUILD             |   20 +++++++-------------
 calibre-qt5.15.patch |   40 ----------------------------------------
 2 files changed, 7 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-07 16:47:07 UTC (rev 640077)
+++ PKGBUILD	2020-06-07 16:47:11 UTC (rev 640078)
@@ -8,8 +8,8 @@
 
 pkgbase=calibre
 pkgname=('calibre' 'calibre-common' 'calibre-python3')
-pkgver=4.17.0
-pkgrel=2
+pkgver=4.18.0
+pkgrel=1
 pkgdesc="Ebook management application"
 arch=('x86_64')
 url="https://calibre-ebook.com/"
@@ -28,26 +28,20 @@
 source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
         "https://calibre-ebook.com/signatures/${pkgbase}-${pkgver}.tar.xz.sig"
         "0001-De-vendor-pychm.patch"
-        "calibre-alternatives.sh"
-        "calibre-qt5.15.patch")
-sha256sums=('aada09db377ef7f36253afd9458314f6c6c015f92b8630be00e11585b0e8ffe1'
+        "calibre-alternatives.sh")
+sha256sums=('3c2f53d01d373a47496fb856fdee30c83b953f347170b901d804caa9b7633771'
             'SKIP'
             'f7b829aea1d33818808cbeeb9a295e18e49edf619a5bc89b8315c88f56ce4d25'
-            '940cc7081d0a64ba363bb0e1a1d8e0563c676458f90db845f2fbdd4195c075b3'
-            '178cf6989e1350eb698831d0c7fb65daf389bc0a0edbda70cb2d49973bbad84c')
-b2sums=('e1e9fbbb93cc14af0790e400d79b433c774f17bb06d99161e27769217ab7eed5c2660ab8a3e09109bade91684a8f5a8b52795667833ddf454343e530109eea63'
+            '940cc7081d0a64ba363bb0e1a1d8e0563c676458f90db845f2fbdd4195c075b3')
+b2sums=('247fc226fade064306309933be008e7636bacfdcfb1c96ae900fce5cc4474e26853b3a9dd932fd758543e31af95374f089d2e7a15c3d9ca7655eabd077727e2c'
         'SKIP'
         'c35181c70084813772c4d593311b48b3e3bcc3b4e9e8ee58112b9beab2bbc0de1ee22aafc3d06cfd812f87a2e91292f7b7f1dc5f522c55440f415b6b265d5671'
-        '543df218dfd2d4152a941ab57118d69bf4c6927e8020ee53c9a8b38efe9c89f032dc6385207e134cc9f69bfdc9cbcf63cd92fa6ea1647cbd534c5a511a5d1e91'
-        'cd291d911d6305bf23f0f4aa16a7bafac28fb2efedb765bc996b4c6882b44f23c3813b5796cca619df79a2bac69b972a07b5c93b572bfdedf95d5675b79e6113')
+        '543df218dfd2d4152a941ab57118d69bf4c6927e8020ee53c9a8b38efe9c89f032dc6385207e134cc9f69bfdc9cbcf63cd92fa6ea1647cbd534c5a511a5d1e91')
 validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New longer key) <kovid at kovidgoyal.net>
 
 prepare(){
     cd "${pkgbase}-${pkgver}"
 
-    # Update fontconfig database for Qt 5.15
-    patch -p1 -i ../calibre-qt5.15.patch
-
     # Desktop integration (e.g. enforce arch defaults)
     # Use uppercase naming scheme, don't delete config files under fakeroot.
     sed -e "/import config_dir/,/os.rmdir(config_dir)/d" \

Deleted: calibre-qt5.15.patch
===================================================================
--- calibre-qt5.15.patch	2020-06-07 16:47:07 UTC (rev 640077)
+++ calibre-qt5.15.patch	2020-06-07 16:47:11 UTC (rev 640078)
@@ -1,40 +0,0 @@
-From a67fd739c266f1e61f43c3d7f18a0f3c64d636b6 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas at archlinux.org>
-Date: Tue, 26 May 2020 19:38:37 +0200
-Subject: [PATCH] Add missing endif
-
----
- src/calibre/headless/fontconfig_database.cpp | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp
-index d867f02948..96a6365ba2 100644
---- a/src/calibre/headless/fontconfig_database.cpp
-+++ b/src/calibre/headless/fontconfig_database.cpp
-@@ -295,7 +295,26 @@ static const char specialLanguages[][6] = {
-     "", // MasaramGondi
-     "", // Nushu
-     "", // Soyombo
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-+    "", // ZanabazarSquare
-+    "", // Dogra
-+    "", // GunjalaGondi
-+    "", // HanifiRohingya
-+    "", // Makasar
-+    "", // Medefaidrin
-+    "", // OldSogdian
-+    "", // Sogdian
-+    "", // Elymaic
-+    "", // Nandinagari
-+    "", // NyiakengPuachueHmong
-+    "", // Wancho
-+    "", // Chorasmian
-+    "", // DivesAkuru
-+    "", // KhitanSmallScript
-+    "" // Yezidi
-+#else
-     "" // ZanabazarSquare
-+#endif // Qt >= 5.15
- #else
-     ""  // SignWriting
- #endif // Qt >= 5.11