Merge branch 'master' of git://git.parabola.nu/abslibre/abslibre

1 files changed, 44 insertions, 22 deletions

diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 83bc703ad..56126faad 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -9,40 +9,49 @@
 # Maintainer: Jesús E.<heckyel@parabola.nu>
 
 pkgname=calibre
-_commit="3962610aa1f2a9789656a9ea26b0753ab0b129dc"
-pkgver=3.7.0
+_commit="fc74160e5ceabfcb40c382924d470a7b4df6fef8"
+pkgver=3.8.0
 pkgrel=1.parabola1
+_mathjax_ver=2.6.1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('x86_64' 'i686' 'armv7h')
 url="https://calibre-ebook.com/"
 license=('GPL3')
-depends=('chmlib' 'desktop-file-utils' 'gtk-update-icon-cache' 'icu'
-         'libmtp' 'libusbx' 'libwmf' 'mtdev' 'optipng' 'podofo' 'python2-apsw'
-         'python2-chardet' 'python2-cssselect' 'python2-cssutils' 'python2-dateutil'
-         'python2-dbus' 'python2-dnspython' 'python2-dukpy' 'python2-html5-parser'
-         'python2-lxml' 'python2-mechanize' 'python2-msgpack' 'python2-netifaces'
-         'python2-pillow' 'python2-psutil' 'python2-pygments' 'python2-pyqt5'
-         'python2-regex' 'python2-six' 'qt5-svg' 'qt5-webkit' 'shared-mime-info'
-         'udisks2')
-makedepends=('qt5-x11extras' 'xdg-utils')
-optdepends=('ipython2: to use calibre-debug'
+depends=('chmlib' 'icu' 'libmtp' 'libusbx' 'libwmf' 'mtdev'
+         'optipng' 'podofo' 'python2-apsw' 'python2-cssselect'
+         'python2-cssutils' 'python2-dateutil' 'python2-dbus' 'python2-dnspython'
+         'python2-dukpy' 'python2-html5-parser' 'python2-mechanize' 'python2-msgpack'
+         'python2-netifaces' 'python2-pillow' 'python2-psutil' 'python2-pygments'
+         'python2-pyqt5' 'python2-regex' 'qt5-svg' 'qt5-webkit')
+makedepends=('qt5-x11extras' 'xdg-utils' 'rapydscript-ng' 'python2-sphinx')
+optdepends=('ipython2: to use calibre-debug -g'
             'poppler: required for converting pdf to html')
 replaces=($pkgname-libre)
 conflicts=($pkgname-libre)
 source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/Megver83/calibre/repository/archive.tar.gz?ref=$pkgver"
-        "$pkgname-$pkgver.tar.gz.sig::https://gitlab.com/Megver83/calibre/raw/signatures/$pkgname-$pkgver-${_commit}.tar.gz.sig")
-sha512sums=('a8f5dc50d8419497edd74eb1f987f553455684a6eba22daa0a8b2b6b24fe3776a321f20b188b8609456397f79e43a5f0303b5987ede95a95ca277b982175a510'
-            'SKIP')
+        "$pkgname-$pkgver.tar.gz.sig::https://gitlab.com/Megver83/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")
+sha512sums=('0a030a0fa6d942fb5e1ec3e20be5039f05e363f35e411d1d72c2b02eb44413d2d063fa1eb8a42feecaa53335527d188e6143cf1274a1d41aab230c74c10e25d9'
+            'SKIP'
+            '497d1c498d9e30f1588881c98e6b128688798880d4a396839472cb2545a030f59c84adf21855c685dcce73f69505d2efd85866d06a3bb3f99a5b526e33cd325a'
+            '23e1f08cc8df16f27eb9316e3e2975bdf716d3205907dc55fa907282d70de4d7637e930a42f1bc002622d5831093efdc68c22be6f0512d4dedc7c0d8cda3230c')
 validpgpkeys=('6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
               '916FFBC76D2E641BA416BA53364F4E1483446AC5' # Jesús E.
 )
 
 prepare() {
+  # move directories
   mv "$pkgname-$pkgver-${_commit}" "$pkgname-$pkgver"
 
-  cd "${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
+
+  # Link translations to build dir
+  ln -sfT ../calibre-translations-master translations
 
   # Desktop integration (e.g. enforce arch defaults)
+  # Use uppercase naming scheme, don't create uninstaller.
+  # xdg *cannot* be kludged into installing mime files properly.
   sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
       -e "/cc(\['xdg-desktop-menu', 'forceupdate'\])/d" \
       -e "/cc(\['xdg-mime', 'install', MIME\])/d" \
@@ -52,26 +61,39 @@ prepare() {
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
+
+  # Don't use the bootstrapper, since it tries to checkout/pull the
+  # translations repo and generally touch the internet. Instead call each
+  # *needed* subcommmand.
+  # LANG='en_US.UTF-8' python2 setup.py bootstrap
 
   LANG='en_US.UTF-8' python2 setup.py build
+  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 gui
+  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"
 
+  # If these directories don't exist, zsh completion, icons, and desktop files won't install.
   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/{applications,desktop-directories,icons/hicolor}
 
   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"
 
+  install -Dm644 resources/calibre-mimetypes.xml \
+    "${pkgdir}/usr/share/mime/packages/calibre-mimetypes.xml"
+
   # Compiling bytecode FS#33392
   python2 -m compileall "${pkgdir}/usr/lib/calibre/"
   python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"