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

[Eli Schwartz]

    Date: Friday, July 3, 2020 @ 17:24:49
  Author: eschwartz
Revision: 657651

upgpkg: calibre 4.20.0-1: upstream release

upstream ported to mathjax 3.x, adapt
make the install script handle removing the currently active alternative -- FS#67183

Modified:
  calibre/trunk/PKGBUILD
  calibre/trunk/calibre-common.install
  calibre/trunk/calibre.install

------------------------+
 PKGBUILD               |   10 +++++-----
 calibre-common.install |    6 ++++--
 calibre.install        |    7 +++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-03 17:21:39 UTC (rev 657650)
+++ PKGBUILD	2020-07-03 17:24:49 UTC (rev 657651)
@@ -8,7 +8,7 @@
 
 pkgbase=calibre
 pkgname=('calibre' 'calibre-common' 'calibre-python3')
-pkgver=4.19.0
+pkgver=4.20.0
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('x86_64')
@@ -21,7 +21,7 @@
 _py2_deps=("${_py_deps[@]}" 'ipaddress')
 _py3_deps=("${_py_deps[@]}" 'zeroconf')
 depends=('hunspell' 'hyphen' 'icu' 'jxrlib' 'libmtp' 'libusbx'
-         'libwmf' 'mathjax2' 'mtdev' 'optipng' 'podofo' 'qt5-svg' 'udisks2')
+         'libwmf' 'mathjax' 'mtdev' 'optipng' 'podofo' 'qt5-svg' 'udisks2')
 makedepends=("${_py2_deps[@]/#/python2-}" "${_py3_deps[@]/#/python-}" 'qt5-x11extras'
              'rapydscript-ng' 'sip' 'xdg-utils')
 checkdepends=('xorg-server-xvfb')
@@ -29,11 +29,11 @@
         "https://calibre-ebook.com/signatures/${pkgbase}-${pkgver}.tar.xz.sig"
         "0001-De-vendor-pychm.patch"
         "calibre-alternatives.sh")
-sha256sums=('9dac6cad3b70a91316de99e187ef5ac7cbc273bb926aa8374235657e7531f2ce'
+sha256sums=('afb4ee02fab53e362e02b4bc67e97d22d05b414ce933c30b2bed8c90cfec3dee'
             'SKIP'
             'f7b829aea1d33818808cbeeb9a295e18e49edf619a5bc89b8315c88f56ce4d25'
             '940cc7081d0a64ba363bb0e1a1d8e0563c676458f90db845f2fbdd4195c075b3')
-b2sums=('1cf3a4727ac7a2e7fe4d926acad7e6324b0673728db862209d98280f4fe9457eb33d734e47ac4882accebad2a6ffd12aa0add6bdcfe64cc4baa8a39dc2b4b94f'
+b2sums=('28ee9539eda96809004f4c276c8dceba119122379867f4b9235ad52a3ec68337330c4cbc2e715462f27ea0c3a0c8470609a50273db49a69f69a60e7fbcef11a5'
         'SKIP'
         'c35181c70084813772c4d593311b48b3e3bcc3b4e9e8ee58112b9beab2bbc0de1ee22aafc3d06cfd812f87a2e91292f7b7f1dc5f522c55440f415b6b265d5671'
         '543df218dfd2d4152a941ab57118d69bf4c6927e8020ee53c9a8b38efe9c89f032dc6385207e134cc9f69bfdc9cbcf63cd92fa6ea1647cbd534c5a511a5d1e91')
@@ -73,7 +73,7 @@
 
     LANG='en_US.UTF-8' python2 setup.py build
     LANG='en_US.UTF-8' python2 setup.py gui
-    LANG='en_US.UTF-8' python2 setup.py mathjax --path-to-mathjax /usr/share/mathjax2 --system-mathjax
+    LANG='en_US.UTF-8' python2 setup.py mathjax --path-to-mathjax /usr/share/mathjax --system-mathjax
     LANG='en_US.UTF-8' python2 setup.py rapydscript
 
     LANG='en_US.UTF-8' CALIBRE_PY3_PORT=1 python3 setup.py build

Modified: calibre-common.install
===================================================================
--- calibre-common.install	2020-07-03 17:21:39 UTC (rev 657650)
+++ calibre-common.install	2020-07-03 17:24:49 UTC (rev 657651)
@@ -4,6 +4,8 @@
 }
 
 post_remove() {
-    rm -f /usr/lib/calibre/bin
-    rmdir /usr/lib/calibre/
+    if [ -e /usr/lib/calibre/bin ]; then
+        rm /usr/lib/calibre/bin
+        rmdir /usr/lib/calibre/
+    fi
 }

Modified: calibre.install
===================================================================
--- calibre.install	2020-07-03 17:21:39 UTC (rev 657650)
+++ calibre.install	2020-07-03 17:24:49 UTC (rev 657651)
@@ -5,3 +5,10 @@
 post_upgrade() {
     calibre-alternatives set
 }
+
+post_remove() {
+    if [ ! -e /usr/lib/calibre/bin ]; then
+        rm -f /usr/lib/calibre/bin
+        calibre-alternatives set 2>/dev/null || true
+    fi
+}