summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorfauno <fauno@endefensadelsl.org>2017-05-08 20:17:04 -0300
committerfauno <fauno@endefensadelsl.org>2017-05-08 20:17:04 -0300
commit1dc35dfeb620ba69a2bf98f851004a8a3910e6bf (patch)
tree704d62e38d22b78f2ce47d45f40d6010ac29c05c /libre
parent76c5bdc462d20d7f3cab5b4a1cce4aef3fdfc262 (diff)
parent0a460333cde2921bb6075fd5e1c18dfa4c5e8ada (diff)
downloadabslibre-1dc35dfeb620ba69a2bf98f851004a8a3910e6bf.tar.gz
abslibre-1dc35dfeb620ba69a2bf98f851004a8a3910e6bf.tar.bz2
abslibre-1dc35dfeb620ba69a2bf98f851004a8a3910e6bf.zip
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch4
-rw-r--r--libre/calibre/PKGBUILD11
-rw-r--r--libre/calibre/libre.patch4
3 files changed, 10 insertions, 9 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 9610b29f8..443d9968b 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,5 +1,5 @@
---- 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
+--- calibre-2.84.0/src/calibre/gui2/update.py.orig 2017-04-26 14:55:30.824093338 -0300
++++ calibre-2.84.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>'
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index de610dbbf..f4bfa672b 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -6,12 +6,12 @@
# Contributor (Arch): Andrea Fagiani <andfagiani _at_ gmail dot com>
# Contributor (Arch): Larry Hajali <larryhaja@gmail.com>
# Contributor (Arch): Eli Schwartz <eschwartz93@gmail.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: André Silva <emulatorman@parabola.nu>
# Contributor: Márcio Silva <coadde@parabola.nu>
pkgname=calibre
-pkgver=2.83.0
-pkgrel=2.parabola1
+pkgver=2.84.0
+pkgrel=1.parabola
pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
arch=('i686' 'x86_64' 'armv7h')
url="https://calibre-ebook.com/"
@@ -35,13 +35,14 @@ mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.x
'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})
+source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
+ "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig")
mksha512sums=('a28aa52379bc317e648087b28859a8e2c50dd4e2ccb3352e135f896ad95ab9c85c1fba162fe3acd5056be80e7c4e9481ea1396cb638661cfdb27795051124821'
'SKIP'
'14800a1895fd8a5e942e282688081c607730e866e825df53918c49d973ae3e6eb78a5d48354b6e1cf58953e8e0cf9ca030e9278ec296f8de222c9bd8b2945bf4'
'd95ea4e9911b62d466c2a590746c2a42c38834988bd505df7a0af3a76bde9d273f0ada405eb12ef0506da0a098d31adabe5b1b44acd23db8349ffd233d1c1b1d'
'f81c2f269399a44763ca77a5ceb4031ea0efd06e87b7c0e3a34cbf5765b0ee35ba66373a3d721bdfc947085994066cca77546bada2c39a6cbb5a4743a5c4fa04')
-sha512sums=('cd1a2aea95e5d0b4f3ddf7a75e45da6076e1e3c56619dce38bbce4fb2533e792a663f7a8754e894da6ff5943349e375c58c0b11ac1f7b7f81e4a7c05de507423'
+sha512sums=('83bd3b6393f7d7bf6f5bb8496444b5973df144dcf9be8d7e0b1fb21ec456a30c2abb5cf4090ecaa18cf97ffc9272e483a89ee3bbd294c5a31d1228e7b44fd275'
'SKIP')
validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index 739322d7a..06525e2a3 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -685,8 +685,8 @@ 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
+--- calibre-2.84.0/resources/images.qrc.orig 2017-04-13 00:02:36.000000000 -0300
++++ calibre-2.84.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>