[Dev] [PATCH] Fix calibre 2.84.0 PKGBUILD and patches

nospam at curso.re nospam at curso.re
Sun May 14 20:34:58 GMT 2017


- PKGBUILD file would not apply the patches and resulted in nonfree calibre
- libre.patch would not apply cleanly (sha512 sum recalculated)

(You can apply this patch using `git am`.)

---
 libre/calibre/PKGBUILD    | 20 ++++++--------------
 libre/calibre/libre.patch |  9 +++++++--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 5f20bf070..38f4705da 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgname=calibre
 pkgver=2.84.0
-pkgrel=1.parabola
+pkgrel=2.parabola
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://calibre-ebook.com/"
@@ -30,23 +30,19 @@ optdepends=('ipython2: to use calibre-debug'
 )
 replaces=($pkgname-libre)
 conflicts=($pkgname-libre)
-mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz"
+source=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz"
           "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig"
           'libre.patch'
           '0001-Remove-new_version_notification.patch'
           '0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch')
-source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
-        "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig")
-mksha512sums=('a28aa52379bc317e648087b28859a8e2c50dd4e2ccb3352e135f896ad95ab9c85c1fba162fe3acd5056be80e7c4e9481ea1396cb638661cfdb27795051124821'
+sha512sums=('83bd3b6393f7d7bf6f5bb8496444b5973df144dcf9be8d7e0b1fb21ec456a30c2abb5cf4090ecaa18cf97ffc9272e483a89ee3bbd294c5a31d1228e7b44fd275'
               'SKIP'
-              '14800a1895fd8a5e942e282688081c607730e866e825df53918c49d973ae3e6eb78a5d48354b6e1cf58953e8e0cf9ca030e9278ec296f8de222c9bd8b2945bf4'
+              '14341846ea396ba9bffc75717c1c9b5134c5f38a94b73bd5620db6ac15f66d24169a5b440a7367c93a50b26a9f7753cc2d47e1b7fef30859fb47a4134d1cd129'
               'd95ea4e9911b62d466c2a590746c2a42c38834988bd505df7a0af3a76bde9d273f0ada405eb12ef0506da0a098d31adabe5b1b44acd23db8349ffd233d1c1b1d'
-              'f81c2f269399a44763ca77a5ceb4031ea0efd06e87b7c0e3a34cbf5765b0ee35ba66373a3d721bdfc947085994066cca77546bada2c39a6cbb5a4743a5c4fa04')
-sha512sums=('83bd3b6393f7d7bf6f5bb8496444b5973df144dcf9be8d7e0b1fb21ec456a30c2abb5cf4090ecaa18cf97ffc9272e483a89ee3bbd294c5a31d1228e7b44fd275'
-            'SKIP')
+              'b305e20774fc4dc7ea45d15b59e96c672cc8eab396bfca4830e72df260f1e3d8381a4c3db0ef623029243bd1cd21331e4df0e2e5078d61bca1931767e5b480cd')
 validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
 
-mksource(){
+prepare() {
   cd "${pkgname}-${pkgver}"
 
   # Remove nonfree unRAR utility files from the source
@@ -59,10 +55,6 @@ mksource(){
   patch -Np1 -i "${srcdir}/libre.patch"
   patch -Np1 -i "${srcdir}/0001-Remove-new_version_notification.patch"
   patch -Np1 -i "${srcdir}/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch"
-}
-
-prepare(){
-  cd "${pkgname}-${pkgver}"
 
   # Remove unneeded files and libs
   # FIXME: remove html5lib too, but the latest html5lib breaks calibre. And calibre
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index 06525e2a3..d61ebc2be 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -158,7 +158,11 @@ index 102bc8149..25a877c02 100644
              series_index = self.site_customization
              if series_index not in {'volume', 'issue'}:
                  series_index = 'volume'
-@@ -353,17 +348,6 @@ class PMLMetadataReader(MetadataReaderPlugin):
+diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
+index b342725c78..90bfeba618 100644
+--- a/src/calibre/customize/builtins.py
++++ b/src/calibre/customize/builtins.py
+@@ -354,17 +354,6 @@ class PMLMetadataReader(MetadataReaderPlugin):
          return get_metadata(stream)
  
  
@@ -166,7 +170,7 @@ index 102bc8149..25a877c02 100644
 -
 -    name = 'Read RAR metadata'
 -    file_types = set(['rar'])
--    description = _('Read metadata from ebooks in RAR archives')
+-    description = _('Read metadata from e-books in RAR archives')
 -
 -    def get_metadata(self, stream, ftype):
 -        from calibre.ebooks.metadata.rar import get_metadata
@@ -176,6 +180,7 @@ index 102bc8149..25a877c02 100644
  class RBMetadataReader(MetadataReaderPlugin):
  
      name        = 'Read RB metadata'
+
 diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py
 index 9b5eb17fb..87233d03b 100644
 --- a/src/calibre/customize/ui.py
-- 
2.13.0



More information about the Dev mailing list