[arch-commits] Commit in calibre/repos (8 files)

Jelle van der Waa jelle at archlinux.org
Sat Apr 4 09:24:14 UTC 2015


    Date: Saturday, April 4, 2015 @ 11:24:14
  Author: jelle
Revision: 130668

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  calibre/repos/community-staging-i686/
  calibre/repos/community-staging-i686/PKGBUILD
    (from rev 130667, calibre/trunk/PKGBUILD)
  calibre/repos/community-staging-i686/calibre.install
    (from rev 130667, calibre/trunk/calibre.install)
  calibre/repos/community-staging-i686/incompatibility-pyqt5.4.1.patch
    (from rev 130667, calibre/trunk/incompatibility-pyqt5.4.1.patch)
  calibre/repos/community-staging-x86_64/
  calibre/repos/community-staging-x86_64/PKGBUILD
    (from rev 130667, calibre/trunk/PKGBUILD)
  calibre/repos/community-staging-x86_64/calibre.install
    (from rev 130667, calibre/trunk/calibre.install)
  calibre/repos/community-staging-x86_64/incompatibility-pyqt5.4.1.patch
    (from rev 130667, calibre/trunk/incompatibility-pyqt5.4.1.patch)

----------------------------------------------------------+
 community-staging-i686/PKGBUILD                          |   88 +++++++++++++
 community-staging-i686/calibre.install                   |   12 +
 community-staging-i686/incompatibility-pyqt5.4.1.patch   |   28 ++++
 community-staging-x86_64/PKGBUILD                        |   88 +++++++++++++
 community-staging-x86_64/calibre.install                 |   12 +
 community-staging-x86_64/incompatibility-pyqt5.4.1.patch |   28 ++++
 6 files changed, 256 insertions(+)

Copied: calibre/repos/community-staging-i686/PKGBUILD (from rev 130667, calibre/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2015-04-04 09:24:14 UTC (rev 130668)
@@ -0,0 +1,88 @@
+# $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=2.23.0
+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' 'icu' 'libmtp' 'python2-dbus'
+         'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
+         'qt5-svg' 'python2-chardet' 'python2-html5lib' 'python2-pygments' 'mtdev')
+makedepends=('python2-pycountry' 'qt5-x11extras' )
+optdepends=('ipython2: to use calibre-debug'
+            'udisks: required for mounting certain devices'
+)
+install=calibre.install
+source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz")
+md5sums=('096bb1c01bfe98fce3647e78c8d594ca')
+
+prepare(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Remove unneeded files and libs
+  rm -rf resources/${pkgname}-portable.* \
+         src/cherrypy \
+         src/html5lib \
+         src/chardet
+
+  sed -i "s/shlex.split(ldflags)/& + ['-fPIC']/" setup/extensions.py
+
+  # Use python2
+  sed -i 's:\(env[ ]\+python$\|/usr/bin/python$\):\12:g' $(find . -regex ".*\.py\|.*\.recipe")
+
+  # 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-staging-i686/calibre.install (from rev 130667, calibre/trunk/calibre.install)
===================================================================
--- community-staging-i686/calibre.install	                        (rev 0)
+++ community-staging-i686/calibre.install	2015-04-04 09:24:14 UTC (rev 130668)
@@ -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
+}

Copied: calibre/repos/community-staging-i686/incompatibility-pyqt5.4.1.patch (from rev 130667, calibre/trunk/incompatibility-pyqt5.4.1.patch)
===================================================================
--- community-staging-i686/incompatibility-pyqt5.4.1.patch	                        (rev 0)
+++ community-staging-i686/incompatibility-pyqt5.4.1.patch	2015-04-04 09:24:14 UTC (rev 130668)
@@ -0,0 +1,28 @@
+From 72d47ba9377d70e786bf3d93b323544188c894bd Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid at kovidgoyal.net>
+Date: Thu, 5 Mar 2015 07:50:28 +0530
+Subject: [PATCH] =?UTF-8?q?Fix=20incompatibility=20with=20PyQt=205.4.1.=20?=
+ =?UTF-8?q?Fixes=20#1427684=20["TypeError:=20QPixmap():=20argument=201=20h?=
+ =?UTF-8?q?as=20unexpected=20type"=20=E2=80=93=20incompatibility=20with=20?=
+ =?UTF-8?q?Qt=205.4.1=3F](https://bugs.launchpad.net/calibre/+bug/1427684)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/calibre/gui2/widgets.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
+index 0e84267..ed40a97 100644
+--- a/src/calibre/gui2/widgets.py
++++ b/src/calibre/gui2/widgets.py
+@@ -295,7 +295,7 @@ class ImageView(QWidget, ImageDropMixin):  # {{{
+     def __init__(self, parent=None, show_size_pref_name=None, default_show_size=False):
+         QWidget.__init__(self, parent)
+         self.show_size_pref_name = ('show_size_on_cover_' + show_size_pref_name) if show_size_pref_name else None
+-        self._pixmap = QPixmap(self)
++        self._pixmap = QPixmap()
+         self.setMinimumSize(QSize(150, 200))
+         ImageDropMixin.__init__(self)
+         self.draw_border = True

Copied: calibre/repos/community-staging-x86_64/PKGBUILD (from rev 130667, calibre/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2015-04-04 09:24:14 UTC (rev 130668)
@@ -0,0 +1,88 @@
+# $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=2.23.0
+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' 'icu' 'libmtp' 'python2-dbus'
+         'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
+         'qt5-svg' 'python2-chardet' 'python2-html5lib' 'python2-pygments' 'mtdev')
+makedepends=('python2-pycountry' 'qt5-x11extras' )
+optdepends=('ipython2: to use calibre-debug'
+            'udisks: required for mounting certain devices'
+)
+install=calibre.install
+source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz")
+md5sums=('096bb1c01bfe98fce3647e78c8d594ca')
+
+prepare(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Remove unneeded files and libs
+  rm -rf resources/${pkgname}-portable.* \
+         src/cherrypy \
+         src/html5lib \
+         src/chardet
+
+  sed -i "s/shlex.split(ldflags)/& + ['-fPIC']/" setup/extensions.py
+
+  # Use python2
+  sed -i 's:\(env[ ]\+python$\|/usr/bin/python$\):\12:g' $(find . -regex ".*\.py\|.*\.recipe")
+
+  # 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-staging-x86_64/calibre.install (from rev 130667, calibre/trunk/calibre.install)
===================================================================
--- community-staging-x86_64/calibre.install	                        (rev 0)
+++ community-staging-x86_64/calibre.install	2015-04-04 09:24:14 UTC (rev 130668)
@@ -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
+}

Copied: calibre/repos/community-staging-x86_64/incompatibility-pyqt5.4.1.patch (from rev 130667, calibre/trunk/incompatibility-pyqt5.4.1.patch)
===================================================================
--- community-staging-x86_64/incompatibility-pyqt5.4.1.patch	                        (rev 0)
+++ community-staging-x86_64/incompatibility-pyqt5.4.1.patch	2015-04-04 09:24:14 UTC (rev 130668)
@@ -0,0 +1,28 @@
+From 72d47ba9377d70e786bf3d93b323544188c894bd Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid at kovidgoyal.net>
+Date: Thu, 5 Mar 2015 07:50:28 +0530
+Subject: [PATCH] =?UTF-8?q?Fix=20incompatibility=20with=20PyQt=205.4.1.=20?=
+ =?UTF-8?q?Fixes=20#1427684=20["TypeError:=20QPixmap():=20argument=201=20h?=
+ =?UTF-8?q?as=20unexpected=20type"=20=E2=80=93=20incompatibility=20with=20?=
+ =?UTF-8?q?Qt=205.4.1=3F](https://bugs.launchpad.net/calibre/+bug/1427684)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/calibre/gui2/widgets.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
+index 0e84267..ed40a97 100644
+--- a/src/calibre/gui2/widgets.py
++++ b/src/calibre/gui2/widgets.py
+@@ -295,7 +295,7 @@ class ImageView(QWidget, ImageDropMixin):  # {{{
+     def __init__(self, parent=None, show_size_pref_name=None, default_show_size=False):
+         QWidget.__init__(self, parent)
+         self.show_size_pref_name = ('show_size_on_cover_' + show_size_pref_name) if show_size_pref_name else None
+-        self._pixmap = QPixmap(self)
++        self._pixmap = QPixmap()
+         self.setMinimumSize(QSize(150, 200))
+         ImageDropMixin.__init__(self)
+         self.draw_border = True



More information about the arch-commits mailing list