JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

calibre: 2.58.0 -> 2.64.0 (#17771)

Browse Source 
Extension definitions were moved to extensions.json, so the patch
needed to be updated.
This commit is contained in:
cmfwyp 2016-08-17 07:20:39 -04:00 committed by Rok Garbas
parent 6aa729cf52
commit c403221af5
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/calibre/default.nix
View File

@ -5,12 +5,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.58.0"; version = "2.64.0";
name = "calibre-${version}"; name = "calibre-${version}";
src = fetchurl { src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
sha256 = "0npqvfjqj1vwa7nmnsyd4d30z40brydw275ldf1jankrp6dr9dyd"; sha256 = "0jjbkhd3n7rh5q6cl6yy51hyjbxmgm6xj7i2a1d3h2ggrip1zmr9";
}; };
inherit python; inherit python;

46
pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
View File

@ -3,35 +3,25 @@ Description: do not build unrar extension as we strip unrar from the tarball
Forwarded: not-needed Forwarded: not-needed
Last-Update: 2013-04-04 Last-Update: 2013-04-04
Index: calibre/setup/extensions.py Index: calibre/setup/extensions.json
=================================================================== ===================================================================
--- calibre.orig/setup/extensions.py 2014-02-02 10:42:14.510954007 +0100 --- calibre.orig/setup/extensions.json
+++ calibre/setup/extensions.py 2014-02-02 10:42:14.502954007 +0100 +++ calibre/setup/extensions.json
@@ -209,24 +209,6 @@ @@ -211,14 +211,5 @@
sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] "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"
- 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 - "name": "unrar",
- filefn.o filcreat.o archive.o arcread.o unicode.o system.o - "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",
- isnt.o crypt.o crc.o rawread.o encname.o resource.o match.o - "inc_dirs": "unrar",
- timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o - "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE",
- secpassword.o rijndael.o getbits.o sha1.o extinfo.o extract.o - "windows_defines": "SILENT RARDLL UNRAR",
- volume.o list.o find.o unpack.o cmddata.o filestr.o scantree.o - "optimize_level": 2,
- '''.split()] + ['calibre/utils/unrar.cpp'], - "windows_libraries": "User32 Advapi32 kernel32 Shell32"
- 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 []
- ),
-
]
Index: calibre/src/calibre/ebooks/metadata/archive.py Index: calibre/src/calibre/ebooks/metadata/archive.py
=================================================================== ===================================================================
--- calibre.orig/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.510954007 +0100 --- calibre.orig/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.510954007 +0100