libre/calibre: updated to 3.13.0 and brought back closer to arch PKGBUILD

1 files changed, 45 insertions, 57 deletions

diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index e56791a53..79b2ccf98 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
@@ -10,55 +11,50 @@
 # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 
 pkgname=calibre
-_commit='72011a66bf4f380a8d36c6fd9c3f6069e767539b'
-pkgver=3.12.0
-pkgrel=2.parabola1
-_mathjax_ver=2.6.1
+pkgver=3.13.0
+pkgrel=1.parabola1
+arch=(x86_64 i686 armv7h)
+
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
-arch=('x86_64' 'i686' 'armv7h')
 url="https://calibre-ebook.com/"
-license=('GPL3')
-depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-dukpy'
-         'python2-mechanize' 'podofo' 'libwmf'
-         'chmlib' 'python2-lxml' 'libusbx' 'python2-html5-parser'
-         'python2-pillow' 'shared-mime-info' 'python2-dnspython' 'python2-msgpack'
-         'python2-pyqt5' 'python2-psutil' 'libmtp' 'python2-dbus'
-         'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
-         'qt5-svg' 'python2-regex' 'python2-pygments' 'mtdev'
-         'desktop-file-utils' 'gtk-update-icon-cache' 'optipng' 'udisks2')
-# we don't want it to break whenever Arch pushes a new icu soname, nor
-# is it desirable to have it block every minor-version upgrade when
-# it's actually linked against no minor version in particular
-depends+=('icu>=60' 'icu<61')
-makedepends=('qt5-x11extras' 'xdg-utils')
+license=(GPL3)
+
+depends=(python2-six python2-dateutil python2-cssutils python2-dukpy
+         python2-mechanize podofo libwmf
+         chmlib python2-lxml libusbx python2-html5-parser
+         python2-pillow shared-mime-info python2-dnspython python2-msgpack
+         python2-pyqt5 python2-psutil libmtp python2-dbus
+         python2-netifaces python2-cssselect python2-apsw qt5-webkit
+         qt5-svg python2-regex python2-pygments mtdev
+         desktop-file-utils gtk-update-icon-cache optipng udisks2)
+depends_x86_64=(icu=60.1)
+depends_i686=(icu=60.1)
+depends_armv7h=(icu=60.1)
+makedepends=(qt5-x11extras xdg-utils)
 optdepends=('ipython2: to use calibre-debug'
-            # TODO: I don't know the mapping from poppler versions to sonames
-            'poppler=0.61.1: required for converting pdf to html')
+            'poppler: required for converting pdf to html')
 replaces=($pkgname-libre)
 conflicts=($pkgname-libre)
-source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/libreforks/calibre/repository/archive.tar.gz?ref=$pkgver"
-        "$pkgname-$pkgver.tar.gz.sig::https://gitlab.com/libreforks/calibre/raw/signatures/$pkgname-$pkgver-${_commit}.tar.gz.sig"
-        "$pkgname-translations.zip::https://github.com/kovidgoyal/${pkgname}-translations/archive/master.zip"
-        "MathJax-${_mathjax_ver}.tar.gz::https://github.com/kovidgoyal/MathJax/archive/${_mathjax_ver}.tar.gz")
-sha256sums=('ee9a4993b290846dbcc242e5116a41111935dbb41355f102569d6871b4386562'
+
+# for updated libre.patch commit id see: https://gitlab.com/libreforks/calibre/tags
+_commit='ce5c919653b60aa8aea611b3ee19dba8'
+source=("https://download.calibre-ebook.com/$pkgver/calibre-$pkgver.tar.xz"
+        "https://calibre-ebook.com/signatures/$pkgname-$pkgver.tar.xz.sig"
+        "https://gitlab.com/libreforks/calibre/uploads/$_commit/libre.patch")
+sha256sums=('84c980e80b61d12797c91bfa0b6ba81926e2fef49ca3082c3e5ea80d161e13a9'
             'SKIP'
-            '6e3f10901910f87f79840aa1222b0dba088ed5393e05c80489cab6db5686c30b'
-            'c746945d87a4e93ee801a44b6209986bfc901cb2f6c505628a2ed5793422fbb8')
-validpgpkeys=('6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
-              '916FFBC76D2E641BA416BA53364F4E1483446AC5' # Jesús E.
-)
+            '87b55892d8ba896dd1b29949769001fa5521f85f664b675eb118bba66a42dc5e')
+validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
 
 prepare() {
-  # Parabola: rename from gitlab archive
-  mv "$pkgname-$pkgver-${_commit}" "$pkgname-$pkgver"
-
-  cd "${pkgname}-${pkgver}"
-
-  # Parabola: link translations to build dir
-  ln -sfT ../calibre-translations-master translations
+  cd "$pkgname-$pkgver"
 
   # Remove unneeded files
-  rm -rf resources/${pkgname}-portable.*
+  rm -rf resources/$pkgname-portable.*
+  rm -rf resources/images/mimetypes/{cbr,rar}.png
+
+  # fix freedom issues
+  patch -fNp1 -i "$srcdir/libre.patch" || true # unfortunately, patch chokes on files we deleted before...
 
   # Desktop integration (e.g. enforce arch defaults)
   sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
@@ -70,35 +66,27 @@ prepare() {
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
   LANG='en_US.UTF-8' python2 setup.py build
   LANG='en_US.UTF-8' python2 setup.py gui
-  # Parabola
-  LANG='en_US.UTF-8' python2 setup.py iso639
-  LANG='en_US.UTF-8' python2 setup.py iso3166
-  LANG='en_US.UTF-8' python2 setup.py translations
-  LANG='en_US.UTF-8' python2 setup.py resources
-  LANG='en_US.UTF-8' python2 setup.py man_pages
-  LANG='en_US.UTF-8' python2 setup.py recent_uas || true
-  LANG='en_US.UTF-8' python2 setup.py mathjax --path-to-mathjax="${srcdir}/MathJax-${_mathjax_ver}"
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
-  install -d "${pkgdir}/usr/share/zsh/site-functions" \
-             "${pkgdir}"/usr/share/{applications,desktop-directories,icons/hicolor}
+  install -d "$pkgdir/usr/share/zsh/site-functions" \
+             "$pkgdir"/usr/share/{applications,desktop-directories,icons/hicolor}
 
   install -Dm644 resources/calibre-mimetypes.xml \
-    "${pkgdir}/usr/share/mime/packages/calibre-mimetypes.xml"
+    "$pkgdir/usr/share/mime/packages/calibre-mimetypes.xml"
 
-  XDG_DATA_DIRS="${pkgdir}/usr/share" LANG='en_US.UTF-8' \
-    python2 setup.py install --staging-root="${pkgdir}/usr" --prefix=/usr
+  XDG_DATA_DIRS="$pkgdir/usr/share" LANG='en_US.UTF-8' \
+    python2 setup.py install --staging-root="$pkgdir/usr" --prefix=/usr
 
-  cp -a man-pages/ "${pkgdir}/usr/share/man"
+  cp -a man-pages/ "$pkgdir/usr/share/man"
 
   # Compiling bytecode FS#33392
-  python2 -m compileall "${pkgdir}/usr/lib/calibre/"
-  python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
+  python2 -m compileall "$pkgdir/usr/lib/calibre/"
+  python2 -O -m compileall "$pkgdir/usr/lib/calibre/"
 }