[arch-commits] Commit in calibre/trunk (2 files)

[Eli Schwartz]

    Date: Friday, November 13, 2020 @ 04:56:34
  Author: eschwartz
Revision: 753824

upgpkg: calibre 5.5.0-1: upstream release

Added:
  calibre/trunk/0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch
Modified:
  calibre/trunk/PKGBUILD

--------------------------------------------------------------+
 0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch |   50 ++++++++++
 PKGBUILD                                                     |   20 ++--
 2 files changed, 63 insertions(+), 7 deletions(-)

Added: 0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch
===================================================================
--- 0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch	                        (rev 0)
+++ 0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch	2020-11-13 04:56:34 UTC (rev 753824)
@@ -0,0 +1,50 @@
+From 7f5a11dccf6b6272e38ac91e760a1eaf49423cae Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at archlinux.org>
+Date: Thu, 12 Nov 2020 22:47:03 -0500
+Subject: [PATCH] Do not build WIP espeak plugin before it is ready.
+
+Introduced in https://github.com/kovidgoyal/calibre/commit/c027aaff750ff73fa6affe909af911e8918b8316
+but as of the time of writing (November 12) it contains no public
+functions at all. Eventually, it will be runtime-optional in the viewer.
+
+Until this is a bit more advanced, let's just delete it from being
+compiled in order to avoid the build-time dependency. Watch this space
+for more news...
+---
+ setup/extensions.json    | 6 ------
+ src/calibre/constants.py | 2 +-
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/setup/extensions.json b/setup/extensions.json
+index 38421c258f..2c9d5187de 100644
+--- a/setup/extensions.json
++++ b/setup/extensions.json
+@@ -179,12 +179,6 @@
+         "sources": "calibre/utils/cocoa.m calibre/utils/cocoa_wrapper.c",
+         "ldflags": "-framework Cocoa"
+     },
+-    {
+-        "name": "espeak",
+-        "only": "linux haiku",
+-        "sources": "calibre/utils/tts/espeak.cpp",
+-        "libraries": "espeak-ng"
+-    },
+     {
+         "name": "libusb",
+         "only": "macos linux haiku",
+diff --git a/src/calibre/constants.py b/src/calibre/constants.py
+index 36a4478a4d..3cc4682c24 100644
+--- a/src/calibre/constants.py
++++ b/src/calibre/constants.py
+@@ -253,7 +253,7 @@ def __init__(self):
+         elif ismacos:
+             extra = ('usbobserver', 'cocoa', 'libusb', 'libmtp')
+         elif isfreebsd or ishaiku or islinux:
+-            extra = ('libusb', 'libmtp', 'espeak')
++            extra = ('libusb', 'libmtp')
+         else:
+             extra = ()
+         self.calibre_extensions = frozenset(extensions + extra)
+-- 
+2.29.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-13 02:44:22 UTC (rev 753823)
+++ PKGBUILD	2020-11-13 04:56:34 UTC (rev 753824)
@@ -8,8 +8,8 @@
 
 pkgbase=calibre
 pkgname=calibre
-pkgver=5.4.2
-pkgrel=2
+pkgver=5.5.0
+pkgrel=1
 pkgdesc="Ebook management application"
 arch=('x86_64')
 url="https://calibre-ebook.com/"
@@ -27,16 +27,22 @@
 conflicts=('calibre-common' 'calibre-python3')
 replaces=('calibre-common' 'calibre-python3')
 source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
-        "https://calibre-ebook.com/signatures/${pkgbase}-${pkgver}.tar.xz.sig")
-sha256sums=('e6bc37cbcfecf06d5d6d8cab132e6e4896a1bbade4e5385f26975111f1c0f517'
-            'SKIP')
-b2sums=('00373cdc9af56a8dacc70096d1e7925f8d3da4eaf37727ad58c211d18e6c593a21c3ad0f283048ae28b1bb83889c8c801baaa5e240eb65d972ebc78a79922ec1'
-        'SKIP')
+        "https://calibre-ebook.com/signatures/${pkgbase}-${pkgver}.tar.xz.sig"
+        "0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.patch")
+sha256sums=('01cebfd1ee7b05cd7393991818ce829d8bb080db5d12fe86111d242864660224'
+            'SKIP'
+            '8ed4a9578d3dbbc4ada4dd08f318c861012f45260cdd68caadbeb29b12d58a05')
+b2sums=('af710b7554ce82e52c742789831fd4afee53ddd0ce3a5e36970fee6e1f6a0cf91aa5b03bff53ec0f1ca66c6bc73ace3c770f13c44468a352541ae29a2043335b'
+        'SKIP'
+        '25ed435277cb3e2ad843295df5cf4469e4ddb96c880e4d0c3003d59cc71719e1a3062220d612766ced6e42d30f800603375baef43106e0b447acca8f5f58e3f5')
 validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New longer key) <kovid at kovidgoyal.net>
 
 prepare(){
     cd "${pkgbase}-${pkgver}"
 
+    # wait until this is functional before building it
+    patch -p1 -i ../0001-Do-not-build-WIP-espeak-plugin-before-it-is-ready.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" \