Date: Sunday, April 12, 2015 @ 20:19:00
Author: jelle
Revision: 131254
archrelease: copy trunk to community-i686, community-x86_64
Added:
calibre/repos/community-i686/PKGBUILD
(from rev 131253, calibre/trunk/PKGBUILD)
calibre/repos/community-i686/calibre.install
(from rev 131253, calibre/trunk/calibre.install)
calibre/repos/community-x86_64/PKGBUILD
(from rev 131253, calibre/trunk/PKGBUILD)
calibre/repos/community-x86_64/calibre.install
(from rev 131253, calibre/trunk/calibre.install)
Deleted:
calibre/repos/community-i686/PKGBUILD
calibre/repos/community-i686/calibre.install
calibre/repos/community-i686/incompatibility-pyqt5.4.1.patch
calibre/repos/community-x86_64/PKGBUILD
calibre/repos/community-x86_64/calibre.install
calibre/repos/community-x86_64/incompatibility-pyqt5.4.1.patch
--------------------------------------------------+
/PKGBUILD | 176 +++++++++++++++++++++
/calibre.install | 24 ++
community-i686/PKGBUILD | 88 ----------
community-i686/calibre.install | 12 -
community-i686/incompatibility-pyqt5.4.1.patch | 28 ---
community-x86_64/PKGBUILD | 88 ----------
community-x86_64/calibre.install | 12 -
community-x86_64/incompatibility-pyqt5.4.1.patch | 28 ---
8 files changed, 200 insertions(+), 256 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-04-12 18:18:04 UTC (rev 131253)
+++ community-i686/PKGBUILD 2015-04-12 18:19:00 UTC (rev 131254)
@@ -1,88 +0,0 @@
-# $Id$
-# Maintainer: Jelle van der Waa <je...@vdwaa.nl>
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: Petrov Roman <nwhis...@gmail.com>
-# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
-# Contributor: Larry Hajali <larryh...@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-i686/PKGBUILD (from rev 131253,
calibre/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-04-12 18:19:00 UTC (rev 131254)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Jelle van der Waa <je...@vdwaa.nl>
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: Petrov Roman <nwhis...@gmail.com>
+# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
+# Contributor: Larry Hajali <larryh...@gmail.com>
+
+pkgname=calibre
+pkgver=2.24.0
+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' '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=('864eb4f736ca89e4bab24b0a8a963230')
+
+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/"
+}
Deleted: community-i686/calibre.install
===================================================================
--- community-i686/calibre.install 2015-04-12 18:18:04 UTC (rev 131253)
+++ community-i686/calibre.install 2015-04-12 18:19:00 UTC (rev 131254)
@@ -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 131253,
calibre/trunk/calibre.install)
===================================================================
--- community-i686/calibre.install (rev 0)
+++ community-i686/calibre.install 2015-04-12 18:19:00 UTC (rev 131254)
@@ -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/incompatibility-pyqt5.4.1.patch
===================================================================
--- community-i686/incompatibility-pyqt5.4.1.patch 2015-04-12 18:18:04 UTC
(rev 131253)
+++ community-i686/incompatibility-pyqt5.4.1.patch 2015-04-12 18:19:00 UTC
(rev 131254)
@@ -1,28 +0,0 @@
-From 72d47ba9377d70e786bf3d93b323544188c894bd Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <ko...@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
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-04-12 18:18:04 UTC (rev 131253)
+++ community-x86_64/PKGBUILD 2015-04-12 18:19:00 UTC (rev 131254)
@@ -1,88 +0,0 @@
-# $Id$
-# Maintainer: Jelle van der Waa <je...@vdwaa.nl>
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: Petrov Roman <nwhis...@gmail.com>
-# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
-# Contributor: Larry Hajali <larryh...@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-x86_64/PKGBUILD (from rev 131253,
calibre/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-04-12 18:19:00 UTC (rev 131254)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Jelle van der Waa <je...@vdwaa.nl>
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: Petrov Roman <nwhis...@gmail.com>
+# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
+# Contributor: Larry Hajali <larryh...@gmail.com>
+
+pkgname=calibre
+pkgver=2.24.0
+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' '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=('864eb4f736ca89e4bab24b0a8a963230')
+
+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/"
+}
Deleted: community-x86_64/calibre.install
===================================================================
--- community-x86_64/calibre.install 2015-04-12 18:18:04 UTC (rev 131253)
+++ community-x86_64/calibre.install 2015-04-12 18:19:00 UTC (rev 131254)
@@ -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 131253,
calibre/trunk/calibre.install)
===================================================================
--- community-x86_64/calibre.install (rev 0)
+++ community-x86_64/calibre.install 2015-04-12 18:19:00 UTC (rev 131254)
@@ -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/incompatibility-pyqt5.4.1.patch
===================================================================
--- community-x86_64/incompatibility-pyqt5.4.1.patch 2015-04-12 18:18:04 UTC
(rev 131253)
+++ community-x86_64/incompatibility-pyqt5.4.1.patch 2015-04-12 18:19:00 UTC
(rev 131254)
@@ -1,28 +0,0 @@
-From 72d47ba9377d70e786bf3d93b323544188c894bd Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <ko...@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
