calibre-2.63.0-1.parabola1: updating version

1 files changed, 32 insertions, 42 deletions

diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index ca162e199..29a50a67d 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -58,35 +58,25 @@ index 1622aab..7061d81 100644
              \'src/qt-harfbuzz/src',
              \'/usr/include/ImageMagick',
              \]
-diff --git a/setup/extensions.py b/setup/extensions.py
-index d6a2dea..c8dea7a 100644
---- a/setup/extensions.py
-+++ b/setup/extensions.py
-@@ -240,24 +240,6 @@ extensions = [
-                 sip_files=['calibre/ebooks/pdf/render/qt_hack.sip']
-                 ),
- 
--    Extension('unrar',
--              ['unrar/%s.cpp'%(x.partition('.')[0]) for x in '''
--               rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o
--               filefn.o filcreat.o archive.o arcread.o unicode.o system.o
--               isnt.o crypt.o crc.o rawread.o encname.o resource.o match.o
--               timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o
--               secpassword.o rijndael.o getbits.o sha1.o extinfo.o extract.o
--               volume.o list.o find.o unpack.o cmddata.o filestr.o scantree.o
--               '''.split()] + ['calibre/utils/unrar.cpp'],
--              inc_dirs=['unrar'],
--              cflags=[('/' if iswindows else '-') + x for x in (
--                  'DSILENT', 'DRARDLL', 'DUNRAR')] + (
--                  [] if iswindows else ['-D_FILE_OFFSET_BITS=64',
--                                        '-D_LARGEFILE_SOURCE']),
--              optimize_level=2,
--              libraries=['User32', 'Advapi32', 'kernel32', 'Shell32'] if iswindows else []
--              ),
--
-     ]
- 
- 
+diff --git a/setup/extensions.json b/setup/extensions.json
+index 6f3e7d9..3ba2c85 100644
+--- a/setup/extensions.json
++++ b/setup/extensions.json
+@@ -211,14 +211,5 @@
+         "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
+         "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
+         "libraries": "mtp"
+-    },
+-    {
+-        "name": "unrar",
+-        "sources": "unrar/rar.cpp unrar/strlist.cpp unrar/strfn.cpp unrar/pathfn.cpp unrar/savepos.cpp unrar/smallfn.cpp unrar/global.cpp unrar/file.cpp unrar/filefn.cpp unrar/filcreat.cpp unrar/archive.cpp unrar/arcread.cpp unrar/unicode.cpp unrar/system.cpp unrar/isnt.cpp unrar/crypt.cpp unrar/crc.cpp unrar/rawread.cpp unrar/encname.cpp unrar/resource.cpp unrar/match.cpp unrar/timefn.cpp unrar/rdwrfn.cpp unrar/consio.cpp unrar/options.cpp unrar/ulinks.cpp unrar/errhnd.cpp unrar/rarvm.cpp unrar/secpassword.cpp unrar/rijndael.cpp unrar/getbits.cpp unrar/sha1.cpp unrar/extinfo.cpp unrar/extract.cpp unrar/volume.cpp unrar/list.cpp unrar/find.cpp unrar/unpack.cpp unrar/cmddata.cpp unrar/filestr.cpp unrar/scantree.cpp calibre/utils/unrar.cpp",
+-        "inc_dirs": "unrar",
+-        "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE",
+-        "windows_defines": "SILENT RARDLL UNRAR",
+-        "optimize_level": 2,
+-        "windows_libraries": "User32 Advapi32 kernel32 Shell32"
+     }
+ ]
 diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py
 index 539ec35..f0537d9 100644
 --- a/setup/installer/windows/freeze.py
@@ -101,10 +91,10 @@ index 539ec35..f0537d9 100644
                          # dupypy crashes when loaded from the zip file
                          'dukpy.pyd',
 diff --git a/setup/resources.py b/setup/resources.py
-index df11ac2..29c7792 100644
+index 6a0d122..52fc25f 100644
 --- a/setup/resources.py
 +++ b/setup/resources.py
-@@ -324,7 +324,7 @@ class Resources(Command):  # {{{
+@@ -363,7 +363,7 @@ class Resources(Command):  # {{{
              log = Log()
              # log.outputs = []
              for inf in supported_input_formats():
@@ -114,7 +104,7 @@ index df11ac2..29c7792 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 4a62a5f..b52cca0 100644
+index d264168..9e6242b 100644
 --- a/src/calibre/__init__.py
 +++ b/src/calibre/__init__.py
 @@ -273,10 +273,7 @@ def extract(path, dir):
@@ -140,7 +130,7 @@ index 4a62a5f..b52cca0 100644
          raise Exception('Unknown archive type')
      extractor(path, dir)
 diff --git a/src/calibre/constants.py b/src/calibre/constants.py
-index 4244cbf..4dcb8e4 100644
+index 5e97eaf..be11c90 100644
 --- a/src/calibre/constants.py
 +++ b/src/calibre/constants.py
 @@ -141,7 +141,6 @@ class Plugins(collections.Mapping):
@@ -152,7 +142,7 @@ index 4244cbf..4dcb8e4 100644
                  'qt_hack',
                  '_regex',
 diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
-index 6392bdf..ea987d0 100644
+index 428b9ba..f7d483a 100644
 --- a/src/calibre/customize/builtins.py
 +++ b/src/calibre/customize/builtins.py
 @@ -127,7 +127,7 @@ plugins += [HTML2ZIP, PML2PMLZ, TXT2TXTZ, ArchiveExtract,]
@@ -217,10 +207,10 @@ index 81e80c0..412ea1a 100644
  
  
 diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
-index 40f1fdf..6bd09e6 100644
+index 7a82779..8c6479a 100644
 --- a/src/calibre/devices/kobo/driver.py
 +++ b/src/calibre/devices/kobo/driver.py
-@@ -77,7 +77,7 @@ class KOBO(USBMS):
+@@ -76,7 +76,7 @@ class KOBO(USBMS):
      book_class = Book
  
      # Ordered list of supported formats
@@ -374,10 +364,10 @@ index 96fc0de..996368d 100644
      if comment:
          import json
 diff --git a/src/calibre/ebooks/oeb/iterator/book.py b/src/calibre/ebooks/oeb/iterator/book.py
-index 437d1aa..af15764 100644
+index 47ac055..a48fe8d 100644
 --- a/src/calibre/ebooks/oeb/iterator/book.py
 +++ b/src/calibre/ebooks/oeb/iterator/book.py
-@@ -147,7 +147,7 @@ class EbookIterator(BookmarksMixin):
+@@ -148,7 +148,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')
@@ -460,10 +450,10 @@ index ea2463c..24c3698 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 1474f92..31251ed 100644
+index 05367bf..08d96f1 100644
 --- a/src/calibre/test_build.py
 +++ b/src/calibre/test_build.py
-@@ -166,10 +166,6 @@ class BuildTest(unittest.TestCase):
+@@ -168,10 +168,6 @@ class BuildTest(unittest.TestCase):
          from calibre.gui2.win_file_dialogs import test
          test()
  
@@ -691,7 +681,7 @@ index 16085cf..420efaa 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 64522dd..ccd968b 100644
+index 602deb0..e329cb7 100644
 --- a/translations/calibre/main.pot
 +++ b/translations/calibre/main.pot
 @@ -4405,7 +4405,7 @@ msgid "Set book ID"
@@ -703,7 +693,7 @@ index 64522dd..ccd968b 100644
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652
-@@ -12759,7 +12759,7 @@ msgid "You can also customise the plugin locations using <b>Preferences -> Custo
+@@ -12754,7 +12754,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