calibre-2.34.0-1.parabola1: updating version

2 files changed, 95 insertions, 95 deletions

diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index e10366469..b8f493862 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137395 2015-07-24 20:25:03Z arojas $
+# $Id: PKGBUILD 138067 2015-08-07 18:32:28Z 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>
@@ -9,7 +9,7 @@
 
 pkgname=calibre
 _pkgname=$pkgname-libre
-pkgver=2.33.0
+pkgver=2.34.0
 pkgrel=1.parabola1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64')
@@ -32,9 +32,9 @@ install=$pkgname.install
 mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz")
 source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"
         'libre.patch')
-mkmd5sums=('7c08641db7f014546bb2b215c392b877')
-md5sums=('d1fefe748cd662f19cb90944d5830241'
-         '0c70c8d2fd4b11c51d061596e3c8d487')
+mkmd5sums=('588f060543f8c3142f94ebbc09416f0d')
+md5sums=('644bebc5fd167e238ceda31800f97e01'
+         '7e07f0c7cf71fdfd5950e5d648b07fd0')
 
 mksource(){
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index 22994f434..1f1e56c7e 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -1,6 +1,6 @@
-diff -Nur calibre-2.27.0.orig/resources/images.qrc calibre-2.27.0/resources/images.qrc
---- calibre-2.27.0.orig/resources/images.qrc	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.27.0/resources/images.qrc	2015-05-04 23:50:46.566711080 -0300
+diff -Nur calibre-2.34.0.orig/resources/images.qrc calibre-2.34.0/resources/images.qrc
+--- calibre-2.34.0.orig/resources/images.qrc	2015-04-25 04:35:00.000000000 -0300
++++ calibre-2.34.0/resources/images.qrc	2015-08-11 16:40:39.531800891 -0300
 @@ -197,8 +197,6 @@
  <file>images/mimetypes/svg.png</file>
  <file>images/mimetypes/odt.png</file>
@@ -17,9 +17,9 @@ diff -Nur calibre-2.27.0.orig/resources/images.qrc calibre-2.27.0/resources/imag
 -</RCC>
 \ No newline at end of file
 +</RCC>
-diff -Nur calibre-2.29.0.orig/resources/mime.types calibre-2.29.0/resources/mime.types
---- calibre-2.29.0.orig/resources/mime.types	2015-05-28 23:46:06.000000000 -0300
-+++ calibre-2.29.0/resources/mime.types	2015-05-30 04:50:23.795523059 -0300
+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 @@
  application/prs.nprend
  application/prs.plucker
@@ -44,9 +44,9 @@ diff -Nur calibre-2.29.0.orig/resources/mime.types calibre-2.29.0/resources/mime
  application/x-cb7                          cb7
  application/x-cbc                          cbc
  application/x-koboreader-ebook             kobo
-diff -Nur calibre-1.204.1.orig/session.vim calibre-1.204.1/session.vim
---- calibre-1.204.1.orig/session.vim	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/session.vim	2014-08-03 19:37:20.290255565 -0300
+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 @@
              \'/usr/include/freetype2',
              \'/usr/include/fontconfig',
@@ -55,10 +55,10 @@ diff -Nur calibre-1.204.1.orig/session.vim calibre-1.204.1/session.vim
              \'src/qt-harfbuzz/src',
              \'/usr/include/ImageMagick',
              \]
-diff -Nur calibre-2.29.0.orig/setup/extensions.py calibre-2.29.0/setup/extensions.py
---- calibre-2.29.0.orig/setup/extensions.py	2015-05-28 23:46:06.000000000 -0300
-+++ calibre-2.29.0/setup/extensions.py	2015-05-30 04:50:23.795523059 -0300
-@@ -240,24 +240,6 @@
+diff -Nur calibre-2.34.0.orig/setup/extensions.py calibre-2.34.0/setup/extensions.py
+--- calibre-2.34.0.orig/setup/extensions.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/setup/extensions.py	2015-08-11 16:40:39.532800843 -0300
+@@ -239,24 +239,6 @@
                  sip_files=['calibre/ebooks/pdf/render/qt_hack.sip']
                  ),
  
@@ -83,9 +83,9 @@ diff -Nur calibre-2.29.0.orig/setup/extensions.py calibre-2.29.0/setup/extension
      ]
  
  
-diff -Nur calibre-1.204.1.orig/setup/installer/windows/freeze.py calibre-1.204.1/setup/installer/windows/freeze.py
---- calibre-1.204.1.orig/setup/installer/windows/freeze.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/setup/installer/windows/freeze.py	2014-08-03 19:37:20.290255565 -0300
+diff -Nur calibre-2.34.0.orig/setup/installer/windows/freeze.py calibre-2.34.0/setup/installer/windows/freeze.py
+--- calibre-2.34.0.orig/setup/installer/windows/freeze.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/setup/installer/windows/freeze.py	2015-08-11 16:40:39.532800843 -0300
 @@ -672,7 +672,7 @@
                          # Because of https://github.com/fancycode/MemoryModule/issues/4
                          # any extensions that use C++ exceptions must be loaded
@@ -95,9 +95,9 @@ diff -Nur calibre-1.204.1.orig/setup/installer/windows/freeze.py calibre-1.204.1
                          '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.5.0.orig/setup/resources.py calibre-2.5.0/setup/resources.py
---- calibre-2.5.0.orig/setup/resources.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.5.0/setup/resources.py	2014-10-04 19:23:44.118602581 -0300
+diff -Nur calibre-2.34.0.orig/setup/resources.py calibre-2.34.0/setup/resources.py
+--- calibre-2.34.0.orig/setup/resources.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/setup/resources.py	2015-08-11 16:40:39.532800843 -0300
 @@ -285,7 +285,7 @@
              log = Log()
              # log.outputs = []
@@ -107,10 +107,10 @@ diff -Nur calibre-2.5.0.orig/setup/resources.py calibre-2.5.0/setup/resources.py
                      continue
                  for ouf in available_output_formats():
                      of = ouf if ouf == 'oeb' else 'dummy.'+ouf
-diff -Nur calibre-2.29.0.orig/src/calibre/__init__.py calibre-2.29.0/src/calibre/__init__.py
---- calibre-2.29.0.orig/src/calibre/__init__.py	2015-05-28 23:46:06.000000000 -0300
-+++ calibre-2.29.0/src/calibre/__init__.py	2015-05-30 04:50:23.795523059 -0300
-@@ -264,10 +264,7 @@
+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 @@
      # First use the file header to identify its type
      with open(path, 'rb') as f:
          id_ = f.read(3)
@@ -122,7 +122,7 @@ diff -Nur calibre-2.29.0.orig/src/calibre/__init__.py calibre-2.29.0/src/calibre
          from calibre.libunzip import extract as zipextract
          extractor = zipextract
      if extractor is None:
-@@ -276,9 +273,6 @@
+@@ -285,9 +282,6 @@
          if ext in ['zip', 'cbz', 'epub', 'oebzip']:
              from calibre.libunzip import extract as zipextract
              extractor = zipextract
@@ -132,20 +132,20 @@ diff -Nur calibre-2.29.0.orig/src/calibre/__init__.py calibre-2.29.0/src/calibre
      if extractor is None:
          raise Exception('Unknown archive type')
      extractor(path, dir)
-diff -Nur calibre-1.204.1.orig/src/calibre/constants.py calibre-1.204.1/src/calibre/constants.py
---- calibre-1.204.1.orig/src/calibre/constants.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/constants.py	2014-08-03 19:37:20.290255565 -0300
-@@ -138,7 +138,6 @@
+diff -Nur calibre-2.34.0.orig/src/calibre/constants.py calibre-2.34.0/src/calibre/constants.py
+--- calibre-2.34.0.orig/src/calibre/constants.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/src/calibre/constants.py	2015-08-11 16:41:09.078368837 -0300
+@@ -137,7 +137,6 @@
+                 'speedup',
                  'html',
                  'freetype',
-                 'woff',
 -                'unrar',
                  'qt_hack',
                  '_regex',
                  'hunspell',
-diff -Nur calibre-1.204.1.orig/src/calibre/customize/builtins.py calibre-1.204.1/src/calibre/customize/builtins.py
---- calibre-1.204.1.orig/src/calibre/customize/builtins.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/customize/builtins.py	2014-08-03 19:37:20.290255565 -0300
+diff -Nur calibre-2.34.0.orig/src/calibre/customize/builtins.py calibre-2.34.0/src/calibre/customize/builtins.py
+--- calibre-2.34.0.orig/src/calibre/customize/builtins.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/src/calibre/customize/builtins.py	2015-08-11 16:40:39.533800794 -0300
 @@ -127,7 +127,7 @@
  class ComicMetadataReader(MetadataReaderPlugin):
  
@@ -197,9 +197,9 @@ diff -Nur calibre-1.204.1.orig/src/calibre/customize/builtins.py calibre-1.204.1
  class RBMetadataReader(MetadataReaderPlugin):
  
      name        = 'Read RB metadata'
-diff -Nur calibre-2.27.0.orig/src/calibre/customize/ui.py calibre-2.27.0/src/calibre/customize/ui.py
---- calibre-2.27.0.orig/src/calibre/customize/ui.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.27.0/src/calibre/customize/ui.py	2015-05-04 23:50:46.570044248 -0300
+diff -Nur calibre-2.34.0.orig/src/calibre/customize/ui.py calibre-2.34.0/src/calibre/customize/ui.py
+--- calibre-2.34.0.orig/src/calibre/customize/ui.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/src/calibre/customize/ui.py	2015-08-11 16:40:39.534800746 -0300
 @@ -449,7 +449,7 @@
          if not is_disabled(plugin):
              for format in plugin.file_types:
@@ -209,9 +209,9 @@ diff -Nur calibre-2.27.0.orig/src/calibre/customize/ui.py calibre-2.27.0/src/cal
      return formats
  
  
-diff -Nur calibre-1.204.1.orig/src/calibre/devices/kobo/driver.py calibre-1.204.1/src/calibre/devices/kobo/driver.py
---- calibre-1.204.1.orig/src/calibre/devices/kobo/driver.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/devices/kobo/driver.py	2014-08-03 19:37:20.290255565 -0300
+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 @@
      book_class = Book
  
@@ -221,9 +221,9 @@ diff -Nur calibre-1.204.1.orig/src/calibre/devices/kobo/driver.py calibre-1.204.
      CAN_SET_METADATA = ['collections']
  
      VENDOR_ID           = [0x2237]
-diff -Nur calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py calibre-1.204.1/src/calibre/devices/mtp/filesystem_cache.py
---- calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/devices/mtp/filesystem_cache.py	2014-08-03 19:37:20.290255565 -0300
+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 @@
  from calibre.utils.icu import sort_key, lower
  from calibre.ebooks import BOOK_EXTENSIONS
@@ -233,9 +233,9 @@ diff -Nur calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py calib
  
  class FileOrFolder(object):
  
-diff -Nur calibre-2.5.0.orig/src/calibre/ebooks/__init__.py calibre-2.5.0/src/calibre/ebooks/__init__.py
---- calibre-2.5.0.orig/src/calibre/ebooks/__init__.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.5.0/src/calibre/ebooks/__init__.py	2014-10-04 19:23:44.121935941 -0300
+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 @@
  class ParserError(ValueError):
      pass
@@ -248,9 +248,9 @@ diff -Nur calibre-2.5.0.orig/src/calibre/ebooks/__init__.py calibre-2.5.0/src/ca
                     '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-1.204.1.orig/src/calibre/ebooks/conversion/plugins/comic_input.py calibre-1.204.1/src/calibre/ebooks/conversion/plugins/comic_input.py
---- calibre-1.204.1.orig/src/calibre/ebooks/conversion/plugins/comic_input.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/ebooks/conversion/plugins/comic_input.py	2014-08-03 19:37:20.290255565 -0300
+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 @@
  
      name        = 'Comic Input'
@@ -262,9 +262,9 @@ diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/conversion/plugins/comic_input
      is_image_collection = True
      core_usage = -1
  
-diff -Nur calibre-2.27.0.orig/src/calibre/ebooks/conversion/plumber.py calibre-2.27.0/src/calibre/ebooks/conversion/plumber.py
---- calibre-2.27.0.orig/src/calibre/ebooks/conversion/plumber.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.27.0/src/calibre/ebooks/conversion/plumber.py	2015-05-04 23:50:46.573377414 -0300
+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 @@
  
  def supported_input_formats():
@@ -283,9 +283,9 @@ diff -Nur calibre-2.27.0.orig/src/calibre/ebooks/conversion/plumber.py calibre-2
  
  class Plumber(object):
  
-diff -Nur calibre-2.27.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.27.0/src/calibre/ebooks/metadata/archive.py
---- calibre-2.27.0.orig/src/calibre/ebooks/metadata/archive.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.27.0/src/calibre/ebooks/metadata/archive.py	2015-05-04 23:59:41.893272586 -0300
+diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.34.0/src/calibre/ebooks/metadata/archive.py
+--- calibre-2.34.0.orig/src/calibre/ebooks/metadata/archive.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/src/calibre/ebooks/metadata/archive.py	2015-08-11 16:40:39.536800650 -0300
 @@ -27,8 +27,6 @@
      ans = None
      if id_ == stringFileHeader:
@@ -360,9 +360,9 @@ diff -Nur calibre-2.27.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.2
  
      if comment:
          import json
-diff -Nur calibre-2.27.0.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-2.27.0/src/calibre/ebooks/oeb/iterator/book.py
---- calibre-2.27.0.orig/src/calibre/ebooks/oeb/iterator/book.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.27.0/src/calibre/ebooks/oeb/iterator/book.py	2015-05-04 23:50:46.573377414 -0300
+diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-2.34.0/src/calibre/ebooks/oeb/iterator/book.py
+--- calibre-2.34.0.orig/src/calibre/ebooks/oeb/iterator/book.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/src/calibre/ebooks/oeb/iterator/book.py	2015-08-11 16:40:39.536800650 -0300
 @@ -128,7 +128,7 @@
          self.spine = []
          Spiny = partial(SpineItem, read_anchor_map=read_anchor_map, read_links=read_links,
@@ -372,10 +372,10 @@ diff -Nur calibre-2.27.0.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-2.
          for i in ordered:
              spath = i.path
              mt = None
-diff -Nur calibre-2.10.0.orig/src/calibre/gui2/__init__.py calibre-2.10.0/src/calibre/gui2/__init__.py
---- calibre-2.10.0.orig/src/calibre/gui2/__init__.py	2014-11-14 01:22:49.000000000 -0200
-+++ calibre-2.10.0/src/calibre/gui2/__init__.py	2014-11-14 20:25:07.481097421 -0200
-@@ -505,7 +505,6 @@
+diff -Nur calibre-2.34.0.orig/src/calibre/gui2/__init__.py calibre-2.34.0/src/calibre/gui2/__init__.py
+--- calibre-2.34.0.orig/src/calibre/gui2/__init__.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/src/calibre/gui2/__init__.py	2015-08-11 16:40:39.536800650 -0300
+@@ -501,7 +501,6 @@
               'png'     : 'png',
               'bmp'     : 'bmp',
               'cbz'     : 'cbz',
@@ -383,7 +383,7 @@ diff -Nur calibre-2.10.0.orig/src/calibre/gui2/__init__.py calibre-2.10.0/src/ca
               'svg'     : 'svg',
               'html'    : 'html',
               'htmlz'   : 'html',
-@@ -517,7 +516,6 @@
+@@ -513,7 +512,6 @@
               'lrx'     : 'lrx',
               'pdf'     : 'pdf',
               'pdr'     : 'zero',
@@ -391,9 +391,9 @@ diff -Nur calibre-2.10.0.orig/src/calibre/gui2/__init__.py calibre-2.10.0/src/ca
               'zip'     : 'zip',
               'txt'     : 'txt',
               'text'    : 'txt',
-diff -Nur calibre-2.27.0.orig/src/calibre/gui2/actions/add.py calibre-2.27.0/src/calibre/gui2/actions/add.py
---- calibre-2.27.0.orig/src/calibre/gui2/actions/add.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.27.0/src/calibre/gui2/actions/add.py	2015-05-04 23:50:46.573377414 -0300
+diff -Nur calibre-2.34.0.orig/src/calibre/gui2/actions/add.py calibre-2.34.0/src/calibre/gui2/actions/add.py
+--- calibre-2.34.0.orig/src/calibre/gui2/actions/add.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/src/calibre/gui2/actions/add.py	2015-08-11 16:40:39.537800601 -0300
 @@ -38,8 +38,8 @@
              (_('Text books'), ['txt', 'text', 'rtf']),
              (_('PDF Books'), ['pdf', 'azw4']),
@@ -423,9 +423,9 @@ diff -Nur calibre-2.27.0.orig/src/calibre/gui2/actions/add.py calibre-2.27.0/src
          if paths:
              self.do_add_recursive(paths, single, list_of_archives=True)
  
-diff -Nur calibre-2.10.0.orig/src/calibre/gui2/add.py calibre-2.10.0/src/calibre/gui2/add.py
---- calibre-2.10.0.orig/src/calibre/gui2/add.py	2014-11-14 01:22:49.000000000 -0200
-+++ calibre-2.10.0/src/calibre/gui2/add.py	2014-11-14 20:30:34.303402987 -0200
+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 @@
                      prints('Corrupt ZIP file, trying to use local headers')
                      from calibre.utils.localunzip import extractall
@@ -436,9 +436,9 @@ diff -Nur calibre-2.10.0.orig/src/calibre/gui2/add.py calibre-2.10.0/src/calibre
              return tdir
  
          try:
-diff -Nur calibre-1.204.1.orig/src/calibre/library/server/opds.py calibre-1.204.1/src/calibre/library/server/opds.py
---- calibre-1.204.1.orig/src/calibre/library/server/opds.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/library/server/opds.py	2014-08-03 19:37:20.293588940 -0300
+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 @@
          1 : '/opds',
  }
@@ -448,9 +448,9 @@ diff -Nur calibre-1.204.1.orig/src/calibre/library/server/opds.py calibre-1.204.
  
  def url_for(name, version, **kwargs):
      if not name.endswith('_'):
-diff -Nur calibre-2.5.0.orig/src/calibre/linux.py calibre-2.5.0/src/calibre/linux.py
---- calibre-2.5.0.orig/src/calibre/linux.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.5.0/src/calibre/linux.py	2014-10-04 19:23:44.121935941 -0300
+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 @@
          ):
              for fmt in fmts:
@@ -460,10 +460,10 @@ diff -Nur calibre-2.5.0.orig/src/calibre/linux.py calibre-2.5.0/src/calibre/linu
                      continue
                  p = (get_parser(input_fmt=fmt) if is_input
                       else get_parser(output_fmt=fmt))
-diff -Nur calibre-2.29.0.orig/src/calibre/test_build.py calibre-2.29.0/src/calibre/test_build.py
---- calibre-2.29.0.orig/src/calibre/test_build.py	2015-05-28 23:46:06.000000000 -0300
-+++ calibre-2.29.0/src/calibre/test_build.py	2015-05-30 04:51:26.842374333 -0300
-@@ -147,11 +147,6 @@
+diff -Nur calibre-2.34.0.orig/src/calibre/test_build.py calibre-2.34.0/src/calibre/test_build.py
+--- calibre-2.34.0.orig/src/calibre/test_build.py	2015-08-07 01:09:19.000000000 -0300
++++ calibre-2.34.0/src/calibre/test_build.py	2015-08-11 16:40:39.538800552 -0300
+@@ -157,11 +157,6 @@
          raise RuntimeError('PIL choked!')
      print ('PIL OK!')
  
@@ -475,17 +475,17 @@ diff -Nur calibre-2.29.0.orig/src/calibre/test_build.py calibre-2.29.0/src/calib
  def test_ssl():
      import ssl
      ssl
-@@ -226,7 +221,6 @@
+@@ -239,7 +234,6 @@
      test_sqlite()
      test_apsw()
      test_imaging()
 -    test_unrar()
      test_certgen()
      test_icu()
-     test_woff()
-diff -Nur calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py calibre-1.204.1/src/calibre/utils/search_query_parser.py
---- calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/utils/search_query_parser.py	2014-08-03 19:37:20.296922310 -0300
+     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 @@
       u'Tor Books',
       u'lrf'],
@@ -685,9 +685,9 @@ diff -Nur calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py calibre-
   }
  
      tests = {
-diff -Nur calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py calibre-1.204.1/src/calibre/web/feeds/feedparser.py
---- calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/web/feeds/feedparser.py	2014-08-03 19:37:20.296922310 -0300
+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 @@
      EMAIL = 5
  
@@ -697,10 +697,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py calibre-1.204
  
      def __init__(self, data, baseuri, encoding):
          self.document = BeautifulSoup.BeautifulSoup(data)
-diff -Nur calibre-2.29.0.orig/translations/calibre/main.pot calibre-2.29.0/translations/calibre/main.pot
---- calibre-2.29.0.orig/translations/calibre/main.pot	2015-05-28 23:47:51.000000000 -0300
-+++ calibre-2.29.0/translations/calibre/main.pot	2015-05-30 04:50:23.805522558 -0300
-@@ -4111,7 +4111,7 @@
+diff -Nur calibre-2.34.0.orig/translations/calibre/main.pot calibre-2.34.0/translations/calibre/main.pot
+--- calibre-2.34.0.orig/translations/calibre/main.pot	2015-08-07 00:42:42.000000000 -0300
++++ calibre-2.34.0/translations/calibre/main.pot	2015-08-11 16:40:39.544800262 -0300
+@@ -4120,7 +4120,7 @@
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42
@@ -709,7 +709,7 @@ diff -Nur calibre-2.29.0.orig/translations/calibre/main.pot calibre-2.29.0/trans
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652
-@@ -11841,7 +11841,7 @@
+@@ -11904,7 +11904,7 @@
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33