Calibre: Update v2.85.1 + fixed patch

4 files changed, 97 insertions, 118 deletions

diff --git a/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch b/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch
index 443d9968b..fd08922eb 100644
--- a/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch
+++ b/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch
@@ -1,5 +1,7 @@
---- calibre-2.84.0/src/calibre/gui2/update.py.orig	2017-04-26 14:55:30.824093338 -0300
-+++ calibre-2.84.0/src/calibre/gui2/update.py	2017-04-26 15:00:09.807495982 -0300
+diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py
+index 9ce55d0..04367de 100644
+--- a/src/calibre/gui2/update.py
++++ b/src/calibre/gui2/update.py
 @@ -1,19 +1,17 @@
  __license__   = 'GPL v3'
  __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
@@ -14,9 +16,8 @@
 +        QLabel, QDialogButtonBox, QIcon)
  
 -from calibre.constants import (__appname__, __version__, iswindows, isosx,
--        isportable, is64bit, numeric_version)
 +from calibre.constants import (__appname__, iswindows, isosx,
-+        isportable, is64bit)
+         isportable, is64bit, numeric_version)
  from calibre import prints, as_unicode
 -from calibre.utils.config import prefs
 -from calibre.utils.https import get_https_resource_securely
@@ -25,7 +26,7 @@
  from calibre.gui2.dialogs.plugin_updater import get_plugin_updates_available
  
  URL = 'https://code.calibre-ebook.com/latest'
-@@ -30,35 +28,7 @@
+@@ -30,35 +28,7 @@ def get_download_url():
  
  
  def get_newest_version():
@@ -62,7 +63,7 @@
  
  
  class Signal(QObject):
-@@ -81,12 +51,6 @@
+@@ -81,12 +51,6 @@ class CheckForUpdates(Thread):
              calibre_update_version = NO_CALIBRE_UPDATE
              plugins_update_found = 0
              try:
@@ -75,18 +76,4 @@
                  update_plugins = get_plugin_updates_available(raise_error=True)
                  if update_plugins is not None:
                      plugins_update_found = len(update_plugins)
-@@ -193,13 +157,7 @@
-         self.status_bar.update_label.setText(msg)
-         self.status_bar.update_label.setVisible(True)
- 
--        if has_calibre_update:
--            if force:
--                if not no_show_popup:
--                    self._update_notification__ = UpdateNotification(calibre_version,
--                            number_of_plugin_updates, parent=self)
--                    self._update_notification__.show()
--        elif has_plugin_updates:
-+        if has_plugin_updates:
-             if force:
-                 from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog,
-                     FILTER_UPDATE_AVAILABLE)
+
diff --git a/libre/calibre/0001-Remove-new_version_notification.patch b/libre/calibre/0001-Remove-new_version_notification.patch
index 432b3ae8d..a11c04323 100644
--- a/libre/calibre/0001-Remove-new_version_notification.patch
+++ b/libre/calibre/0001-Remove-new_version_notification.patch
@@ -1,8 +1,8 @@
 diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
-index a1cf1849d..6daa2e705 100644
+index 7238c97..1d4491f 100644
 --- a/src/calibre/gui2/__init__.py
 +++ b/src/calibre/gui2/__init__.py
-@@ -169,8 +169,6 @@ def _config():  # {{{
+@@ -168,8 +168,6 @@ def _config():  # {{{
                help=_('Confirm before deleting'))
      c.add_opt('main_window_geometry', default=None,
                help=_('Main window geometry'))
@@ -12,7 +12,7 @@ index a1cf1849d..6daa2e705 100644
                help=_('Use Roman numerals for series number'))
      c.add_opt('sort_tags_by', default='name',
 diff --git a/src/calibre/gui2/preferences/behavior.py b/src/calibre/gui2/preferences/behavior.py
-index 6db4cb1f3..51b7ed0a8 100644
+index 6db4cb1..51b7ed0 100644
 --- a/src/calibre/gui2/preferences/behavior.py
 +++ b/src/calibre/gui2/preferences/behavior.py
 @@ -40,7 +40,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
@@ -24,7 +24,7 @@ index 6db4cb1f3..51b7ed0a8 100644
          r('delete_news_from_library_on_upload', config)
  
 diff --git a/src/calibre/gui2/preferences/behavior.ui b/src/calibre/gui2/preferences/behavior.ui
-index 2926f767b..0ad998884 100644
+index ae4c20d..4bdfa6d 100644
 --- a/src/calibre/gui2/preferences/behavior.ui
 +++ b/src/calibre/gui2/preferences/behavior.ui
 @@ -14,13 +14,6 @@
@@ -42,10 +42,10 @@ index 2926f767b..0ad998884 100644
      <widget class="QCheckBox" name="opt_bools_are_tristate">
       <property name="toolTip">
 diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py
-index 3e294cac3..d1ba09137 100644
+index 9ce55d0..ca68eb8 100644
 --- a/src/calibre/gui2/update.py
 +++ b/src/calibre/gui2/update.py
-@@ -125,11 +125,7 @@ class UpdateNotification(QDialog):
+@@ -125,11 +125,6 @@ class UpdateNotification(QDialog):
          self.setWindowIcon(QIcon(I('lt.png')))
          self.l.addWidget(self.logo, 0, 0)
          self.l.addWidget(self.label, 0, 1)
@@ -54,11 +54,10 @@ index 3e294cac3..d1ba09137 100644
 -        self.l.addWidget(self.cb, 1, 0, 1, -1)
 -        self.cb.setChecked(config.get('new_version_notification'))
 -        self.cb.stateChanged.connect(self.show_future)
-+
          self.bb = QDialogButtonBox(self)
          b = self.bb.addButton(_('&Get update'), self.bb.AcceptRole)
          b.setDefault(True)
-@@ -151,9 +147,6 @@ class UpdateNotification(QDialog):
+@@ -151,9 +146,6 @@ class UpdateNotification(QDialog):
                  initial_filter=FILTER_UPDATE_AVAILABLE)
          d.exec_()
  
@@ -68,7 +67,7 @@ index 3e294cac3..d1ba09137 100644
      def accept(self):
          open_url(QUrl(get_download_url()))
  
-@@ -201,8 +194,7 @@ class UpdateMixin(object):
+@@ -201,8 +193,7 @@ class UpdateMixin(object):
          self.status_bar.update_label.setVisible(True)
  
          if has_calibre_update:
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 5f20bf070..55e8b842d 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -7,11 +7,11 @@
 # Contributor (Arch): Larry Hajali <larryhaja@gmail.com>
 # Contributor (Arch): Eli Schwartz <eschwartz93@gmail.com>
 # Contributor: André Silva <emulatorman@riseup.net>
-# Contributor: Márcio Silva <coadde@parabola.nu>
+# Contributor: Márcio Silva <coadde@riseup.net>
 
 pkgname=calibre
-pkgver=2.84.0
-pkgrel=1.parabola
+pkgver=2.85.1
+pkgrel=2.parabola1
 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'
-              'SKIP'
-              '14800a1895fd8a5e942e282688081c607730e866e825df53918c49d973ae3e6eb78a5d48354b6e1cf58953e8e0cf9ca030e9278ec296f8de222c9bd8b2945bf4'
-              'd95ea4e9911b62d466c2a590746c2a42c38834988bd505df7a0af3a76bde9d273f0ada405eb12ef0506da0a098d31adabe5b1b44acd23db8349ffd233d1c1b1d'
-              'f81c2f269399a44763ca77a5ceb4031ea0efd06e87b7c0e3a34cbf5765b0ee35ba66373a3d721bdfc947085994066cca77546bada2c39a6cbb5a4743a5c4fa04')
-sha512sums=('83bd3b6393f7d7bf6f5bb8496444b5973df144dcf9be8d7e0b1fb21ec456a30c2abb5cf4090ecaa18cf97ffc9272e483a89ee3bbd294c5a31d1228e7b44fd275'
-            'SKIP')
+sha512sums=('ce29924213fa7461bbf2fc62f26bd53e4eafdf3b0dd58e241071592be4ee038cdb3ac6ac2982229dd0e52595a93aca7d921640ea55796950d1f3ac3c2742af4f'
+            'SKIP'
+            'e024f634bdab8f58400a50d139883f1672767e36164555ca158ef8b8b49cff490e0dfb4294d9da1e567fdc53acc87f510a011f93ba3bd2bc0ee361ae6653a68b'
+            'e6c3b1ddbd72c4e1cd1b883283102c7e185e2badded24b9d1920364b4ec96ad60fd68d558bfce69e90739568de01aae81ae5ed349f1700697ba153f6d251e2ba'
+            '29b57398f8243bfa452983413f34b48d69da1577286455ed1356b2c1d12043af70ad389d02a8d64ad848ba4883243b66c7aab7805f3a82deac611bb41e0556f7')
 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..3ac517740 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -1,5 +1,28 @@
+diff --git a/resources/images.qrc b/resources/images.qrc
+index ef1d715..20da7fc 100644
+--- a/resources/images.qrc
++++ b/resources/images.qrc
+@@ -183,11 +183,9 @@
+ <file>images/mimetypes/html.png</file>
+ <file>images/mimetypes/xps.png</file>
+ <file>images/mimetypes/svg.png</file>
+-<file>images/mimetypes/cbr.png</file>
+ <file>images/mimetypes/tpz.png</file>
+ <file>images/mimetypes/snb.png</file>
+ <file>images/mimetypes/png.png</file>
+-<file>images/mimetypes/rar.png</file>
+ <file>images/mimetypes/mobi.png</file>
+ <file>images/mimetypes/gif.png</file>
+ <file>images/mimetypes/pdf.png</file>
+@@ -218,4 +216,4 @@
+ <file>images/plugins/plugin_updater_updates.png</file>
+ <file>images/plugins/plugin_upgrade_valid.png</file>
+ </qresource>
+-</RCC>
+\ No newline at end of file
++</RCC>
 diff --git a/resources/mime.types b/resources/mime.types
-index b8acaaa25..9ea4742a6 100644
+index b8acaaa..9ea4742 100644
 --- a/resources/mime.types
 +++ b/resources/mime.types
 @@ -138,7 +138,6 @@ application/prs.cww				cww
@@ -27,7 +50,7 @@ index b8acaaa25..9ea4742a6 100644
  application/x-cbc                          cbc
  application/x-koboreader-ebook             kobo
 diff --git a/session.vim b/session.vim
-index d5ecb06a3..b3e40d0da 100644
+index d5ecb06..b3e40d0 100644
 --- a/session.vim
 +++ b/session.vim
 @@ -11,7 +11,6 @@ let g:syntastic_cpp_include_dirs = [
@@ -39,7 +62,7 @@ index d5ecb06a3..b3e40d0da 100644
              \'/usr/include/ImageMagick',
              \]
 diff --git a/setup/extensions.json b/setup/extensions.json
-index 1f6d1fb5f..127390450 100644
+index 1f6d1fb..1273904 100644
 --- a/setup/extensions.json
 +++ b/setup/extensions.json
 @@ -211,16 +211,5 @@
@@ -60,7 +83,7 @@ index 1f6d1fb5f..127390450 100644
      }
  ]
 diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py
-index 539ec35ff..f0537d916 100644
+index 4d173b0..251c188 100644
 --- a/setup/installer/windows/freeze.py
 +++ b/setup/installer/windows/freeze.py
 @@ -674,7 +674,7 @@ class Win32Freeze(Command, WixMixIn):
@@ -73,10 +96,10 @@ index 539ec35ff..f0537d916 100644
                          # dupypy crashes when loaded from the zip file
                          'dukpy.pyd',
 diff --git a/setup/resources.py b/setup/resources.py
-index d3c9614c6..6946b93f4 100644
+index 7fb34bd..3e5ef3b 100644
 --- a/setup/resources.py
 +++ b/setup/resources.py
-@@ -364,7 +364,7 @@ class Resources(Command):  # {{{
+@@ -341,7 +341,7 @@ class Resources(Command):  # {{{
              log = Log()
              # log.outputs = []
              for inf in supported_input_formats():
@@ -86,7 +109,7 @@ index d3c9614c6..6946b93f4 100644
                  for ouf in available_output_formats():
                      of = ouf if ouf == 'oeb' else 'dummy.'+ouf
 diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
-index dfd897ba0..105578388 100644
+index faa54dd..5b9fbee 100644
 --- a/src/calibre/__init__.py
 +++ b/src/calibre/__init__.py
 @@ -292,10 +292,7 @@ def extract(path, dir):
@@ -112,7 +135,7 @@ index dfd897ba0..105578388 100644
          raise Exception('Unknown archive type')
      extractor(path, dir)
 diff --git a/src/calibre/constants.py b/src/calibre/constants.py
-index 3952b06da..87e42b4a8 100644
+index 673d2ef..64e4cc0 100644
 --- a/src/calibre/constants.py
 +++ b/src/calibre/constants.py
 @@ -154,7 +154,6 @@ class Plugins(collections.Mapping):
@@ -124,10 +147,10 @@ index 3952b06da..87e42b4a8 100644
                  'qt_hack',
                  '_regex',
 diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
-index 102bc8149..25a877c02 100644
+index 5efd33b..9d2027d 100644
 --- a/src/calibre/customize/builtins.py
 +++ b/src/calibre/customize/builtins.py
-@@ -131,7 +131,7 @@ plugins += [HTML2ZIP, PML2PMLZ, TXT2TXTZ, ArchiveExtract,]
+@@ -132,7 +132,7 @@ plugins += [HTML2ZIP, PML2PMLZ, TXT2TXTZ, ArchiveExtract,]
  class ComicMetadataReader(MetadataReaderPlugin):
  
      name = 'Read comic metadata'
@@ -136,7 +159,7 @@ index 102bc8149..25a877c02 100644
      description = _('Extract cover from comic files')
  
      def customization_help(self, gui=False):
-@@ -142,19 +142,14 @@ class ComicMetadataReader(MetadataReaderPlugin):
+@@ -143,19 +143,14 @@ class ComicMetadataReader(MetadataReaderPlugin):
              pos = stream.tell()
              id_ = stream.read(3)
              stream.seek(pos)
@@ -158,7 +181,7 @@ 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):
+@@ -354,17 +349,6 @@ class PMLMetadataReader(MetadataReaderPlugin):
          return get_metadata(stream)
  
  
@@ -166,7 +189,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
@@ -177,7 +200,7 @@ index 102bc8149..25a877c02 100644
  
      name        = 'Read RB metadata'
 diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py
-index 9b5eb17fb..87233d03b 100644
+index eaa97e7..ed37232 100644
 --- a/src/calibre/customize/ui.py
 +++ b/src/calibre/customize/ui.py
 @@ -526,7 +526,7 @@ def available_input_formats():
@@ -190,7 +213,7 @@ index 9b5eb17fb..87233d03b 100644
  
  
 diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
-index a4bc8639b..ae9e437e9 100644
+index 531c1cd..880aa3b 100644
 --- a/src/calibre/devices/kobo/driver.py
 +++ b/src/calibre/devices/kobo/driver.py
 @@ -78,7 +78,7 @@ class KOBO(USBMS):
@@ -203,7 +226,7 @@ index a4bc8639b..ae9e437e9 100644
  
      VENDOR_ID           = [0x2237]
 diff --git a/src/calibre/devices/mtp/filesystem_cache.py b/src/calibre/devices/mtp/filesystem_cache.py
-index ffc52806d..79be51ed7 100644
+index ffc5280..79be51e 100644
 --- a/src/calibre/devices/mtp/filesystem_cache.py
 +++ b/src/calibre/devices/mtp/filesystem_cache.py
 @@ -18,7 +18,7 @@ from calibre.utils.date import local_tz, as_utc
@@ -216,7 +239,7 @@ index ffc52806d..79be51ed7 100644
  
  class FileOrFolder(object):
 diff --git a/src/calibre/ebooks/__init__.py b/src/calibre/ebooks/__init__.py
-index 785d964ed..f8c01e55b 100644
+index 699be34..5604e5d 100644
 --- a/src/calibre/ebooks/__init__.py
 +++ b/src/calibre/ebooks/__init__.py
 @@ -30,9 +30,9 @@ class ParserError(ValueError):
@@ -230,9 +253,9 @@ index 785d964ed..f8c01e55b 100644
 +                   'epub', 'fb2', 'djv', 'djvu', 'lrx', 'cbz', 'cbc', 'oebzip',
                     'rb', 'imp', 'odt', 'chm', 'tpz', 'azw1', 'pml', 'pmlz', 'mbp', 'tan', 'snb',
                     'xps', 'oxps', 'azw4', 'book', 'zbf', 'pobi', 'docx', 'docm', 'md',
-                    'textile', 'markdown', 'ibook', 'ibooks', 'iba', 'azw3', 'ps', 'kepub']
+                    'textile', 'markdown', 'ibook', 'ibooks', 'iba', 'azw3', 'ps', 'kepub', 'kfx']
 diff --git a/src/calibre/ebooks/conversion/plugins/comic_input.py b/src/calibre/ebooks/conversion/plugins/comic_input.py
-index 882501462..acc1f1bd3 100644
+index f64acc5..2020bae 100644
 --- a/src/calibre/ebooks/conversion/plugins/comic_input.py
 +++ b/src/calibre/ebooks/conversion/plugins/comic_input.py
 @@ -18,8 +18,8 @@ class ComicInput(InputFormatPlugin):
@@ -247,7 +270,7 @@ index 882501462..acc1f1bd3 100644
      core_usage = -1
  
 diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
-index f85199a01..c429f1130 100644
+index bf8853b..917c485 100644
 --- a/src/calibre/ebooks/conversion/plumber.py
 +++ b/src/calibre/ebooks/conversion/plumber.py
 @@ -43,7 +43,7 @@ various stages of conversion. The stages are:
@@ -269,7 +292,7 @@ index f85199a01..c429f1130 100644
  
  class Plumber(object):
 diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
-index 938ab24bc..0494bc5e3 100644
+index f5c0b7b..28c4d80 100644
 --- a/src/calibre/ebooks/metadata/archive.py
 +++ b/src/calibre/ebooks/metadata/archive.py
 @@ -29,8 +29,6 @@ def archive_type(stream):
@@ -284,13 +307,12 @@ index 938ab24bc..0494bc5e3 100644
 @@ -42,25 +40,16 @@ class ArchiveExtract(FileTypePlugin):
      name = 'Archive Extract'
      author = 'Kovid Goyal'
-     description = _('Extract common e-book formats from archives '
--        '(zip/rar) files. Also try to autodetect if they are actually '
--        'cbz/cbr files.')
--    file_types = set(['zip', 'rar'])
-+        'zip files. Also try to autodetect if they are actually '
-+        'cbz files.')
-+    file_types = set(['zip'])
+     description = _('Extract common e-book formats from archive files '
+-        '(ZIP/RAR). Also try to autodetect if they are actually '
+-        'CBZ/CBR files.')
++        '(ZIP). Also try to autodetect if they are actually '
++        'CBZ files.')
+     file_types = set(['zip', 'rar'])
      supported_platforms = ['windows', 'osx', 'linux']
      on_import = True
  
@@ -347,7 +369,7 @@ index 938ab24bc..0494bc5e3 100644
      if comment:
          import json
 diff --git a/src/calibre/ebooks/oeb/iterator/book.py b/src/calibre/ebooks/oeb/iterator/book.py
-index 08208c915..ff37b807f 100644
+index 08208c9..ff37b80 100644
 --- a/src/calibre/ebooks/oeb/iterator/book.py
 +++ b/src/calibre/ebooks/oeb/iterator/book.py
 @@ -152,7 +152,7 @@ class EbookIterator(BookmarksMixin):
@@ -360,13 +382,13 @@ index 08208c915..ff37b807f 100644
              spath = i.path
              mt = None
 diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py
-index d2f628294..c1a92b8dd 100644
+index c263495..8945075 100644
 --- a/src/calibre/gui2/actions/add.py
 +++ b/src/calibre/gui2/actions/add.py
-@@ -39,8 +39,8 @@ def get_filters():
-             (_('Text books'), ['txt', 'text', 'rtf']),
-             (_('PDF Books'), ['pdf', 'azw4']),
-             (_('SNB Books'), ['snb']),
+@@ -36,8 +36,8 @@ def get_filters():
+             (_('HTML books'), ['htm', 'html', 'xhtm', 'xhtml']),
+             (_('LIT books'), ['lit']),
+             (_('Text books'), ['txt', 'text', 'rtf', 'md', 'markdown', 'textile', 'txtz']),
 -            (_('Comics'), ['cbz', 'cbr', 'cbc']),
 -            (_('Archives'), ['zip', 'rar']),
 +            (_('Comics'), ['cbz', 'cbc']),
@@ -374,16 +396,16 @@ index d2f628294..c1a92b8dd 100644
              (_('Wordprocessor files'), ['odt', 'doc', 'docx']),
      ]
  
-@@ -67,7 +67,7 @@ class AddAction(InterfaceAction):
+@@ -64,7 +64,7 @@ class AddAction(InterfaceAction):
              'sub-directories (Multiple books per directory, assumes every '
-             'ebook file is a different book)')).triggered.connect(
+             'e-book file is a different book)')).triggered.connect(
                      self.add_recursive_multiple)
 -        arm = self.add_archive_menu = self.add_menu.addMenu(_('Add multiple books from archive (ZIP/RAR)'))
 +        arm = self.add_archive_menu = self.add_menu.addMenu(_('Add multiple books from archive (ZIP)'))
          self.create_menu_action(arm, 'recursive-single-archive', _(
              'One book per directory in the archive')).triggered.connect(partial(self.add_archive, True))
          self.create_menu_action(arm, 'recursive-multiple-archive', _(
-@@ -200,7 +200,7 @@ class AddAction(InterfaceAction):
+@@ -199,7 +199,7 @@ class AddAction(InterfaceAction):
      def add_archive(self, single):
          paths = choose_files(
              self.gui, 'recursive-archive-add', _('Choose archive file'),
@@ -393,10 +415,10 @@ index d2f628294..c1a92b8dd 100644
              self.do_add_recursive(paths, single, list_of_archives=True)
  
 diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py
-index 5adb28604..b60f2a9fc 100644
+index 2aee3ce..a125939 100644
 --- a/src/calibre/gui2/add.py
 +++ b/src/calibre/gui2/add.py
-@@ -147,9 +147,6 @@ class Adder(QObject):
+@@ -162,9 +162,6 @@ class Adder(QObject):
                      prints('Corrupt ZIP file, trying to use local headers')
                      from calibre.utils.localunzip import extractall
                      extractall(source, tdir)
@@ -407,7 +429,7 @@ index 5adb28604..b60f2a9fc 100644
  
          try:
 diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py
-index 34157a0c5..718af59f1 100644
+index 34157a0..718af59 100644
 --- a/src/calibre/library/server/opds.py
 +++ b/src/calibre/library/server/opds.py
 @@ -28,7 +28,7 @@ BASE_HREFS = {
@@ -420,7 +442,7 @@ index 34157a0c5..718af59f1 100644
  
  def url_for(name, version, **kwargs):
 diff --git a/src/calibre/linux.py b/src/calibre/linux.py
-index a098ea630..163aa38bc 100644
+index ebc8904..60036b3 100644
 --- a/src/calibre/linux.py
 +++ b/src/calibre/linux.py
 @@ -317,7 +317,7 @@ class ZshCompleter(object):  # {{{
@@ -433,7 +455,7 @@ index a098ea630..163aa38bc 100644
                  p = (get_parser(input_fmt=fmt) if is_input
                       else get_parser(output_fmt=fmt))
 diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
-index f11c08b26..3176389b8 100644
+index f11c08b..3176389 100644
 --- a/src/calibre/test_build.py
 +++ b/src/calibre/test_build.py
 @@ -168,10 +168,6 @@ class BuildTest(unittest.TestCase):
@@ -448,7 +470,7 @@ index f11c08b26..3176389b8 100644
      def test_wpd(self):
          wpd = plugins['wpd'][0]
 diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
-index fe04af0b3..130fb81ec 100644
+index fe04af0..130fb81 100644
 --- a/src/calibre/utils/search_query_parser.py
 +++ b/src/calibre/utils/search_query_parser.py
 @@ -455,16 +455,16 @@ class Tester(SearchQueryParser):
@@ -651,7 +673,7 @@ index fe04af0b3..130fb81ec 100644
  
      tests = {
 diff --git a/src/calibre/web/feeds/feedparser.py b/src/calibre/web/feeds/feedparser.py
-index 16085cf53..420efaa25 100755
+index 16085cf..420efaa 100755
 --- a/src/calibre/web/feeds/feedparser.py
 +++ b/src/calibre/web/feeds/feedparser.py
 @@ -2081,7 +2081,7 @@ class _MicroformatsParser:
@@ -664,19 +686,19 @@ index 16085cf53..420efaa25 100755
      def __init__(self, data, baseuri, encoding):
          self.document = BeautifulSoup.BeautifulSoup(data)
 diff --git a/translations/calibre/main.pot b/translations/calibre/main.pot
-index fc85e1b7a..87b62caf3 100644
+index e55dc61..837e492 100644
 --- a/translations/calibre/main.pot
 +++ b/translations/calibre/main.pot
-@@ -4424,7 +4424,7 @@ msgid "Set book ID"
+@@ -4459,7 +4459,7 @@ msgid "Set book ID"
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:44
--msgid "Extract common e-book formats from archives (zip/rar) files. Also try to autodetect if they are actually cbz/cbr files."
-+msgid "Extract common e-book formats from archives (zip) files. Also try to autodetect if they are actually cbz files."
+-msgid "Extract common e-book formats from archive files (ZIP/RAR). Also try to autodetect if they are actually CBZ/CBR files."
++msgid "Extract common e-book formats from archive files (ZIP). Also try to autodetect if they are actually CBZ/CBR files."
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:655
-@@ -12888,7 +12888,7 @@ msgid "You can also customise the plugin locations using <b>Preferences -> Custo
+@@ -12903,7 +12903,7 @@ msgid "You can also customise the plugin locations using <b>Preferences -> Inter
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:36
@@ -685,24 +707,3 @@ index fc85e1b7a..87b62caf3 100644
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:51
---- calibre-2.84.0/resources/images.qrc.orig	2017-04-13 00:02:36.000000000 -0300
-+++ calibre-2.84.0/resources/images.qrc	2017-04-26 14:52:54.508461078 -0300
-@@ -183,11 +183,9 @@
- <file>images/mimetypes/html.png</file>
- <file>images/mimetypes/xps.png</file>
- <file>images/mimetypes/svg.png</file>
--<file>images/mimetypes/cbr.png</file>
- <file>images/mimetypes/tpz.png</file>
- <file>images/mimetypes/snb.png</file>
- <file>images/mimetypes/png.png</file>
--<file>images/mimetypes/rar.png</file>
- <file>images/mimetypes/mobi.png</file>
- <file>images/mimetypes/gif.png</file>
- <file>images/mimetypes/pdf.png</file>
-@@ -218,4 +216,4 @@
- <file>images/plugins/plugin_updater_updates.png</file>
- <file>images/plugins/plugin_upgrade_valid.png</file>
- </qresource>
--</RCC>
-\ No hay ningún carácter de nueva línea al final del fichero
-+</RCC>