calibre-2.57.1-1.parabola1: updating version

2 files changed, 162 insertions, 137 deletions

diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 30a001ef3..db2ddc15a 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172837 2016-04-29 21:39:55Z jelle $
+# $Id: PKGBUILD 176085 2016-05-22 09:15:14Z jelle $
 # 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,7 +10,7 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgname=calibre
-pkgver=2.56.0
+pkgver=2.57.1
 pkgrel=1.parabola1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ url="https://calibre-ebook.com/"
 license=('GPL3')
 depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'python2-mechanize' 'podofo' 'libwmf'
-         'imagemagick' 'chmlib' 'python2-lxml' 'libusbx'
+         'chmlib' 'python2-lxml' 'libusbx'
          'python2-pillow' 'shared-mime-info' 'python2-dnspython'
          'python2-pyqt5' 'python2-psutil' 'icu' 'libmtp' 'python2-dbus'
          'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
@@ -35,10 +35,10 @@ mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.x
           "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig")
 source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.xz"
         'libre.patch')
-mksha256sums=('52daf1d86400464d2f7681f4e5523e24bf3183bcaafa13176e511c4a8cd16577'
+mksha256sums=('214070623c370886e54c8d3babefa1a33619469fd29a7cf6389dc5e098a8f32d'
               'SKIP')
-sha256sums=('f6d6d189aa3727b8d9fb76ef76f3b03b3baf9f2ee49629fef874c055b8c2b729'
-            '6e7c0fc9bcad0de6b850cb994c09253e1e0f5cba20495a63ff1e35c8d7f31faa')
+sha256sums=('2b801133f57ca1520f52354fa191d5edc544aacd6ed56bbc987020b463ecf748'
+            '0029cf8ffbeefeed4462b1c9bc271290645766834665ab7ac7e0d2981d36556d')
 validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
 
 mksource(){
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index 32d84b763..528922713 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -1,6 +1,7 @@
-diff -Nur calibre-2.48.0.orig/resources/images.qrc calibre-2.48.0/resources/images.qrc
---- calibre-2.48.0.orig/resources/images.qrc	2015-11-28 10:04:07.000000000 -0300
-+++ calibre-2.48.0/resources/images.qrc	2016-01-01 17:56:54.010720465 -0300
+diff --git a/resources/images.qrc b/resources/images.qrc
+index 49b98d9..130b6fa 100644
+--- a/resources/images.qrc
++++ b/resources/images.qrc
 @@ -197,8 +197,6 @@
  <file>images/mimetypes/svg.png</file>
  <file>images/mimetypes/odt.png</file>
@@ -17,10 +18,11 @@ diff -Nur calibre-2.48.0.orig/resources/images.qrc calibre-2.48.0/resources/imag
 -</RCC>
 \ No newline at end of file
 +</RCC>
-diff -Nur calibre-2.34.0.orig/resources/mime.types calibre-2.34.0/resources/mime.types
---- calibre-2.34.0.orig/resources/mime.types	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/resources/mime.types	2015-08-11 16:40:39.532800843 -0300
-@@ -138,7 +138,6 @@
+diff --git a/resources/mime.types b/resources/mime.types
+index b8acaaa..9ea4742 100644
+--- a/resources/mime.types
++++ b/resources/mime.types
+@@ -138,7 +138,6 @@ application/prs.cww				cww
  application/prs.nprend
  application/prs.plucker
  application/qsig
@@ -28,7 +30,7 @@ diff -Nur calibre-2.34.0.orig/resources/mime.types calibre-2.34.0/resources/mime
  application/rdf+xml				rdf
  application/reginfo+xml				rif
  application/relax-ng-compact-syntax				rnc
-@@ -849,7 +848,6 @@
+@@ -849,7 +848,6 @@ application/x-pkcs7-certreqresp				p7r
  application/x-pkcs7-crl				crl
  application/x-python-code				pyc pyo
  application/x-quicktimeplayer				qtl
@@ -36,7 +38,7 @@ diff -Nur calibre-2.34.0.orig/resources/mime.types calibre-2.34.0/resources/mime
  application/x-redhat-package-manager				rpm
  application/x-sh				sh
  application/x-shar				shar
-@@ -1372,7 +1370,6 @@
+@@ -1372,7 +1370,6 @@ application/x-mobipocket-subscription      pobi
  application/x-kindle-application           azw2
  application/x-mobi8-ebook                  azw3
  application/x-cbz                          cbz
@@ -44,10 +46,11 @@ diff -Nur calibre-2.34.0.orig/resources/mime.types calibre-2.34.0/resources/mime
  application/x-cb7                          cb7
  application/x-cbc                          cbc
  application/x-koboreader-ebook             kobo
-diff -Nur calibre-2.34.0.orig/session.vim calibre-2.34.0/session.vim
---- calibre-2.34.0.orig/session.vim	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/session.vim	2015-08-11 16:40:39.532800843 -0300
-@@ -11,7 +11,6 @@
+diff --git a/session.vim b/session.vim
+index 1622aab..7061d81 100644
+--- a/session.vim
++++ b/session.vim
+@@ -11,7 +11,6 @@ let g:syntastic_cpp_include_dirs = [
              \'/usr/include/freetype2',
              \'/usr/include/fontconfig',
              \'src/qtcurve/common', 'src/qtcurve',
@@ -55,10 +58,11 @@ diff -Nur calibre-2.34.0.orig/session.vim calibre-2.34.0/session.vim
              \'src/qt-harfbuzz/src',
              \'/usr/include/ImageMagick',
              \]
-diff -Nur calibre-2.51.0.orig/setup/extensions.py calibre-2.51.0/setup/extensions.py
---- calibre-2.51.0.orig/setup/extensions.py	2016-02-12 00:59:23.000000000 -0300
-+++ calibre-2.51.0/setup/extensions.py	2016-02-23 17:55:30.300022628 -0300
-@@ -247,24 +247,6 @@
+diff --git a/setup/extensions.py b/setup/extensions.py
+index d309f5f..3611aaf 100644
+--- a/setup/extensions.py
++++ b/setup/extensions.py
+@@ -244,24 +244,6 @@ extensions = [
                  sip_files=['calibre/ebooks/pdf/render/qt_hack.sip']
                  ),
  
@@ -83,22 +87,24 @@ diff -Nur calibre-2.51.0.orig/setup/extensions.py calibre-2.51.0/setup/extension
      ]
  
  
-diff -Nur calibre-2.48.0.orig/setup/installer/windows/freeze.py calibre-2.48.0/setup/installer/windows/freeze.py
---- calibre-2.48.0.orig/setup/installer/windows/freeze.py	2016-01-01 01:13:45.000000000 -0300
-+++ calibre-2.48.0/setup/installer/windows/freeze.py	2016-01-01 17:56:54.014053634 -0300
-@@ -683,7 +683,7 @@
+diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py
+index b355b2f..cf4e16a 100644
+--- a/setup/installer/windows/freeze.py
++++ b/setup/installer/windows/freeze.py
+@@ -674,7 +674,7 @@ class Win32Freeze(Command, WixMixIn):
                          # Because of https://github.com/fancycode/MemoryModule/issues/4
                          # any extensions that use C++ exceptions must be loaded
                          # from files
--                        'unrar.pyd', 'wpd.pyd', 'podofo.pyd',
-+                        'wpd.pyd', 'podofo.pyd',
+-                        'unrar.pyd', 'wpd.pyd', 'podofo.pyd', 'imageops.pyd',
++                        'wpd.pyd', 'podofo.pyd', 'imageops.pyd',
                          'progress_indicator.pyd', 'hunspell.pyd',
-                         # As per this https://bugs.launchpad.net/bugs/1087816
-                         # on some systems magick.pyd fails to load from memory
-diff -Nur calibre-2.51.0.orig/setup/resources.py calibre-2.51.0/setup/resources.py
---- calibre-2.51.0.orig/setup/resources.py	2016-02-12 00:59:23.000000000 -0300
-+++ calibre-2.51.0/setup/resources.py	2016-02-23 17:55:30.300022628 -0300
-@@ -312,7 +312,7 @@
+                         # dupypy crashes when loaded from the zip file
+                         'dukpy.pyd',
+diff --git a/setup/resources.py b/setup/resources.py
+index b4ce05d..57cc14e 100644
+--- a/setup/resources.py
++++ b/setup/resources.py
+@@ -321,7 +321,7 @@ class Resources(Command):  # {{{
              log = Log()
              # log.outputs = []
              for inf in supported_input_formats():
@@ -107,10 +113,11 @@ diff -Nur calibre-2.51.0.orig/setup/resources.py calibre-2.51.0/setup/resources.
                      continue
                  for ouf in available_output_formats():
                      of = ouf if ouf == 'oeb' else 'dummy.'+ouf
-diff -Nur calibre-2.34.0.orig/src/calibre/__init__.py calibre-2.34.0/src/calibre/__init__.py
---- calibre-2.34.0.orig/src/calibre/__init__.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/__init__.py	2015-08-11 16:40:39.533800794 -0300
-@@ -273,10 +273,7 @@
+diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
+index 4a62a5f..b52cca0 100644
+--- a/src/calibre/__init__.py
++++ b/src/calibre/__init__.py
+@@ -273,10 +273,7 @@ def extract(path, dir):
      # First use the file header to identify its type
      with open(path, 'rb') as f:
          id_ = f.read(3)
@@ -122,7 +129,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/__init__.py calibre-2.34.0/src/calibre
          from calibre.libunzip import extract as zipextract
          extractor = zipextract
      if extractor is None:
-@@ -285,9 +282,6 @@
+@@ -285,9 +282,6 @@ def extract(path, dir):
          if ext in ['zip', 'cbz', 'epub', 'oebzip']:
              from calibre.libunzip import extract as zipextract
              extractor = zipextract
@@ -132,21 +139,23 @@ diff -Nur calibre-2.34.0.orig/src/calibre/__init__.py calibre-2.34.0/src/calibre
      if extractor is None:
          raise Exception('Unknown archive type')
      extractor(path, dir)
-diff -Nur calibre-2.45.0.orig/src/calibre/constants.py calibre-2.45.0/src/calibre/constants.py
---- calibre-2.45.0.orig/src/calibre/constants.py	2015-11-27 00:22:13.000000000 -0300
-+++ calibre-2.45.0/src/calibre/constants.py	2015-11-27 13:00:44.758902890 -0300
-@@ -142,7 +142,6 @@
+diff --git a/src/calibre/constants.py b/src/calibre/constants.py
+index d91f0b7..97ea8cc 100644
+--- a/src/calibre/constants.py
++++ b/src/calibre/constants.py
+@@ -141,7 +141,6 @@ class Plugins(collections.Mapping):
                  'zlib2',
                  'html',
                  'freetype',
 -                'unrar',
+                 'imageops',
                  'qt_hack',
                  '_regex',
-                 'hunspell',
-diff -Nur calibre-2.50.1.orig/src/calibre/customize/builtins.py calibre-2.50.1/src/calibre/customize/builtins.py
---- calibre-2.50.1.orig/src/calibre/customize/builtins.py	2016-01-29 14:47:09.000000000 -0300
-+++ calibre-2.50.1/src/calibre/customize/builtins.py	2016-01-31 18:02:55.768011199 -0300
-@@ -127,7 +127,7 @@
+diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
+index 51184e3..5ac06cc 100644
+--- a/src/calibre/customize/builtins.py
++++ b/src/calibre/customize/builtins.py
+@@ -127,7 +127,7 @@ plugins += [HTML2ZIP, PML2PMLZ, TXT2TXTZ, ArchiveExtract,]
  class ComicMetadataReader(MetadataReaderPlugin):
  
      name = 'Read comic metadata'
@@ -155,7 +164,7 @@ diff -Nur calibre-2.50.1.orig/src/calibre/customize/builtins.py calibre-2.50.1/s
      description = _('Extract cover from comic files')
  
      def customization_help(self, gui=False):
-@@ -138,19 +138,14 @@
+@@ -138,19 +138,14 @@ class ComicMetadataReader(MetadataReaderPlugin):
              pos = stream.tell()
              id_ = stream.read(3)
              stream.seek(pos)
@@ -177,7 +186,7 @@ diff -Nur calibre-2.50.1.orig/src/calibre/customize/builtins.py calibre-2.50.1/s
              series_index = self.site_customization
              if series_index not in {'volume', 'issue'}:
                  series_index = 'volume'
-@@ -333,16 +328,6 @@
+@@ -333,16 +328,6 @@ class PMLMetadataReader(MetadataReaderPlugin):
          from calibre.ebooks.metadata.pml import get_metadata
          return get_metadata(stream)
  
@@ -194,10 +203,11 @@ diff -Nur calibre-2.50.1.orig/src/calibre/customize/builtins.py calibre-2.50.1/s
  class RBMetadataReader(MetadataReaderPlugin):
  
      name        = 'Read RB metadata'
-diff -Nur calibre-2.50.1.orig/src/calibre/customize/ui.py calibre-2.50.1/src/calibre/customize/ui.py
---- calibre-2.50.1.orig/src/calibre/customize/ui.py	2016-01-29 14:47:09.000000000 -0300
-+++ calibre-2.50.1/src/calibre/customize/ui.py	2016-01-31 18:00:13.083099717 -0300
-@@ -458,7 +458,7 @@
+diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py
+index ad7f861..add33e6 100644
+--- a/src/calibre/customize/ui.py
++++ b/src/calibre/customize/ui.py
+@@ -476,7 +476,7 @@ def available_input_formats():
          if not is_disabled(plugin):
              for format in plugin.file_types:
                  formats.add(format)
@@ -206,10 +216,11 @@ diff -Nur calibre-2.50.1.orig/src/calibre/customize/ui.py calibre-2.50.1/src/cal
      return formats
  
  
-diff -Nur calibre-2.34.0.orig/src/calibre/devices/kobo/driver.py calibre-2.34.0/src/calibre/devices/kobo/driver.py
---- calibre-2.34.0.orig/src/calibre/devices/kobo/driver.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/devices/kobo/driver.py	2015-08-11 16:40:39.534800746 -0300
-@@ -77,7 +77,7 @@
+diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
+index c20b9fb..c1b0a96 100644
+--- a/src/calibre/devices/kobo/driver.py
++++ b/src/calibre/devices/kobo/driver.py
+@@ -77,7 +77,7 @@ class KOBO(USBMS):
      book_class = Book
  
      # Ordered list of supported formats
@@ -218,10 +229,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/devices/kobo/driver.py calibre-2.34.0/
      CAN_SET_METADATA = ['collections']
  
      VENDOR_ID           = [0x2237]
-diff -Nur calibre-2.34.0.orig/src/calibre/devices/mtp/filesystem_cache.py calibre-2.34.0/src/calibre/devices/mtp/filesystem_cache.py
---- calibre-2.34.0.orig/src/calibre/devices/mtp/filesystem_cache.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/devices/mtp/filesystem_cache.py	2015-08-11 16:40:39.535800698 -0300
-@@ -18,7 +18,7 @@
+diff --git a/src/calibre/devices/mtp/filesystem_cache.py b/src/calibre/devices/mtp/filesystem_cache.py
+index e4207a1..d139d8e 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
  from calibre.utils.icu import sort_key, lower
  from calibre.ebooks import BOOK_EXTENSIONS
  
@@ -230,10 +242,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/devices/mtp/filesystem_cache.py calibr
  
  class FileOrFolder(object):
  
-diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/__init__.py calibre-2.34.0/src/calibre/ebooks/__init__.py
---- calibre-2.34.0.orig/src/calibre/ebooks/__init__.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/ebooks/__init__.py	2015-08-11 16:40:39.535800698 -0300
-@@ -25,9 +25,9 @@
+diff --git a/src/calibre/ebooks/__init__.py b/src/calibre/ebooks/__init__.py
+index 50a957f..ba538c6 100644
+--- a/src/calibre/ebooks/__init__.py
++++ b/src/calibre/ebooks/__init__.py
+@@ -25,9 +25,9 @@ class DRMError(ValueError):
  class ParserError(ValueError):
      pass
  
@@ -245,10 +258,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/__init__.py calibre-2.34.0/src/
                     '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']
-diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/conversion/plugins/comic_input.py calibre-2.34.0/src/calibre/ebooks/conversion/plugins/comic_input.py
---- calibre-2.34.0.orig/src/calibre/ebooks/conversion/plugins/comic_input.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/ebooks/conversion/plugins/comic_input.py	2015-08-11 16:40:39.535800698 -0300
-@@ -17,8 +17,8 @@
+diff --git a/src/calibre/ebooks/conversion/plugins/comic_input.py b/src/calibre/ebooks/conversion/plugins/comic_input.py
+index e3561bb..d1b5c79 100644
+--- a/src/calibre/ebooks/conversion/plugins/comic_input.py
++++ b/src/calibre/ebooks/conversion/plugins/comic_input.py
+@@ -17,8 +17,8 @@ class ComicInput(InputFormatPlugin):
  
      name        = 'Comic Input'
      author      = 'Kovid Goyal'
@@ -259,10 +273,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/conversion/plugins/comic_input.
      is_image_collection = True
      core_usage = -1
  
-diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/conversion/plumber.py calibre-2.34.0/src/calibre/ebooks/conversion/plumber.py
---- calibre-2.34.0.orig/src/calibre/ebooks/conversion/plumber.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/ebooks/conversion/plumber.py	2015-08-11 16:40:39.536800650 -0300
-@@ -42,7 +42,7 @@
+diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
+index 0fd2d8f..5ad7f36 100644
+--- a/src/calibre/ebooks/conversion/plumber.py
++++ b/src/calibre/ebooks/conversion/plumber.py
+@@ -42,7 +42,7 @@ various stages of conversion. The stages are:
  
  def supported_input_formats():
      fmts = available_input_formats()
@@ -271,7 +286,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/conversion/plumber.py calibre-2
          fmts.add(x)
      return fmts
  
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ class CompositeProgressReporter(object):
                  (self.global_max - self.global_min)
          self.global_reporter(global_frac, msg)
  
@@ -280,10 +295,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/conversion/plumber.py calibre-2
  
  class Plumber(object):
  
-diff -Nur calibre-2.45.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.45.0/src/calibre/ebooks/metadata/archive.py
---- calibre-2.45.0.orig/src/calibre/ebooks/metadata/archive.py	2015-11-27 00:22:13.000000000 -0300
-+++ calibre-2.45.0/src/calibre/ebooks/metadata/archive.py	2015-11-27 13:00:44.762236057 -0300
-@@ -27,8 +27,6 @@
+diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
+index 96fc0de..996368d 100644
+--- a/src/calibre/ebooks/metadata/archive.py
++++ b/src/calibre/ebooks/metadata/archive.py
+@@ -27,8 +27,6 @@ def archive_type(stream):
      ans = None
      if id_ == stringFileHeader:
          ans = 'zip'
@@ -292,7 +308,7 @@ diff -Nur calibre-2.45.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.4
      try:
          stream.seek(pos)
      except:
-@@ -40,25 +38,16 @@
+@@ -40,25 +38,16 @@ class ArchiveExtract(FileTypePlugin):
      name = 'Archive Extract'
      author = 'Kovid Goyal'
      description = _('Extract common e-book formats from archives '
@@ -323,7 +339,7 @@ diff -Nur calibre-2.45.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.4
  
          def fname_ok(fname):
              bn = os.path.basename(fname).lower()
-@@ -74,7 +63,7 @@
+@@ -74,7 +63,7 @@ class ArchiveExtract(FileTypePlugin):
  
          fnames = list(filter(fname_ok, fnames))
          if is_comic(fnames):
@@ -332,7 +348,7 @@ diff -Nur calibre-2.45.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.4
              of = self.temporary_file('_archive_extract'+ext)
              with open(archive, 'rb') as f:
                  of.write(f.read())
-@@ -91,12 +80,7 @@
+@@ -91,12 +80,7 @@ class ArchiveExtract(FileTypePlugin):
  
          of = self.temporary_file('_archive_extract.'+ext)
          with closing(of):
@@ -346,7 +362,7 @@ diff -Nur calibre-2.45.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.4
          return of.name
  
  def get_comic_book_info(d, mi, series_index='volume'):
-@@ -157,10 +141,6 @@
+@@ -157,10 +141,6 @@ def get_comic_metadata(stream, stream_type, series_index='volume'):
          from calibre.utils.zipfile import ZipFile
          zf = ZipFile(stream)
          comment = zf.comment
@@ -357,10 +373,11 @@ diff -Nur calibre-2.45.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.4
  
      if comment:
          import json
-diff -Nur calibre-2.49.0.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-2.49.0/src/calibre/ebooks/oeb/iterator/book.py
---- calibre-2.49.0.orig/src/calibre/ebooks/oeb/iterator/book.py	2016-01-14 23:48:37.000000000 -0300
-+++ calibre-2.49.0/src/calibre/ebooks/oeb/iterator/book.py	2016-01-15 19:48:58.873654351 -0300
-@@ -147,7 +147,7 @@
+diff --git a/src/calibre/ebooks/oeb/iterator/book.py b/src/calibre/ebooks/oeb/iterator/book.py
+index 437d1aa..af15764 100644
+--- a/src/calibre/ebooks/oeb/iterator/book.py
++++ b/src/calibre/ebooks/oeb/iterator/book.py
+@@ -147,7 +147,7 @@ class EbookIterator(BookmarksMixin):
          self.spine = []
          Spiny = partial(SpineItem, read_anchor_map=read_anchor_map, read_links=read_links,
                  run_char_count=run_char_count, from_epub=self.book_format == 'EPUB')
@@ -369,10 +386,11 @@ diff -Nur calibre-2.49.0.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-2.
          for i in ordered:
              spath = i.path
              mt = None
-diff -Nur calibre-2.45.0.orig/src/calibre/gui2/actions/add.py calibre-2.45.0/src/calibre/gui2/actions/add.py
---- calibre-2.45.0.orig/src/calibre/gui2/actions/add.py	2015-11-27 00:22:13.000000000 -0300
-+++ calibre-2.45.0/src/calibre/gui2/actions/add.py	2015-11-27 13:00:44.762236057 -0300
-@@ -38,8 +38,8 @@
+diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py
+index 56d299d..e21b964 100644
+--- a/src/calibre/gui2/actions/add.py
++++ b/src/calibre/gui2/actions/add.py
+@@ -38,8 +38,8 @@ def get_filters():
              (_('Text books'), ['txt', 'text', 'rtf']),
              (_('PDF Books'), ['pdf', 'azw4']),
              (_('SNB Books'), ['snb']),
@@ -383,7 +401,7 @@ diff -Nur calibre-2.45.0.orig/src/calibre/gui2/actions/add.py calibre-2.45.0/src
              (_('Wordprocessor files'), ['odt', 'doc', 'docx']),
      ]
  
-@@ -66,7 +66,7 @@
+@@ -66,7 +66,7 @@ class AddAction(InterfaceAction):
              'sub-directories (Multiple books per directory, assumes every '
              'ebook file is a different book)')).triggered.connect(
                      self.add_recursive_multiple)
@@ -392,7 +410,7 @@ diff -Nur calibre-2.45.0.orig/src/calibre/gui2/actions/add.py calibre-2.45.0/src
          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', _(
-@@ -199,7 +199,7 @@
+@@ -199,7 +199,7 @@ class AddAction(InterfaceAction):
      def add_archive(self, single):
          paths = choose_files(
              self.gui, 'recursive-archive-add', _('Choose archive file'),
@@ -401,10 +419,11 @@ diff -Nur calibre-2.45.0.orig/src/calibre/gui2/actions/add.py calibre-2.45.0/src
          if paths:
              self.do_add_recursive(paths, single, list_of_archives=True)
  
-diff -Nur calibre-2.34.0.orig/src/calibre/gui2/add.py calibre-2.34.0/src/calibre/gui2/add.py
---- calibre-2.34.0.orig/src/calibre/gui2/add.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/gui2/add.py	2015-08-11 16:40:39.537800601 -0300
-@@ -137,9 +137,6 @@
+diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py
+index 0b6f02c..9454629 100644
+--- a/src/calibre/gui2/add.py
++++ b/src/calibre/gui2/add.py
+@@ -145,9 +145,6 @@ class Adder(QObject):
                      prints('Corrupt ZIP file, trying to use local headers')
                      from calibre.utils.localunzip import extractall
                      extractall(source, tdir)
@@ -414,10 +433,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/gui2/add.py calibre-2.34.0/src/calibre
              return tdir
  
          try:
-diff -Nur calibre-2.34.0.orig/src/calibre/library/server/opds.py calibre-2.34.0/src/calibre/library/server/opds.py
---- calibre-2.34.0.orig/src/calibre/library/server/opds.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/library/server/opds.py	2015-08-11 16:40:39.537800601 -0300
-@@ -29,7 +29,7 @@
+diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py
+index 43cde64..63e4163 100644
+--- a/src/calibre/library/server/opds.py
++++ b/src/calibre/library/server/opds.py
+@@ -29,7 +29,7 @@ BASE_HREFS = {
          1 : '/opds',
  }
  
@@ -426,10 +446,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/library/server/opds.py calibre-2.34.0/
  
  def url_for(name, version, **kwargs):
      if not name.endswith('_'):
-diff -Nur calibre-2.34.0.orig/src/calibre/linux.py calibre-2.34.0/src/calibre/linux.py
---- calibre-2.34.0.orig/src/calibre/linux.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/linux.py	2015-08-11 16:40:39.537800601 -0300
-@@ -312,7 +312,7 @@
+diff --git a/src/calibre/linux.py b/src/calibre/linux.py
+index 54d0e3b..5b7760e 100644
+--- a/src/calibre/linux.py
++++ b/src/calibre/linux.py
+@@ -312,7 +312,7 @@ class ZshCompleter(object):  # {{{
          ):
              for fmt in fmts:
                  is_input = group_title == input_group
@@ -438,12 +459,13 @@ diff -Nur calibre-2.34.0.orig/src/calibre/linux.py calibre-2.34.0/src/calibre/li
                      continue
                  p = (get_parser(input_fmt=fmt) if is_input
                       else get_parser(output_fmt=fmt))
-diff -Nur calibre-2.51.0.orig/src/calibre/test_build.py calibre-2.51.0/src/calibre/test_build.py
---- calibre-2.51.0.orig/src/calibre/test_build.py	2016-02-12 00:59:23.000000000 -0300
-+++ calibre-2.51.0/src/calibre/test_build.py	2016-02-23 17:56:03.978397336 -0300
-@@ -168,11 +168,6 @@
-         raise RuntimeError('PIL choked!')
-     fprint('PIL OK!')
+diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
+index de3182b..05f17a3 100644
+--- a/src/calibre/test_build.py
++++ b/src/calibre/test_build.py
+@@ -177,11 +177,6 @@ def test_file_dialog_helper():
+     test()
+     print('File dialog helper OK!')
  
 -def test_unrar():
 -    from calibre.utils.unrar import test_basic
@@ -453,7 +475,7 @@ diff -Nur calibre-2.51.0.orig/src/calibre/test_build.py calibre-2.51.0/src/calib
  def test_icu():
      fprint('Testing ICU')
      from calibre.utils.icu_test import test_build
-@@ -287,7 +282,6 @@
+@@ -288,7 +283,6 @@ def test():
      test_sqlite()
      test_apsw()
      test_imaging()
@@ -461,10 +483,11 @@ diff -Nur calibre-2.51.0.orig/src/calibre/test_build.py calibre-2.51.0/src/calib
      test_certgen()
      test_icu()
      test_qt()
-diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2.34.0/src/calibre/utils/search_query_parser.py
---- calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/utils/search_query_parser.py	2015-08-11 16:40:39.538800552 -0300
-@@ -445,16 +445,16 @@
+diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
+index 4c08706..15c1019 100644
+--- a/src/calibre/utils/search_query_parser.py
++++ b/src/calibre/utils/search_query_parser.py
+@@ -445,16 +445,16 @@ class Tester(SearchQueryParser):
       u'Tor Books',
       u'lrf'],
   8: [u'Stalky and Co.', u'Rudyard Kipling', u'manybooks.net', u'lrf'],
@@ -486,7 +509,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   16: [u'Quicksilver', u'Neal Stephenson', None, u'lrf,zip'],
   17: [u'The Comedies of William Shakespeare',
        u'William Shakespeare',
-@@ -469,15 +469,15 @@
+@@ -469,15 +469,15 @@ class Tester(SearchQueryParser):
        None,
        u'lrf'],
   20: [u'An Ideal Husband', u'Oscar Wilde', u'manybooks.net', u'lrf'],
@@ -511,7 +534,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   30: [u'Genghis Khan and The Making of the Modern World',
        u'Jack Weatherford Orc',
        u'Three Rivers Press',
-@@ -488,9 +488,9 @@
+@@ -488,9 +488,9 @@ class Tester(SearchQueryParser):
        u'lrf,zip'],
   32: [u'The Killer Angels', u'Michael Shaara', None, u'html,lrf'],
   33: [u'Band Of Brothers', u'Stephen E Ambrose', None, u'lrf,txt'],
@@ -523,7 +546,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   37: [u'Masterman Ready', u'Marryat, Captain Frederick', None, u'lrf'],
   38: [u'With the Lightnings',
        u'David Drake',
-@@ -503,16 +503,16 @@
+@@ -503,16 +503,16 @@ class Tester(SearchQueryParser):
   40: [u'The Far Side of The Stars',
        u'David Drake',
        u'Baen Publishing Enterprises',
@@ -544,7 +567,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   44: [u'Harry Potter and the Order of the Phoenix',
        u'J. K. Rowling',
        None,
-@@ -521,12 +521,12 @@
+@@ -521,12 +521,12 @@ class Tester(SearchQueryParser):
   46: [u'The Stars at War II',
        u'Steve White',
        u'Baen Publishing Enterprises',
@@ -560,7 +583,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   49: [u'Harry Potter and the Prisoner of Azkaban',
        u'J. K. Rowling',
        None,
-@@ -539,20 +539,20 @@
+@@ -539,20 +539,20 @@ class Tester(SearchQueryParser):
        u'J.K. Rowling',
        None,
        u'lit,lrf,pdf'],
@@ -586,7 +609,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   89: [u'Master and commander',
        u"Patrick O'Brian",
        u'Fontana,\n1971',
-@@ -560,7 +560,7 @@
+@@ -560,7 +560,7 @@ class Tester(SearchQueryParser):
   91: [u'A Companion to Wolves',
        u'Sarah Monette,Elizabeth Beär',
        None,
@@ -595,7 +618,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   92: [u'The Lions of al-Rassan', u'Guy Gavriel Kay', u'Eos', u'lit,lrf'],
   93: [u'Gardens of the Moon', u'Steven Erikson', u'Tor Fantasy', u'lit,lrf'],
   95: [u'The Master and Margarita',
-@@ -584,7 +584,7 @@
+@@ -584,7 +584,7 @@ class Tester(SearchQueryParser):
   144: [u'Atonement',
         u'Ian McEwan',
         u'New York : Nan A. Talese/Doubleday, 2002.',
@@ -604,7 +627,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   146: [u'1632', u'Eric Flint', u'Baen Books', u'lit,lrf'],
   147: [u'1633', u'David Weber,Eric Flint,Dru Blair', u'Baen', u'lit,lrf'],
   148: [u'1634: The Baltic War',
-@@ -637,7 +637,7 @@
+@@ -637,7 +637,7 @@ class Tester(SearchQueryParser):
   253: [u"Hunter's Run",
         u'George R. R. Martin,Gardner Dozois,Daniel Abraham',
         u'Eos',
@@ -613,7 +636,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   257: [u'Knife of Dreams', u'Robert Jordan', None, u'lit,lrf'],
   258: [u'Saturday',
         u'Ian McEwan',
-@@ -657,7 +657,7 @@
+@@ -657,7 +657,7 @@ class Tester(SearchQueryParser):
         u'New York : Random House, 2005.',
         u'lit,lrf'],
   269: [u'Reap the Whirlwind', u'David Mack', u'Star Trek', u'lit,lrf'],
@@ -622,7 +645,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   273: [u'The Thousandfold Thought',
         u'R. Scott Bakker',
         u'Overlook TP',
-@@ -665,17 +665,17 @@
+@@ -665,17 +665,17 @@ class Tester(SearchQueryParser):
   276: [u'Elantris',
         u'Brandon Sanderson',
         u'New York : Tor, 2005.',
@@ -644,7 +667,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   325: [u"Foundation's Triumph", u'David Brin', u'Easton Press', u'lit,lrf'],
   327: [u'I am Charlotte Simmons', u'Tom Wolfe', u'Vintage', u'htm,lrf'],
   335: [u'The Currents of Space', u'Isaac Asimov', None, u'lit,lrf'],
-@@ -705,15 +705,15 @@
+@@ -705,15 +705,15 @@ class Tester(SearchQueryParser):
         u'Aspect',
         u'lit,lrf'],
   356: [u'The Naked God', u'Peter F. Hamilton', u'Aspect', u'lit,lrf'],
@@ -663,10 +686,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/utils/search_query_parser.py calibre-2
   }
  
      tests = {
-diff -Nur calibre-2.34.0.orig/src/calibre/web/feeds/feedparser.py calibre-2.34.0/src/calibre/web/feeds/feedparser.py
---- calibre-2.34.0.orig/src/calibre/web/feeds/feedparser.py	2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/web/feeds/feedparser.py	2015-08-11 16:40:39.539800504 -0300
-@@ -2081,7 +2081,7 @@
+diff --git a/src/calibre/web/feeds/feedparser.py b/src/calibre/web/feeds/feedparser.py
+index 16085cf..420efaa 100755
+--- a/src/calibre/web/feeds/feedparser.py
++++ b/src/calibre/web/feeds/feedparser.py
+@@ -2081,7 +2081,7 @@ class _MicroformatsParser:
      EMAIL = 5
  
      known_xfn_relationships = set(['contact', 'acquaintance', 'friend', 'met', 'co-worker', 'coworker', 'colleague', 'co-resident', 'coresident', 'neighbor', 'child', 'parent', 'sibling', 'brother', 'sister', 'spouse', 'wife', 'husband', 'kin', 'relative', 'muse', 'crush', 'date', 'sweetheart', 'me'])
@@ -675,10 +699,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/web/feeds/feedparser.py calibre-2.34.0
  
      def __init__(self, data, baseuri, encoding):
          self.document = BeautifulSoup.BeautifulSoup(data)
-diff -Nur calibre-2.51.0.orig/translations/calibre/main.pot calibre-2.51.0/translations/calibre/main.pot
---- calibre-2.51.0.orig/translations/calibre/main.pot	2016-02-12 01:18:39.000000000 -0300
-+++ calibre-2.51.0/translations/calibre/main.pot	2016-02-23 17:55:30.310022144 -0300
-@@ -4109,7 +4109,7 @@
+diff --git a/translations/calibre/main.pot b/translations/calibre/main.pot
+index 9ced1a7..2fb35e1 100644
+--- a/translations/calibre/main.pot
++++ b/translations/calibre/main.pot
+@@ -4341,7 +4341,7 @@ msgid "Set book ID"
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42
@@ -687,7 +712,7 @@ diff -Nur calibre-2.51.0.orig/translations/calibre/main.pot calibre-2.51.0/trans
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652
-@@ -12069,7 +12069,7 @@
+@@ -12629,7 +12629,7 @@ msgid "You can also customise the plugin locations using <b>Preferences -> Custo
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33