Date: Sunday, August 3, 2014 @ 14:05:52 Author: jelle Revision: 116786
upgpkg: calibre 1.204.1-1 Modified: calibre/trunk/PKGBUILD Deleted: calibre/trunk/fix_sip.patch ---------------+ PKGBUILD | 75 ++++++++++++++++++++++++++------------------------------ fix_sip.patch | 11 -------- 2 files changed, 36 insertions(+), 50 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-03 07:42:56 UTC (rev 116785) +++ PKGBUILD 2014-08-03 12:05:52 UTC (rev 116786) @@ -7,7 +7,7 @@ # Contributor: Larry Hajali <[email protected]> pkgname=calibre -pkgver=1.204.0 +pkgver=1.204.1 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -14,32 +14,48 @@ url="http://calibre-ebook.com/"; license=('GPL3') depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' - 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' - 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' + 'python2-mechanize' 'podofo' 'libwmf' + 'imagemagick' 'chmlib' 'python2-lxml' 'libusbx' 'python2-pillow' 'shared-mime-info' 'python2-dnspython' - 'libunrar' 'python2-pyqt5' 'python2-psutil' 'pyqt4-common' 'icu' 'libmtp' + '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/betas/calibre-${pkgver}.tar.xz"; - 'desktop_integration.patch' - 'fix_sip.patch') +source=("http://download.calibre-ebook.com/betas/calibre-${pkgver}.tar.xz";) +md5sums=('12f63635b7c743da3b4849f3a1e8ee9b') prepare(){ cd "${srcdir}/${pkgname}-${pkgver}" - #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 - sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py + # Remove unneeded files and libs + rm -rf resources/${pkgname}-portable.* \ + src/six.py \ + src/cherrypy \ + src/html5lib \ + src/chardet - sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ - $(find . -regex ".*.py\|.*.recipe") + sed -i "s/shlex.split(ldflags)/& + ['-fPIC']/" setup/extensions.py + #sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py - patch -Np0 -i $srcdir/fix_sip.patch + # Use python2 + sed -i 's:\(env[ ]\+python$\|/usr/bin/python$\):\12:g' $(find . -regex ".*\.py\|.*\.recipe") + sed -i "/pyqt_sip_dir/ s:=.*:= '/usr/share/sip/Py2-PyQt5':" setup/build_environment.py + + # Desktop integration (e.g. enforce arch defaults) + sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "/\(cc('xdg-icon-resource\|self.icon_resources.append\|'128'))\)/d" \ + -e "/render_img/ s/\('calibre-.*\.png'\)/os.path.join(dir, \1)/g" \ + -e "/dir, 'calibre-lrf.png'/i \ +\ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')\n\ +\ os.mkdir(dir)" \ + -e "/f = open/ s/\('calibre-.*\.desktop'\)/os.path.join(dir, \1)/g" \ + -e "/dir, 'calibre-lrfviewer.desktop'/i \ +\ dir = os.path.join(self.opts.staging_sharedir,'../applications')\n\ +\ os.mkdir(dir)" \ + -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \ + -e "s/^Name=calibre/Name=Calibre/g" \ + -i src/calibre/linux.py } build() { @@ -55,38 +71,19 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/desktop_integration.patch" - - # More on desktop integration (e.g. enforce arch defaults) - sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ - -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ - -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ - -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ - -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py - # Fix the environment module location sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py - install -d "${pkgdir}/usr/lib/python2.7/site-packages" - install -d "${pkgdir}/usr/share/zsh/site-functions" + install -d "${pkgdir}/usr/lib/python2.7/site-packages" \ + "${pkgdir}/usr/share/zsh/site-functions" + LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ --staging-bindir="${pkgdir}/usr/bin" \ --staging-libdir="${pkgdir}/usr/lib" \ --staging-sharedir="${pkgdir}/usr/share" - find "${pkgdir}" -type d -empty -delete - - # Compiling bytecode FS33392 + # Compiling bytecode FS#33392 python2 -m compileall "${pkgdir}/usr/lib/calibre/" - - # Compiling optimized bytecode FS33392 python2 -O -m compileall "${pkgdir}/usr/lib/calibre/" } -md5sums=('379492d52b389debbad17af137f6e5e6' - '52c8bc5103ec6f06c485eac6b79124b3' - '675cd87d41342119827ef706055491e7' - 'b4f759b533977eb6b728892310d2e48a') -md5sums=('379492d52b389debbad17af137f6e5e6' - '52c8bc5103ec6f06c485eac6b79124b3' - 'b4f759b533977eb6b728892310d2e48a') Deleted: fix_sip.patch =================================================================== --- fix_sip.patch 2014-08-03 07:42:56 UTC (rev 116785) +++ fix_sip.patch 2014-08-03 12:05:52 UTC (rev 116786) @@ -1,11 +0,0 @@ ---- 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 ''
