calibre-2.7.0-1.parabola1: updating version

2 files changed, 27 insertions, 30 deletions

diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 02d14dad8..929895226 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 120860 2014-10-17 11:09:23Z jelle $
+# $Id: PKGBUILD 121338 2014-10-24 08:49:32Z jelle $
 # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 pkgname=calibre
 _pkgname=$pkgname-libre
-pkgver=2.6.0
+pkgver=2.7.0
 pkgrel=1.parabola1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -32,9 +32,9 @@ install=$pkgname.install
 mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz")
 source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"
         'libre.patch')
-mkmd5sums=('41af42783b9001f06035fc6f2360090f')
-md5sums=('c80666bd9a1168190e0f9f52d9ae0010'
-         '2c83d9289f381054ff279358ccd31d61')
+mkmd5sums=('12c27a495deff79571867edc51a52f06')
+md5sums=('039198cd20e0a6cc6701c23185d3ef55'
+         'ca0d5aec7495a0709be2d42f49067247')
 
 mksource(){
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index 449864c17..1c84d029a 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -1,21 +1,18 @@
-diff -Nur calibre-2.5.0.orig/resources/images.qrc calibre-2.5.0/resources/images.qrc
---- calibre-2.5.0.orig/resources/images.qrc	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.5.0/resources/images.qrc	2014-10-04 19:24:44.275781452 -0300
-@@ -179,11 +179,9 @@
- <file>images/mimetypes/html.png</file>
- <file>images/mimetypes/xps.png</file>
+diff -Nur calibre-2.7.0.orig/resources/images.qrc calibre-2.7.0/resources/images.qrc
+--- calibre-2.7.0.orig/resources/images.qrc	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.7.0/resources/images.qrc	2014-10-24 15:04:21.821294414 -0200
+@@ -194,8 +194,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/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>
-@@ -214,4 +212,4 @@
- <file>images/plugins/plugin_updater_updates.png</file>
- <file>images/plugins/plugin_upgrade_valid.png</file>
+ <file>images/mimetypes/tpz.png</file>
+ <file>images/mimetypes/djvu.png</file>
+ <file>images/mimetypes/computer.png</file>
+@@ -215,4 +213,4 @@
+ <file>images/mimetypes/html.png</file>
+ <file>images/mimetypes/lrx.png</file>
  </qresource>
 -</RCC>
 \ No newline at end of file
@@ -371,10 +368,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-1
          for i in ordered:
              spath = i.path
              mt = None
-diff -Nur calibre-1.204.1.orig/src/calibre/gui2/__init__.py calibre-1.204.1/src/calibre/gui2/__init__.py
---- calibre-1.204.1.orig/src/calibre/gui2/__init__.py	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/gui2/__init__.py	2014-08-03 19:37:20.290255565 -0300
-@@ -497,7 +497,6 @@
+diff -Nur calibre-2.7.0.orig/src/calibre/gui2/__init__.py calibre-2.7.0/src/calibre/gui2/__init__.py
+--- calibre-2.7.0.orig/src/calibre/gui2/__init__.py	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.7.0/src/calibre/gui2/__init__.py	2014-10-24 15:03:21.457620008 -0200
+@@ -499,7 +499,6 @@
               'png'     : 'png',
               'bmp'     : 'bmp',
               'cbz'     : 'cbz',
@@ -382,7 +379,7 @@ diff -Nur calibre-1.204.1.orig/src/calibre/gui2/__init__.py calibre-1.204.1/src/
               'svg'     : 'svg',
               'html'    : 'html',
               'htmlz'   : 'html',
-@@ -509,7 +508,6 @@
+@@ -511,7 +510,6 @@
               'lrx'     : 'lrx',
               'pdf'     : 'pdf',
               'pdr'     : 'zero',
@@ -708,10 +705,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py calibre-1.204
  
      def __init__(self, data, baseuri, encoding):
          self.document = BeautifulSoup.BeautifulSoup(data)
-diff -Nur calibre-2.5.0.orig/translations/calibre/main.pot calibre-2.5.0/translations/calibre/main.pot
---- calibre-2.5.0.orig/translations/calibre/main.pot	1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.5.0/translations/calibre/main.pot	2014-10-04 19:23:44.131936026 -0300
-@@ -4028,7 +4028,7 @@
+diff -Nur calibre-2.7.0.orig/translations/calibre/main.pot calibre-2.7.0/translations/calibre/main.pot
+--- calibre-2.7.0.orig/translations/calibre/main.pot	1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.7.0/translations/calibre/main.pot	2014-10-24 15:03:21.464286712 -0200
+@@ -4032,7 +4032,7 @@
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42
@@ -720,7 +717,7 @@ diff -Nur calibre-2.5.0.orig/translations/calibre/main.pot calibre-2.5.0/transla
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652
-@@ -11554,7 +11554,7 @@
+@@ -11573,7 +11573,7 @@
  msgstr ""
  
  #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33