Date: Saturday, August 2, 2014 @ 21:35:37
Author: jelle
Revision: 116757
upgpkg: calibre 1.204.0-1
updated calibre to qt5 beta version, removed calibre-mount-helper which isn't
needed anymore
Added:
calibre/trunk/fix_sip.patch
Modified:
calibre/trunk/PKGBUILD
calibre/trunk/desktop_integration.patch
Deleted:
calibre/trunk/calibre-mount-helper
---------------------------+
PKGBUILD | 35 +++++++++++++++++++----------------
calibre-mount-helper | 28 ----------------------------
desktop_integration.patch | 9 ---------
fix_sip.patch | 11 +++++++++++
4 files changed, 30 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-08-02 18:26:02 UTC (rev 116756)
+++ PKGBUILD 2014-08-02 19:35:37 UTC (rev 116757)
@@ -7,7 +7,7 @@
# Contributor: Larry Hajali <larryh...@gmail.com>
pkgname=calibre
-pkgver=1.40.0
+pkgver=1.204.0
pkgrel=1
pkgdesc="Ebook management application"
arch=('i686' 'x86_64')
@@ -17,20 +17,17 @@
'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3'
'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx'
'python2-pillow' 'shared-mime-info' 'python2-dnspython'
- 'libunrar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp'
- 'python2-netifaces' 'python2-cssselect' 'python2-apsw')
-makedepends=('python2-pycountry' 'qt4-private-headers')
+ 'libunrar' 'python2-pyqt5' 'python2-psutil' 'pyqt4-common' 'icu'
'libmtp'
+ 'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit')
+makedepends=('python2-pycountry' 'qt5-x11extras' )
optdepends=('ipython2: to use calibre-debug')
install=calibre.install
-source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz";
+source=("http://download.calibre-ebook.com/betas/calibre-${pkgver}.tar.xz";
'desktop_integration.patch'
- 'calibre-mount-helper')
-md5sums=('4fb8c0273e9bf14698fe99a89c9e2a65'
- 'ece36dfd737fa4a346f0a0e59395e949'
- '675cd87d41342119827ef706055491e7')
+ 'fix_sip.patch')
prepare(){
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
#rm -rf src/{cherrypy,pyPdf}
rm -rf src/cherrypy
rm -rf resources/${pkgname}-portable.*
@@ -41,10 +38,12 @@
sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[
]\+python$\|#!/usr/bin/python$\):\12:g' \
$(find . -regex ".*.py\|.*.recipe")
+
+ patch -Np0 -i $srcdir/fix_sip.patch
}
build() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
LANG='en_US.UTF-8' python2 setup.py build
# LANG='en_US.UTF-8' python2 setup.py resources
@@ -54,7 +53,7 @@
}
package() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/desktop_integration.patch"
@@ -77,10 +76,6 @@
find "${pkgdir}" -type d -empty -delete
- # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/
- rm -rf "${pkgdir}/usr/bin/calibre-mount-helper"
- install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin"
-
# Compiling bytecode FS33392
python2 -m compileall "${pkgdir}/usr/lib/calibre/"
@@ -87,3 +82,11 @@
# Compiling optimized bytecode FS33392
python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
}
+
+md5sums=('379492d52b389debbad17af137f6e5e6'
+ '52c8bc5103ec6f06c485eac6b79124b3'
+ '675cd87d41342119827ef706055491e7'
+ 'b4f759b533977eb6b728892310d2e48a')
+md5sums=('379492d52b389debbad17af137f6e5e6'
+ '52c8bc5103ec6f06c485eac6b79124b3'
+ 'b4f759b533977eb6b728892310d2e48a')
Deleted: calibre-mount-helper
===================================================================
--- calibre-mount-helper 2014-08-02 18:26:02 UTC (rev 116756)
+++ calibre-mount-helper 2014-08-02 19:35:37 UTC (rev 116757)
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-# Replacement for upstream mount helper using udisks/eject
-# (C) 2010 Martin Pitt <mp...@debian.org>
-
-ACTION="$1"
-DEV="$2"
-
-case "$ACTION" in
- mount)
- udisks --mount "$DEV"
-
- # check if mount worked. If not, fail
- # udisks does return 0 even if mount failed
- mount | grep -q "$DEV" || exit 0
- ;;
-
- eject)
- eject "$DEV"
- ;;
-
- cleanup)
- ;;
-
- *)
- echo "unknown action" >&2
- exit 1
-esac
-
Modified: desktop_integration.patch
===================================================================
--- desktop_integration.patch 2014-08-02 18:26:02 UTC (rev 116756)
+++ desktop_integration.patch 2014-08-02 19:35:37 UTC (rev 116757)
@@ -20,15 +20,6 @@
if warn is None and self.warnings:
self.info('\n\nThere were %d warnings\n'%len(self.warnings))
-@@ -564,7 +552,7 @@
- if isnetbsd:
- f = os.path.join(self.opts.staging_root,
'share/bash_completion.d/calibre')
- else:
-- f = os.path.join(self.opts.staging_etc,
'bash_completion.d/calibre')
-+ 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))
- bash_comp_dest, zsh_comp_dest = f, None
@@ -713,56 +701,37 @@
with TemporaryDirectory() as tdir, CurrentDir(tdir), \
Added: fix_sip.patch
===================================================================
--- fix_sip.patch (rev 0)
+++ fix_sip.patch 2014-08-02 19:35:37 UTC (rev 116757)
@@ -0,0 +1,11 @@
+--- setup/build_environment.py.old 2014-08-02 17:49:06.363876595 +0200
++++ setup/build_environment.py 2014-08-02 17:49:34.427191537 +0200
+@@ -103,7 +103,7 @@
+ if os.path.exists(os.path.join(base, 'QtWidgets')):
+ return base
+ return q
+-pyqt['pyqt_sip_dir'] = get_sip_dir(c.default_sip_dir)
++pyqt['pyqt_sip_dir'] = '/usr/share/sip/Py2-PyQt5/'
+ pyqt['sip_inc_dir'] = c.sip_inc_dir
+
+ glib_flags = subprocess.check_output([PKGCONFIG, '--libs',
'glib-2.0']).strip() if islinux else ''
