From bfa41cc99d7b265b64e95bd58bb233af7361653a Mon Sep 17 00:00:00 2001 From: fauno Date: Wed, 26 Apr 2017 16:45:21 -0300 Subject: calibre: correct patches --- ...-that-contacts-calibre-servers-to-check-u.patch | 37 +++++-------------- libre/calibre/PKGBUILD | 7 ++++ libre/calibre/libre.patch | 41 +++++++++++----------- 3 files changed, 37 insertions(+), 48 deletions(-) (limited to 'libre') diff --git a/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch b/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch index 2b9a51f57..9610b29f8 100644 --- a/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch +++ b/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch @@ -1,7 +1,5 @@ -diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py -index 3e294cac3..580f736ef 100644 ---- a/src/calibre/gui2/update.py -+++ b/src/calibre/gui2/update.py +--- calibre-2.83.0/src/calibre/gui2/update.py.orig 2017-04-26 14:55:30.824093338 -0300 ++++ calibre-2.83.0/src/calibre/gui2/update.py 2017-04-26 15:00:09.807495982 -0300 @@ -1,19 +1,17 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' @@ -27,7 +25,7 @@ index 3e294cac3..580f736ef 100644 from calibre.gui2.dialogs.plugin_updater import get_plugin_updates_available URL = 'https://code.calibre-ebook.com/latest' -@@ -30,35 +28,7 @@ def get_download_url(): +@@ -30,35 +28,7 @@ def get_newest_version(): @@ -64,7 +62,7 @@ index 3e294cac3..580f736ef 100644 class Signal(QObject): -@@ -81,12 +51,6 @@ class CheckForUpdates(Thread): +@@ -81,12 +51,6 @@ calibre_update_version = NO_CALIBRE_UPDATE plugins_update_found = 0 try: @@ -77,35 +75,18 @@ index 3e294cac3..580f736ef 100644 update_plugins = get_plugin_updates_available(raise_error=True) if update_plugins is not None: plugins_update_found = len(update_plugins) -@@ -200,22 +164,15 @@ class UpdateMixin(object): +@@ -193,13 +157,7 @@ self.status_bar.update_label.setText(msg) self.status_bar.update_label.setVisible(True) - if has_calibre_update: -- if (force or (config.get('new_version_notification') and -- dynamic.get('update to version %s'%calibre_version, True))): +- if force: - if not no_show_popup: - self._update_notification__ = UpdateNotification(calibre_version, - number_of_plugin_updates, parent=self) - self._update_notification__.show() - elif has_plugin_updates: -- if force: -- from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog, -- FILTER_UPDATE_AVAILABLE) -- d = PluginUpdaterDialog(self, -- initial_filter=FILTER_UPDATE_AVAILABLE) -- d.exec_() -- if d.do_restart: -- self.quit(restart=True) + if has_plugin_updates: -+ if force: -+ from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog, -+ FILTER_UPDATE_AVAILABLE) -+ d = PluginUpdaterDialog(self, -+ initial_filter=FILTER_UPDATE_AVAILABLE) -+ d.exec_() -+ if d.do_restart: -+ self.quit(restart=True) - - def plugin_update_found(self, number_of_updates): - # Change the plugin icon to indicate there are updates available + if force: + from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog, + FILTER_UPDATE_AVAILABLE) diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index 29fae591f..de610dbbf 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -36,6 +36,13 @@ mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.x '0001-Remove-new_version_notification.patch' '0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch') source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.xz"{,.sig}) +mksha512sums=('a28aa52379bc317e648087b28859a8e2c50dd4e2ccb3352e135f896ad95ab9c85c1fba162fe3acd5056be80e7c4e9481ea1396cb638661cfdb27795051124821' + 'SKIP' + '14800a1895fd8a5e942e282688081c607730e866e825df53918c49d973ae3e6eb78a5d48354b6e1cf58953e8e0cf9ca030e9278ec296f8de222c9bd8b2945bf4' + 'd95ea4e9911b62d466c2a590746c2a42c38834988bd505df7a0af3a76bde9d273f0ada405eb12ef0506da0a098d31adabe5b1b44acd23db8349ffd233d1c1b1d' + 'f81c2f269399a44763ca77a5ceb4031ea0efd06e87b7c0e3a34cbf5765b0ee35ba66373a3d721bdfc947085994066cca77546bada2c39a6cbb5a4743a5c4fa04') +sha512sums=('cd1a2aea95e5d0b4f3ddf7a75e45da6076e1e3c56619dce38bbce4fb2533e792a663f7a8754e894da6ff5943349e375c58c0b11ac1f7b7f81e4a7c05de507423' + 'SKIP') validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') mksource(){ diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index ace7034e3..739322d7a 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -1,23 +1,3 @@ -diff --git a/resources/images.qrc b/resources/images.qrc -index c52874b78..2fee5e138 100644 ---- a/resources/images.qrc -+++ b/resources/images.qrc -@@ -197,8 +197,6 @@ - images/mimetypes/svg.png - images/mimetypes/odt.png - images/mimetypes/epub.png --images/mimetypes/cbr.png --images/mimetypes/rar.png - images/mimetypes/tpz.png - images/mimetypes/djvu.png - images/mimetypes/computer.png -@@ -218,4 +216,4 @@ - images/mimetypes/html.png - images/mimetypes/lrx.png - -- -\ No newline at end of file -+ diff --git a/resources/mime.types b/resources/mime.types index b8acaaa25..9ea4742a6 100644 --- a/resources/mime.types @@ -705,3 +685,24 @@ index fc85e1b7a..87b62caf3 100644 msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:51 +--- calibre-2.83.0/resources/images.qrc.orig 2017-04-13 00:02:36.000000000 -0300 ++++ calibre-2.83.0/resources/images.qrc 2017-04-26 14:52:54.508461078 -0300 +@@ -183,11 +183,9 @@ + images/mimetypes/html.png + images/mimetypes/xps.png + images/mimetypes/svg.png +-images/mimetypes/cbr.png + images/mimetypes/tpz.png + images/mimetypes/snb.png + images/mimetypes/png.png +-images/mimetypes/rar.png + images/mimetypes/mobi.png + images/mimetypes/gif.png + images/mimetypes/pdf.png +@@ -218,4 +216,4 @@ + images/plugins/plugin_updater_updates.png + images/plugins/plugin_upgrade_valid.png + +- +\ No hay ningún carácter de nueva línea al final del fichero ++ -- cgit v1.2.3