Date: Saturday, February 8, 2014 @ 13:20:57 Author: jelle Revision: 105453
upgpkg: calibre 1.23.0-1 Modified: calibre/trunk/PKGBUILD calibre/trunk/desktop_integration.patch ---------------------------+ PKGBUILD | 18 +++++++++--------- desktop_integration.patch | 21 +++++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-02-08 11:50:40 UTC (rev 105452) +++ PKGBUILD 2014-02-08 12:20:57 UTC (rev 105453) @@ -7,7 +7,7 @@ # Contributor: Larry Hajali <[email protected]> pkgname=calibre -pkgver=1.22.0 +pkgver=1.23.0 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -25,18 +25,18 @@ source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"; 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('51449736b887469a7dfd70d3fae68912' - '95ca4eb3afa7c737c8371708a23bdad9' +md5sums=('3146ce3cdcc0e626ee7f9b8f0bb1be13' + '8e1855ce1ae254c34d12ddbc358b7a36' '675cd87d41342119827ef706055491e7') prepare(){ -cd "${srcdir}/${pkgname}" -#rm -rf src/{cherrypy,pyPdf} -rm -rf src/cherrypy -rm -rf resources/${pkgname}-portable.* -sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + cd "${srcdir}/${pkgname}" + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy + rm -rf resources/${pkgname}-portable.* + sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py -# Fix for calibre-0.8.58 + # Fix for calibre-0.8.58 sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ Modified: desktop_integration.patch =================================================================== --- desktop_integration.patch 2014-02-08 11:50:40 UTC (rev 105452) +++ desktop_integration.patch 2014-02-08 12:20:57 UTC (rev 105453) @@ -1,6 +1,6 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py ---- calibre/src/calibre/linux.py 2013-12-13 03:47:23.000000000 +0100 -+++ calibre.new/src/calibre/linux.py 2013-12-17 20:11:58.319040313 +0100 +--- calibre/src/calibre/linux.py 2014-02-07 04:19:59.000000000 +0100 ++++ calibre.new/src/calibre/linux.py 2014-02-08 13:07:09.925693077 +0100 @@ -451,18 +451,6 @@ self.setup_completion() if islinux or isbsd: @@ -29,7 +29,7 @@ if not os.path.exists(os.path.dirname(f)): os.makedirs(os.path.dirname(f)) if zsh.dest: -@@ -657,71 +645,45 @@ +@@ -657,56 +645,37 @@ with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): @@ -99,12 +99,17 @@ f.write(GUI) write_mimetypes(f) f.close() -- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', -- 'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop') +@@ -725,15 +694,9 @@ + translators = dict(get_all_translators()) + + APPDATA = get_appdata() - for x in des: - cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] - cc(' '.join(cmd), shell=True) - self.menu_resources.append(x) +- ak = x.partition('.')[0] +- if ak in APPDATA and os.access(appdata, os.W_OK): +- write_appdata(ak, APPDATA[ak], appdata, translators) - cc(['xdg-desktop-menu', 'forceupdate']) - f = open('calibre-mimetypes.xml', 'wb') + dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') @@ -112,8 +117,4 @@ + f = open(os.path.join(dir, 'calibre.xml'), 'wb') f.write(MIME) f.close() -- self.mime_resources.append('calibre-mimetypes.xml') -- cc('xdg-mime install ./calibre-mimetypes.xml', shell=True) - except Exception: - if self.opts.fatal_errors: - raise + self.mime_resources.append('calibre-mimetypes.xml')
