[arch-commits] Commit in calibre/repos (10 files)
Jelle van der Waa
jelle at archlinux.org
Sun Aug 3 15:37:10 UTC 2014
Date: Sunday, August 3, 2014 @ 17:37:09
Author: jelle
Revision: 116792
archrelease: copy trunk to community-i686, community-x86_64
Added:
calibre/repos/community-i686/PKGBUILD
(from rev 116791, calibre/trunk/PKGBUILD)
calibre/repos/community-i686/calibre.install
(from rev 116791, calibre/trunk/calibre.install)
calibre/repos/community-x86_64/PKGBUILD
(from rev 116791, calibre/trunk/PKGBUILD)
calibre/repos/community-x86_64/calibre.install
(from rev 116791, calibre/trunk/calibre.install)
Deleted:
calibre/repos/community-i686/PKGBUILD
calibre/repos/community-i686/calibre.install
calibre/repos/community-i686/desktop_integration.patch
calibre/repos/community-x86_64/PKGBUILD
calibre/repos/community-x86_64/calibre.install
calibre/repos/community-x86_64/desktop_integration.patch
--------------------------------------------+
/PKGBUILD | 180 +++++++++++++++++++++++++++
/calibre.install | 24 +++
community-i686/PKGBUILD | 89 -------------
community-i686/calibre.install | 12 -
community-i686/desktop_integration.patch | 92 -------------
community-x86_64/PKGBUILD | 89 -------------
community-x86_64/calibre.install | 12 -
community-x86_64/desktop_integration.patch | 92 -------------
8 files changed, 204 insertions(+), 386 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-08-03 15:37:01 UTC (rev 116791)
+++ community-i686/PKGBUILD 2014-08-03 15:37:09 UTC (rev 116792)
@@ -1,89 +0,0 @@
-# $Id$
-# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Petrov Roman <nwhisper at gmail.com>
-# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
-# Contributor: Larry Hajali <larryhaja at gmail.com>
-
-pkgname=calibre
-pkgver=1.204.1
-pkgrel=1
-pkgdesc="Ebook management application"
-arch=('i686' 'x86_64')
-url="http://calibre-ebook.com/"
-license=('GPL3')
-depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
- 'python2-mechanize' 'podofo' 'libwmf'
- 'imagemagick' 'chmlib' 'python2-lxml' 'libusbx'
- 'python2-pillow' 'shared-mime-info' 'python2-dnspython'
- '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")
-md5sums=('12f63635b7c743da3b4849f3a1e8ee9b')
-
-prepare(){
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # Remove unneeded files and libs
- rm -rf resources/${pkgname}-portable.* \
- src/six.py \
- src/cherrypy \
- src/html5lib \
- src/chardet
-
- 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
-
- # 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() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- LANG='en_US.UTF-8' python2 setup.py build
- # LANG='en_US.UTF-8' python2 setup.py resources
-
- # Don't build translations since building them is broken badly
- #LANG='en_US.UTF-8' python2 setup.py translations
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # 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" \
- "${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"
-
- # Compiling bytecode FS#33392
- python2 -m compileall "${pkgdir}/usr/lib/calibre/"
- python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
-}
-
Copied: calibre/repos/community-i686/PKGBUILD (from rev 116791, calibre/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-08-03 15:37:09 UTC (rev 116792)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Petrov Roman <nwhisper at gmail.com>
+# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
+# Contributor: Larry Hajali <larryhaja at gmail.com>
+
+pkgname=calibre
+pkgver=1.204.1
+pkgrel=2
+pkgdesc="Ebook management application"
+arch=('i686' 'x86_64')
+url="http://calibre-ebook.com/"
+license=('GPL3')
+depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
+ 'python2-mechanize' 'podofo' 'libwmf'
+ 'imagemagick' 'chmlib' 'python2-lxml' 'libusbx'
+ 'python2-pillow' 'shared-mime-info' 'python2-dnspython'
+ 'python2-pyqt5' 'python2-psutil' 'pyqt4-common' 'icu' 'libmtp'
+ 'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
+ 'qt5-svg' 'python2-chardet' 'python2-html5lib')
+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")
+md5sums=('12f63635b7c743da3b4849f3a1e8ee9b')
+
+prepare(){
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Remove unneeded files and libs
+ rm -rf resources/${pkgname}-portable.* \
+ src/six.py \
+ src/cherrypy \
+ src/html5lib \
+ src/chardet
+
+ 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
+
+ # 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() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ LANG='en_US.UTF-8' python2 setup.py build
+ # LANG='en_US.UTF-8' python2 setup.py resources
+
+ # Don't build translations since building them is broken badly
+ #LANG='en_US.UTF-8' python2 setup.py translations
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # 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" \
+ "${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"
+
+ # Compiling bytecode FS#33392
+ python2 -m compileall "${pkgdir}/usr/lib/calibre/"
+ python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
+}
+
Deleted: community-i686/calibre.install
===================================================================
--- community-i686/calibre.install 2014-08-03 15:37:01 UTC (rev 116791)
+++ community-i686/calibre.install 2014-08-03 15:37:09 UTC (rev 116792)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: calibre/repos/community-i686/calibre.install (from rev 116791, calibre/trunk/calibre.install)
===================================================================
--- community-i686/calibre.install (rev 0)
+++ community-i686/calibre.install 2014-08-03 15:37:09 UTC (rev 116792)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-i686/desktop_integration.patch
===================================================================
--- community-i686/desktop_integration.patch 2014-08-03 15:37:01 UTC (rev 116791)
+++ community-i686/desktop_integration.patch 2014-08-03 15:37:09 UTC (rev 116792)
@@ -1,92 +0,0 @@
-diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
---- calibre/src/calibre/linux.py 2014-02-28 04:06:35.000000000 +0100
-+++ calibre.new/src/calibre/linux.py 2014-02-28 11:18:00.518362669 +0100
-@@ -495,18 +495,6 @@
- self.setup_completion()
- if islinux or isbsd:
- self.setup_desktop_integration()
-- self.create_uninstaller()
--
-- from calibre.utils.config import config_dir
-- if os.path.exists(config_dir):
-- os.chdir(config_dir)
-- if islinux or isbsd:
-- for f in os.listdir('.'):
-- if os.stat(f).st_uid == 0:
-- import shutil
-- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
-- if os.stat(config_dir).st_uid == 0:
-- os.rmdir(config_dir)
-
- if warn is None and self.warnings:
- self.info('\n\nThere were %d warnings\n'%len(self.warnings))
-@@ -713,56 +701,37 @@
-
- with TemporaryDirectory() as tdir, CurrentDir(tdir), \
- PreserveMIMEDefaults():
-- render_img('mimetypes/lrf.png', 'calibre-lrf.png')
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-lrs',
-- '128'))
-- render_img('mimetypes/mobi.png', 'calibre-mobi.png')
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
-- render_img('mimetypes/tpz.png', 'calibre-tpz.png')
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128'))
-- render_img('mimetypes/azw2.png', 'calibre-azw2.png')
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128'))
-- render_img('mimetypes/azw3.png', 'calibre-azw3.png')
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
-- render_img('lt.png', 'calibre-gui.png', width=256, height=256)
-- cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
-- self.icon_resources.append(('apps', 'calibre-gui', '256'))
-- render_img('viewer.png', 'calibre-viewer.png', width=256, height=256)
-- cc('xdg-icon-resource install --size 256 calibre-viewer.png calibre-viewer', shell=True)
-- self.icon_resources.append(('apps', 'calibre-viewer', '256'))
-- render_img('tweak.png', 'calibre-ebook-edit.png', width=256, height=256)
-- cc('xdg-icon-resource install --size 256 calibre-ebook-edit.png calibre-ebook-edit', shell=True)
-- self.icon_resources.append(('apps', 'calibre-ebook-edit', '256'))
-+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+ os.mkdir(dir)
-+ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+ render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
-+ render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png'))
-
- mimetypes = set([])
- for x in all_input_formats():
- mt = guess_type('dummy.'+x)[0]
-- 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)
-
- def write_mimetypes(f):
- f.write('MimeType=%s;\n'%';'.join(mimetypes))
-
- from calibre.ebooks.oeb.polish.main import SUPPORTED
-- f = open('calibre-lrfviewer.desktop', 'wb')
-+ dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+ os.mkdir(dir)
-+ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
- f.write(VIEWER)
- f.close()
-- f = open('calibre-ebook-viewer.desktop', 'wb')
-+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
- f.write(EVIEWER)
- write_mimetypes(f)
-- f = open('calibre-ebook-edit.desktop', 'wb')
-+ f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb')
- f.write(ETWEAK)
- mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED]
- f.write('MimeType=%s;\n'%';'.join(mt))
- f.close()
-- f = open('calibre-gui.desktop', 'wb')
-+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
- f.write(GUI)
- write_mimetypes(f)
- f.close()
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-08-03 15:37:01 UTC (rev 116791)
+++ community-x86_64/PKGBUILD 2014-08-03 15:37:09 UTC (rev 116792)
@@ -1,89 +0,0 @@
-# $Id$
-# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Petrov Roman <nwhisper at gmail.com>
-# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
-# Contributor: Larry Hajali <larryhaja at gmail.com>
-
-pkgname=calibre
-pkgver=1.204.1
-pkgrel=1
-pkgdesc="Ebook management application"
-arch=('i686' 'x86_64')
-url="http://calibre-ebook.com/"
-license=('GPL3')
-depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
- 'python2-mechanize' 'podofo' 'libwmf'
- 'imagemagick' 'chmlib' 'python2-lxml' 'libusbx'
- 'python2-pillow' 'shared-mime-info' 'python2-dnspython'
- '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")
-md5sums=('12f63635b7c743da3b4849f3a1e8ee9b')
-
-prepare(){
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # Remove unneeded files and libs
- rm -rf resources/${pkgname}-portable.* \
- src/six.py \
- src/cherrypy \
- src/html5lib \
- src/chardet
-
- 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
-
- # 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() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- LANG='en_US.UTF-8' python2 setup.py build
- # LANG='en_US.UTF-8' python2 setup.py resources
-
- # Don't build translations since building them is broken badly
- #LANG='en_US.UTF-8' python2 setup.py translations
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # 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" \
- "${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"
-
- # Compiling bytecode FS#33392
- python2 -m compileall "${pkgdir}/usr/lib/calibre/"
- python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
-}
-
Copied: calibre/repos/community-x86_64/PKGBUILD (from rev 116791, calibre/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-08-03 15:37:09 UTC (rev 116792)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Petrov Roman <nwhisper at gmail.com>
+# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
+# Contributor: Larry Hajali <larryhaja at gmail.com>
+
+pkgname=calibre
+pkgver=1.204.1
+pkgrel=2
+pkgdesc="Ebook management application"
+arch=('i686' 'x86_64')
+url="http://calibre-ebook.com/"
+license=('GPL3')
+depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
+ 'python2-mechanize' 'podofo' 'libwmf'
+ 'imagemagick' 'chmlib' 'python2-lxml' 'libusbx'
+ 'python2-pillow' 'shared-mime-info' 'python2-dnspython'
+ 'python2-pyqt5' 'python2-psutil' 'pyqt4-common' 'icu' 'libmtp'
+ 'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
+ 'qt5-svg' 'python2-chardet' 'python2-html5lib')
+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")
+md5sums=('12f63635b7c743da3b4849f3a1e8ee9b')
+
+prepare(){
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Remove unneeded files and libs
+ rm -rf resources/${pkgname}-portable.* \
+ src/six.py \
+ src/cherrypy \
+ src/html5lib \
+ src/chardet
+
+ 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
+
+ # 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() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ LANG='en_US.UTF-8' python2 setup.py build
+ # LANG='en_US.UTF-8' python2 setup.py resources
+
+ # Don't build translations since building them is broken badly
+ #LANG='en_US.UTF-8' python2 setup.py translations
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # 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" \
+ "${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"
+
+ # Compiling bytecode FS#33392
+ python2 -m compileall "${pkgdir}/usr/lib/calibre/"
+ python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
+}
+
Deleted: community-x86_64/calibre.install
===================================================================
--- community-x86_64/calibre.install 2014-08-03 15:37:01 UTC (rev 116791)
+++ community-x86_64/calibre.install 2014-08-03 15:37:09 UTC (rev 116792)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: calibre/repos/community-x86_64/calibre.install (from rev 116791, calibre/trunk/calibre.install)
===================================================================
--- community-x86_64/calibre.install (rev 0)
+++ community-x86_64/calibre.install 2014-08-03 15:37:09 UTC (rev 116792)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/desktop_integration.patch
===================================================================
--- community-x86_64/desktop_integration.patch 2014-08-03 15:37:01 UTC (rev 116791)
+++ community-x86_64/desktop_integration.patch 2014-08-03 15:37:09 UTC (rev 116792)
@@ -1,92 +0,0 @@
-diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
---- calibre/src/calibre/linux.py 2014-02-28 04:06:35.000000000 +0100
-+++ calibre.new/src/calibre/linux.py 2014-02-28 11:18:00.518362669 +0100
-@@ -495,18 +495,6 @@
- self.setup_completion()
- if islinux or isbsd:
- self.setup_desktop_integration()
-- self.create_uninstaller()
--
-- from calibre.utils.config import config_dir
-- if os.path.exists(config_dir):
-- os.chdir(config_dir)
-- if islinux or isbsd:
-- for f in os.listdir('.'):
-- if os.stat(f).st_uid == 0:
-- import shutil
-- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
-- if os.stat(config_dir).st_uid == 0:
-- os.rmdir(config_dir)
-
- if warn is None and self.warnings:
- self.info('\n\nThere were %d warnings\n'%len(self.warnings))
-@@ -713,56 +701,37 @@
-
- with TemporaryDirectory() as tdir, CurrentDir(tdir), \
- PreserveMIMEDefaults():
-- render_img('mimetypes/lrf.png', 'calibre-lrf.png')
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-lrs',
-- '128'))
-- render_img('mimetypes/mobi.png', 'calibre-mobi.png')
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
-- render_img('mimetypes/tpz.png', 'calibre-tpz.png')
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128'))
-- render_img('mimetypes/azw2.png', 'calibre-azw2.png')
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128'))
-- render_img('mimetypes/azw3.png', 'calibre-azw3.png')
-- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True)
-- self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
-- render_img('lt.png', 'calibre-gui.png', width=256, height=256)
-- cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
-- self.icon_resources.append(('apps', 'calibre-gui', '256'))
-- render_img('viewer.png', 'calibre-viewer.png', width=256, height=256)
-- cc('xdg-icon-resource install --size 256 calibre-viewer.png calibre-viewer', shell=True)
-- self.icon_resources.append(('apps', 'calibre-viewer', '256'))
-- render_img('tweak.png', 'calibre-ebook-edit.png', width=256, height=256)
-- cc('xdg-icon-resource install --size 256 calibre-ebook-edit.png calibre-ebook-edit', shell=True)
-- self.icon_resources.append(('apps', 'calibre-ebook-edit', '256'))
-+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+ os.mkdir(dir)
-+ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+ render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
-+ render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png'))
-
- mimetypes = set([])
- for x in all_input_formats():
- mt = guess_type('dummy.'+x)[0]
-- 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)
-
- def write_mimetypes(f):
- f.write('MimeType=%s;\n'%';'.join(mimetypes))
-
- from calibre.ebooks.oeb.polish.main import SUPPORTED
-- f = open('calibre-lrfviewer.desktop', 'wb')
-+ dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+ os.mkdir(dir)
-+ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
- f.write(VIEWER)
- f.close()
-- f = open('calibre-ebook-viewer.desktop', 'wb')
-+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
- f.write(EVIEWER)
- write_mimetypes(f)
-- f = open('calibre-ebook-edit.desktop', 'wb')
-+ f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb')
- f.write(ETWEAK)
- mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED]
- f.write('MimeType=%s;\n'%';'.join(mt))
- f.close()
-- f = open('calibre-gui.desktop', 'wb')
-+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
- f.write(GUI)
- write_mimetypes(f)
- f.close()
More information about the arch-commits
mailing list