summaryrefslogtreecommitdiff
path: root/libre/calibre-libre
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-03-04 00:03:49 -0800
committerroot <root@rshg054.dnsready.net>2013-03-04 00:03:49 -0800
commit3a8d026e8e859ff4c9aa813d5f1eb2afa5663e78 (patch)
tree48288f077555b04e1dd7cec1e637aeb94a322f0c /libre/calibre-libre
parent945c9cd1e94fab87653f84598812dec707843d26 (diff)
Mon Mar 4 00:03:48 PST 2013
Diffstat (limited to 'libre/calibre-libre')
-rw-r--r--libre/calibre-libre/PKGBUILD10
-rw-r--r--libre/calibre-libre/desktop_integration.patch12
2 files changed, 11 insertions, 11 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 125a8b3d6..ba4ff1d0c 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -6,8 +6,8 @@
_pkgname=calibre
pkgname=calibre-libre
-pkgver=0.9.20
-pkgrel=1
+pkgver=0.9.21
+pkgrel=2
pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
arch=('i686' 'x86_64')
url="http://calibre-ebook.com/"
@@ -18,7 +18,7 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
'python2-imaging' 'shared-mime-info' 'python2-dnspython'
'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp'
'python2-netifaces' 'python2-cssselect')
-makedepends=('python2-pycountry' 'qt-private-headers')
+makedepends=('python2-pycountry' 'qt4-private-headers')
optdepends=('ipython2: to use calibre-debug')
replaces=$_pkgname
conflicts=$_pkgname
@@ -27,8 +27,8 @@ install=calibre.install
source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
'desktop_integration.patch'
'calibre-mount-helper')
-md5sums=('860b4b28029ae40e5ea59ec4f50b1144'
- '42c07b43d575b5e7e7524bd7b9528f0e'
+md5sums=('ee0e2d2dc735efcc573d1f77d64acf7e'
+ '8353d1878c5a498b3e49eddef473605f'
'675cd87d41342119827ef706055491e7')
build() {
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch
index 4c756f5d4..2c6f07672 100644
--- a/libre/calibre-libre/desktop_integration.patch
+++ b/libre/calibre-libre/desktop_integration.patch
@@ -1,6 +1,6 @@
---- a/src/calibre/linux.py 2012-09-21 06:56:20.000000000 +0200
-+++ b/src/calibre/linux.py 2012-09-22 18:51:12.000000000 +0200
-@@ -179,19 +179,6 @@
+--- a/src/calibre/linux.py 2013-03-01 05:49:28.000000000 +0100
++++ b/src/calibre/linux.py 2013-03-03 14:53:05.000000000 +0100
+@@ -447,19 +447,6 @@
self.setup_completion()
if islinux or isbsd:
self.setup_desktop_integration()
@@ -20,7 +20,7 @@
if warn is None and self.warnings:
self.info('There were %d warnings'%len(self.warnings))
for args, kwargs in self.warnings:
-@@ -237,7 +224,7 @@
+@@ -508,7 +495,7 @@
if isnetbsd:
f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
else:
@@ -28,8 +28,8 @@
+ f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
if not os.path.exists(os.path.dirname(f)):
os.makedirs(os.path.dirname(f))
- self.manifest.append(f)
-@@ -357,63 +344,39 @@
+ if zsh.dest:
+@@ -651,63 +638,39 @@
with TemporaryDirectory() as tdir, CurrentDir(tdir), \
PreserveMIMEDefaults():