Merge branch 'master' of git://git.parabola.nu/abslibre/abslibre

3 files changed, 49 insertions, 66 deletions

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 <kovid at kovidgoyal.net>'
@@ -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 00aa67f40..de610dbbf 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -10,8 +10,8 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgname=calibre
-pkgver=2.82.0
-pkgrel=1.parabola2
+pkgver=2.83.0
+pkgrel=2.parabola1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://calibre-ebook.com/"
@@ -23,7 +23,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'python2-pyqt5' 'python2-psutil' 'icu' 'libmtp' 'python2-dbus'
          'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
          'qt5-svg' 'python2-chardet' 'python2-pygments' 'mtdev'
-         'desktop-file-utils' 'gtk-update-icon-cache' 'optipng' 'udisks2' 'mesa')
+         'desktop-file-utils' 'gtk-update-icon-cache' 'optipng' 'udisks2')
 makedepends=('qt5-x11extras' 'xdg-utils')
 optdepends=('ipython2: to use calibre-debug'
             'poppler: required for converting pdf to html'
@@ -31,17 +31,18 @@ optdepends=('ipython2: to use calibre-debug'
 replaces=($pkgname-libre)
 conflicts=($pkgname-libre)
 mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz"
-          "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig")
-source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.xz"
-        'libre.patch'
-        '0001-Remove-new_version_notification.patch'
-        '0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch')
-mksha256sums=('137995abe467fcb951c1d42583305ebec7b8ca403c44895e70f82a2d6156711c'
-              'SKIP')
-sha256sums=('4da07053bddca0c49c3bf315397f3f1dff319f74e63e8a961c3906e0eca4eb7d'
-            '9d57abfff30e0b02128aa32ee41e095ab9f16b52c358fda68b3cae3ab8b485b9'
-            '26bfd44cd360df3aff927c4834e1622fb16a89169a8cce4f68ea19b87e9e867b'
-            'bed99658f2545ec3112710d72a70b30ffaeddd03c12d51cfc2ee0972d2697e8b')
+          "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig"
+          'libre.patch'
+          '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(){
@@ -49,10 +50,6 @@ mksource(){
 
   # Remove nonfree unRAR utility files from the source
   rm -rv src/unrar
-}
-
-prepare(){
-  cd "${pkgname}-${pkgver}"
   
   # Remove nonfree rar/cbr support and references
   rm -v src/calibre/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}}
@@ -61,6 +58,10 @@ prepare(){
   patch -Np1 -i "${srcdir}/libre.patch"
   patch -Np1 -i "${srcdir}/0001-Remove-new_version_notification.patch"
   patch -Np1 -i "${srcdir}/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch"
+}
+
+prepare(){
+  cd "${pkgname}-${pkgver}"
 
   # Remove unneeded files and libs
   # FIXME: remove html5lib too, but the latest html5lib breaks calibre. And calibre
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 @@
- <file>images/mimetypes/svg.png</file>
- <file>images/mimetypes/odt.png</file>
- <file>images/mimetypes/epub.png</file>
--<file>images/mimetypes/cbr.png</file>
--<file>images/mimetypes/rar.png</file>
- <file>images/mimetypes/tpz.png</file>
- <file>images/mimetypes/djvu.png</file>
- <file>images/mimetypes/computer.png</file>
-@@ -218,4 +216,4 @@
- <file>images/mimetypes/html.png</file>
- <file>images/mimetypes/lrx.png</file>
- </qresource>
--</RCC>
-\ No newline at end of file
-+</RCC>
 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 @@
+ <file>images/mimetypes/html.png</file>
+ <file>images/mimetypes/xps.png</file>
+ <file>images/mimetypes/svg.png</file>
+-<file>images/mimetypes/cbr.png</file>
+ <file>images/mimetypes/tpz.png</file>
+ <file>images/mimetypes/snb.png</file>
+ <file>images/mimetypes/png.png</file>
+-<file>images/mimetypes/rar.png</file>
+ <file>images/mimetypes/mobi.png</file>
+ <file>images/mimetypes/gif.png</file>
+ <file>images/mimetypes/pdf.png</file>
+@@ -218,4 +216,4 @@
+ <file>images/plugins/plugin_updater_updates.png</file>
+ <file>images/plugins/plugin_upgrade_valid.png</file>
+ </qresource>
+-</RCC>
+\ No hay ningún carácter de nueva línea al final del fichero
++</RCC>