Commit 113ac3eb authored by abveritas's avatar abveritas

calibre update

parent 16cf2801
......@@ -7,7 +7,7 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=calibre
pkgver=0.8.2
pkgver=0.8.3
pkgrel=1
pkgdesc="Ebook management application"
arch=('i686' 'x86_64')
......@@ -22,13 +22,13 @@ optdepends=('ipython: to use calibre-debug')
install=calibre.install
source=(http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
desktop_integration.patch)
md5sums=('e64c92ccf29ac17bfaf4a296e17a38ba'
'bcc538a3b004429bf8f5a0ac1d89a37f')
md5sums=('aee05cac444f68491f2a3d68b22da53e'
'f4b80e3b34e34bce68b3f052ff52dee8')
build() {
cd "${pkgname}"
cd "${srcdir}/${pkgname}"
rm -rf src/{cherrypy,pyPdf}
rm -rf src/cherrypy
sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
$(find . -regex ".*.py\|.*.recipe")
......
diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py
--- calibre.orig//src/calibre/linux.py 2010-09-17 22:38:02.000000000 +0200
+++ calibre/src/calibre/linux.py 2010-09-19 15:50:15.029705851 +0200
@@ -334,52 +323,39 @@ class PostInstall:
--- a/src/calibre/linux.py 2011-05-27 18:42:14.000000000 +0200
+++ b/src/calibre/linux.py 2011-05-29 14:57:49.000000000 +0200
@@ -340,51 +340,39 @@
with TemporaryDirectory() as tdir:
with CurrentDir(tdir):
......@@ -26,7 +25,7 @@ diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py
mimetypes = set([])
for x in all_input_formats():
mt = guess_type('dummy.'+x)[0]
- if mt and 'chemical' not in mt:
- if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
+ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
mimetypes.add(mt)
......@@ -52,11 +51,10 @@ diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py
- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
- 'calibre-ebook-viewer.desktop')
- for x in des:
- cmd = ['xdg-desktop-menu', 'install', './'+x]
- if x != des[-1]:
- cmd.insert(2, '--noupdate')
- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
- check_call(' '.join(cmd), shell=True)
- self.menu_resources.append(x)
- check_call(['xdg-desktop-menu', 'forceupdate'])
- f = open('calibre-mimetypes', 'wb')
+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
+ os.makedirs(dir)
......
......@@ -18,7 +18,7 @@ url="http://java.sun.com"
depends=('glibc' 'jre')
install="jdk.install"
source=(http://download.oracle.com/otn-pub/java/jdk/6u25-b06/jdk-${pkgver}-linux-${ARCH}.bin
https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh
construct.sh::http://java.net/projects/jdk-distros/sources/svn/content/trunk/utils/construct.sh?raw=true
jdk.profile
jdk.profile.csh
java-control-panel.desktop
......@@ -26,7 +26,7 @@ source=(http://download.oracle.com/otn-pub/java/jdk/6u25-b06/jdk-${pkgver}-linux
java-policy-settings.desktop
java-visualvm.desktop
java-web-start.desktop)
[ "$CARCH" = "i686" ] && md5sums=('3acbe2368cfb5149b04f980184331e33'
[ "$CARCH" = "i686" ] && md5sums=('be431aaedd0d129757ce36018d3f8aef'
'94065b612df0046d9ae758943f9f6a75'
'7aaac9ec3e440b92361c6561ac00424a'
'6f4cbf332816d2c4e9578ecd1d0dce7f'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment