···

       
1
       
1
       
 
       
{ lib

     

       
2
       
2
       
 
       
, mkDerivation

     

       
3
       
3
       
 
       
, fetchurl

     

       
4
       
4
       
+
       
, fetchpatch

     

       
4
       
5
       
 
       
, poppler_utils

     

       
5
       
6
       
 
       
, pkg-config

     

       
6
       
7
       
 
       
, libpng

     
···

       
26
       
27
       
 
       


     

       
27
       
28
       
 
       
mkDerivation rec {

     

       
28
       
29
       
 
       
  pname = "calibre";

     

       
29
       
29
       
-
       
  version = "5.24.0";

     

       
30
       
30
       
+
       
  version = "5.29.0";

     

       
30
       
31
       
 
       


     

       
31
       
32
       
 
       
  src = fetchurl {

     

       
32
       
33
       
 
       
    url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";

     

       
33
       
33
       
-
       
    hash = "sha256:18dr577nv7ijw3ar6mrk2xrc54mlrqkaj5jrc6s5sirl0710fdfg";

     

       
34
       
34
       
+
       
    sha256 = "sha256-9ymHEpTHDUM3NAGoeSETzKRLKgJLRY4eEli6N5lbZug=";

     

       
34
       
35
       
 
       
  };

     

       
35
       
36
       
 
       


     

       
37
       
37
       
+
       
  # https://sources.debian.org/patches/calibre/5.29.0+dfsg-1

     

       
36
       
38
       
 
       
  patches = [

     

       
37
       
37
       
-
       
    # Plugin installation (very insecure) disabled (from Debian)

     

       
38
       
38
       
-
       
    ./disable_plugins.patch

     

       
39
       
39
       
-
       
    # Automatic version update disabled by default (from Debian)

     

       
40
       
40
       
-
       
    ./no_updates_dialog.patch

     

       
39
       
39
       
+
       
    #  allow for plugin update check, but no calibre version check

     

       
40
       
40
       
+
       
    (fetchpatch {

     

       
41
       
41
       
+
       
      name = "0001_only_plugin_update.patch";

     

       
42
       
42
       
+
       
      url = "https://sources.debian.org/data/main/c/calibre/5.29.0%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch";

     

       
43
       
43
       
+
       
      sha256 = "sha256-aGT8rJ/eQKAkmyHBWdY0ouZuWvDwtLVJU5xY6d3hY3k=";

     

       
44
       
44
       
+
       
    })

     

       
41
       
45
       
 
       
  ]

     

       
42
       
46
       
 
       
  ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;

     

       
43
       
47
       
 
       


     

···

       
1
       
1
       
-
       
Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code.

     

       
2
       
2
       
-
       
Author: Martin Pitt <mpitt@debian.org>

     

       
3
       
3
       
-
       
Bug-Debian: http://bugs.debian.org/640026

     

       
4
       
4
       
-
       


     

       
5
       
5
       
-
       
Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py

     

       
6
       
6
       
-
       
===================================================================

     

       
7
       
7
       
-
       
--- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py	2011-12-16 05:49:14.000000000 +0100

     

       
8
       
8
       
-
       
+++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py	2011-12-20 19:29:04.798468930 +0100

     

       
9
       
9
       
-
       
@@ -28,8 +28,6 @@

     

       
10
       
10
       
-
       
             pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)

     

       
11
       
11
       
-
       
         cm('welcome wizard', _('Run welcome wizard'),

     

       
12
       
12
       
-
       
                 icon='wizard.png', triggered=self.gui.run_wizard)

     

       
13
       
13
       
-
       
-        cm('plugin updater', _('Get plugins to enhance calibre'),

     

       
14
       
14
       
-
       
-                icon='plugins/plugin_updater.png', triggered=self.get_plugins)

     

       
15
       
15
       
-
       
         if not DEBUG:

     

       
16
       
16
       
-
       
             pm.addSeparator()

     

       
17
       
17
       
-
       
             cm('restart', _('Restart in debug mode'), icon='debug.png',

     

···

       
1
       
1
       
-
       
diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py

     

       
2
       
2
       
-
       
--- calibre-2.9.0.orig/src/calibre/gui2/main.py	2014-11-09 20:09:54.081231882 +0800

     

       
3
       
3
       
-
       
+++ calibre-2.9.0/src/calibre/gui2/main.py	2014-11-09 20:15:48.193033844 +0800

     

       
4
       
4
       
-
       
@@ -37,8 +37,9 @@

     

       
5
       
5
       
-
       
                       help=_('Start minimized to system tray.'))

     

       
6
       
6
       
-
       
     parser.add_option('-v', '--verbose', default=0, action='count',

     

       
7
       
7
       
-
       
                       help=_('Ignored, do not use. Present only for legacy reasons'))

     

       
8
       
8
       
-
       
-    parser.add_option('--no-update-check', default=False, action='store_true',

     

       
9
       
9
       
-
       
-            help=_('Do not check for updates'))

     

       
10
       
10
       
-
       
+    parser.add_option('--update-check', dest='no_update_check', default=True,

     

       
11
       
11
       
-
       
+            action='store_false',

     

       
12
       
12
       
-
       
+            help=_('Check for updates'))

     

       
13
       
13
       
-
       
     parser.add_option('--ignore-plugins', default=False, action='store_true',

     

       
14
       
14
       
-
       
             help=_('Ignore custom plugins, useful if you installed a plugin'

     

       
15
       
15
       
-
       
                 ' that is preventing calibre from starting'))