···

       
5
       
5
       
 
       
}:

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
stdenv.mkDerivation rec {

     

       
8
       
8
       
-
       
  version = "2.58.0";

     

       
8
       
8
       
+
       
  version = "2.64.0";

     

       
9
       
9
       
 
       
  name = "calibre-${version}";

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
  src = fetchurl {

     

       
12
       
12
       
 
       
    url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";

     

       
13
       
13
       
-
       
    sha256 = "0npqvfjqj1vwa7nmnsyd4d30z40brydw275ldf1jankrp6dr9dyd";

     

       
13
       
13
       
+
       
    sha256 = "0jjbkhd3n7rh5q6cl6yy51hyjbxmgm6xj7i2a1d3h2ggrip1zmr9";

     

       
14
       
14
       
 
       
  };

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
  inherit python;

     

···

       
3
       
3
       
 
       
Forwarded: not-needed

     

       
4
       
4
       
 
       
Last-Update: 2013-04-04

     

       
5
       
5
       
 
       


     

       
6
       
6
       
-
       
Index: calibre/setup/extensions.py

     

       
6
       
6
       
+
       
Index: calibre/setup/extensions.json

     

       
7
       
7
       
 
       
===================================================================

     

       
8
       
8
       
-
       
--- calibre.orig/setup/extensions.py	2014-02-02 10:42:14.510954007 +0100

     

       
9
       
9
       
-
       
+++ calibre/setup/extensions.py	2014-02-02 10:42:14.502954007 +0100

     

       
10
       
10
       
-
       
@@ -209,24 +209,6 @@

     

       
11
       
11
       
-
       
                 sip_files=['calibre/ebooks/pdf/render/qt_hack.sip']

     

       
12
       
12
       
-
       
                 ),

     

       
13
       
13
       
-
       
 

     

       
14
       
14
       
-
       
-    Extension('unrar',

     

       
15
       
15
       
-
       
-              ['unrar/%s.cpp'%(x.partition('.')[0]) for x in '''

     

       
16
       
16
       
-
       
-               rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o

     

       
17
       
17
       
-
       
-               filefn.o filcreat.o archive.o arcread.o unicode.o system.o

     

       
18
       
18
       
-
       
-               isnt.o crypt.o crc.o rawread.o encname.o resource.o match.o

     

       
19
       
19
       
-
       
-               timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o

     

       
20
       
20
       
-
       
-               secpassword.o rijndael.o getbits.o sha1.o extinfo.o extract.o

     

       
21
       
21
       
-
       
-               volume.o list.o find.o unpack.o cmddata.o filestr.o scantree.o

     

       
22
       
22
       
-
       
-               '''.split()] + ['calibre/utils/unrar.cpp'],

     

       
23
       
23
       
-
       
-              inc_dirs=['unrar'],

     

       
24
       
24
       
-
       
-              cflags=[('/' if iswindows else '-') + x for x in (

     

       
25
       
25
       
-
       
-                  'DSILENT', 'DRARDLL', 'DUNRAR')] + (

     

       
26
       
26
       
-
       
-                  [] if iswindows else ['-D_FILE_OFFSET_BITS=64',

     

       
27
       
27
       
-
       
-                                        '-D_LARGEFILE_SOURCE']),

     

       
28
       
28
       
-
       
-              optimize_level=2,

     

       
29
       
29
       
-
       
-              libraries=['User32', 'Advapi32', 'kernel32', 'Shell32'] if iswindows else []

     

       
30
       
30
       
-
       
-              ),

     

       
31
       
31
       
-
       
-

     

       
32
       
32
       
-
       
     ]

     

       
33
       
33
       
-
       
 

     

       
34
       
34
       
-
       
 

     

       
8
       
8
       
+
       
--- calibre.orig/setup/extensions.json

     

       
9
       
9
       
+
       
+++ calibre/setup/extensions.json

     

       
10
       
10
       
+
       
@@ -211,14 +211,5 @@

     

       
11
       
11
       
+
       
         "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",

     

       
12
       
12
       
+
       
         "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",

     

       
13
       
13
       
+
       
         "libraries": "mtp"

     

       
14
       
14
       
+
       
-    },

     

       
15
       
15
       
+
       
-    {

     

       
16
       
16
       
+
       
-        "name": "unrar",

     

       
17
       
17
       
+
       
-        "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",

     

       
18
       
18
       
+
       
-        "inc_dirs": "unrar",

     

       
19
       
19
       
+
       
-        "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE",

     

       
20
       
20
       
+
       
-        "windows_defines": "SILENT RARDLL UNRAR",

     

       
21
       
21
       
+
       
-        "optimize_level": 2,

     

       
22
       
22
       
+
       
-        "windows_libraries": "User32 Advapi32 kernel32 Shell32"

     

       
23
       
23
       
+
       
     }

     

       
24
       
24
       
+
       
 ]

     

       
35
       
25
       
 
       
Index: calibre/src/calibre/ebooks/metadata/archive.py

     

       
36
       
26
       
 
       
===================================================================

     

       
37
       
27
       
 
       
--- calibre.orig/src/calibre/ebooks/metadata/archive.py	2014-02-02 10:42:14.510954007 +0100