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

Jelle van der Waa jelle at archlinux.org
Fri Jun 16 20:59:41 UTC 2017


    Date: Friday, June 16, 2017 @ 20:59:40
  Author: jelle
Revision: 237821

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

Added:
  calibre/repos/community-i686/PKGBUILD
    (from rev 237820, calibre/trunk/PKGBUILD)
  calibre/repos/community-x86_64/PKGBUILD
    (from rev 237820, calibre/trunk/PKGBUILD)
Deleted:
  calibre/repos/community-i686/0001-Compatibility-with-qt5-5.9.0.patch
  calibre/repos/community-i686/PKGBUILD
  calibre/repos/community-x86_64/0001-Compatibility-with-qt5-5.9.0.patch
  calibre/repos/community-x86_64/PKGBUILD

----------------------------------------------------------+
 /PKGBUILD                                                |  148 +++++++++++++
 community-i686/0001-Compatibility-with-qt5-5.9.0.patch   |   88 -------
 community-i686/PKGBUILD                                  |   80 -------
 community-x86_64/0001-Compatibility-with-qt5-5.9.0.patch |   88 -------
 community-x86_64/PKGBUILD                                |   80 -------
 5 files changed, 148 insertions(+), 336 deletions(-)

Deleted: community-i686/0001-Compatibility-with-qt5-5.9.0.patch
===================================================================
--- community-i686/0001-Compatibility-with-qt5-5.9.0.patch	2017-06-16 20:59:27 UTC (rev 237820)
+++ community-i686/0001-Compatibility-with-qt5-5.9.0.patch	2017-06-16 20:59:40 UTC (rev 237821)
@@ -1,88 +0,0 @@
-From 82bd2e1a51df0650cb40894c5dc2b958f601a91d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
-Date: Tue, 16 May 2017 14:20:51 -0400
-Subject: [PATCH] Compatibility with qt5-5.9.0
-
----
- src/calibre/headless/fontconfig_database.cpp | 16 ++++++++++------
- src/calibre/headless/fontconfig_database.h   | 12 ++++++++----
- 2 files changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp
-index 4e87b8f81b..33defd0b48 100644
---- a/src/calibre/headless/fontconfig_database.cpp
-+++ b/src/calibre/headless/fontconfig_database.cpp
-@@ -48,14 +48,18 @@
- #include <qpa/qplatformservices.h>
- 
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
--#include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
-+#  include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
- #else
--#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
-+#  include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
-+#endif
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
-+#  include <QtFontDatabaseSupport/private/qfontengine_ft_p.h>
-+#else
-+#  include <QtGui/private/qfontengine_ft_p.h>
- #endif
--#include <QtGui/private/qfontengine_ft_p.h>
- #include <QtGui/private/qguiapplication_p.h>
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
--#include <QtGui/private/qhighdpiscaling_p.h>
-+#  include <QtGui/private/qhighdpiscaling_p.h>
- #endif
- 
- #include <QtGui/qguiapplication.h>
-@@ -763,7 +767,7 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, void *usrPtr)
- 
- QFontEngine *QFontconfigDatabase::fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference)
- {
--    QFontEngineFT *engine = static_cast<QFontEngineFT*>(QBasicFontDatabase::fontEngine(fontData, pixelSize, hintingPreference));
-+    QFontEngineFT *engine = static_cast<QFontEngineFT*>(QFreeTypeFontDatabase::fontEngine(fontData, pixelSize, hintingPreference));
-     if (engine == 0)
-         return 0;
- 
-@@ -915,7 +919,7 @@ QStringList QFontconfigDatabase::addApplicationFont(const QByteArray &fontData,
- 
- QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const
- {
--    QString resolved = QBasicFontDatabase::resolveFontFamilyAlias(family);
-+    QString resolved = QFreeTypeFontDatabase::resolveFontFamilyAlias(family);
-     if (!resolved.isEmpty() && resolved != family)
-         return resolved;
-     FcPattern *pattern = FcPatternCreate();
-diff --git a/src/calibre/headless/fontconfig_database.h b/src/calibre/headless/fontconfig_database.h
-index e2fecff724..62afc129cf 100644
---- a/src/calibre/headless/fontconfig_database.h
-+++ b/src/calibre/headless/fontconfig_database.h
-@@ -7,17 +7,21 @@
- #pragma once
- 
- #include <qpa/qplatformfontdatabase.h>
--#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
--#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
-+#  include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h>
-+#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
-+#  include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
-+#  define QFreeTypeFontDatabase QBasicFontDatabase
- #else
--#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
-+#  include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
-+#  define QFreeTypeFontDatabase QBasicFontDatabase
- #endif
- 
- QT_BEGIN_NAMESPACE
- 
- class QFontEngineFT;
- 
--class QFontconfigDatabase : public QBasicFontDatabase
-+class QFontconfigDatabase : public QFreeTypeFontDatabase
- {
- public:
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
--- 
-2.13.0
-

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-06-16 20:59:27 UTC (rev 237820)
+++ community-i686/PKGBUILD	2017-06-16 20:59:40 UTC (rev 237821)
@@ -1,80 +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>
-# Contributor: Eli Schwartz <eschwartz93 at gmail.com>
-
-pkgname=calibre
-pkgver=2.85.1
-pkgrel=2
-pkgdesc="Ebook management application"
-arch=('i686' 'x86_64')
-url="https://calibre-ebook.com/"
-license=('GPL3')
-depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
-         'python2-mechanize' 'podofo' 'libwmf'
-         '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-pygments' 'mtdev'
-         'desktop-file-utils' 'gtk-update-icon-cache' 'optipng' 'udisks2')
-makedepends=('qt5-x11extras' 'xdg-utils')
-optdepends=('ipython2: to use calibre-debug'
-            'poppler: required for converting pdf to html'
-)
-source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
-        "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig"
-        "0001-Compatibility-with-qt5-5.9.0.patch")
-sha256sums=('8c8db280c51b26284bff1c066fb503ecef9e1f15f7e2e7b4f705c817ee041abd'
-            'SKIP'
-            '65f101c0264748a93909aa767eea198e58cc8522129880cfa3d46bd7f26ffb0f')
-validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
-
-prepare(){
-  cd "${pkgname}-${pkgver}"
-
-  # Remove unneeded files and libs
-  # FIXME: remove html5lib too, but the latest html5lib breaks calibre. And calibre
-  # really needs to get the latest changes into html5lib, cause forking is bad m'okay.
-  rm -rf resources/${pkgname}-portable.* \
-         src/cherrypy \
-         src/chardet
-
-  # Desktop integration (e.g. enforce arch defaults)
-  sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
-      -e "/cc(\['xdg-desktop-menu', 'forceupdate'\])/d" \
-      -e "/cc(\['xdg-mime', 'install', MIME\])/d" \
-      -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
-
-  patch -Np1 -i $srcdir/0001-Compatibility-with-qt5-5.9.0.patch
-}
-
-build() {
-  cd "${pkgname}-${pkgver}"
-
-  LANG='en_US.UTF-8' python2 setup.py build
-  LANG='en_US.UTF-8' python2 setup.py gui
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-
-  install -d "${pkgdir}/usr/share/zsh/site-functions" \
-             "${pkgdir}"/usr/share/{applications,desktop-directories,icons/hicolor}
-
-  install -Dm644 resources/calibre-mimetypes.xml \
-    "${pkgdir}/usr/share/mime/packages/calibre-mimetypes.xml"
-
-  XDG_DATA_DIRS="${pkgdir}/usr/share" LANG='en_US.UTF-8' \
-    python2 setup.py install --staging-root="${pkgdir}/usr" --prefix=/usr
-
-  # 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 237820, calibre/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-06-16 20:59:40 UTC (rev 237821)
@@ -0,0 +1,74 @@
+# $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>
+# Contributor: Eli Schwartz <eschwartz93 at gmail.com>
+
+pkgname=calibre
+pkgver=3.0.0
+pkgrel=1
+pkgdesc="Ebook management application"
+arch=('i686' 'x86_64')
+url="https://calibre-ebook.com/"
+license=('GPL3')
+depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-dukpy'
+         'python2-mechanize' 'podofo' 'libwmf'
+         '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-regex' 'python2-pygments' 'mtdev'
+         'desktop-file-utils' 'gtk-update-icon-cache' 'optipng' 'udisks2')
+makedepends=('qt5-x11extras' 'xdg-utils')
+optdepends=('ipython2: to use calibre-debug'
+            'poppler: required for converting pdf to html'
+)
+source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
+        "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig")
+sha256sums=('7cdaa5c55c8c13d6b5389ee11231c64944f5272297938e426be3a4fcf63a13fe'
+            'SKIP')
+validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
+
+prepare(){
+  cd "${pkgname}-${pkgver}"
+
+  # Remove unneeded files and libs
+  # FIXME: remove html5lib too, but the latest html5lib breaks calibre. And calibre
+  # really needs to get the latest changes into html5lib, cause forking is bad m'okay.
+  rm -rf resources/${pkgname}-portable.*
+
+  # Desktop integration (e.g. enforce arch defaults)
+  sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
+      -e "/cc(\['xdg-desktop-menu', 'forceupdate'\])/d" \
+      -e "/cc(\['xdg-mime', 'install', MIME\])/d" \
+      -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 "${pkgname}-${pkgver}"
+
+  LANG='en_US.UTF-8' python2 setup.py build
+  LANG='en_US.UTF-8' python2 setup.py gui
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+
+  install -d "${pkgdir}/usr/share/zsh/site-functions" \
+             "${pkgdir}"/usr/share/{applications,desktop-directories,icons/hicolor}
+
+  install -Dm644 resources/calibre-mimetypes.xml \
+    "${pkgdir}/usr/share/mime/packages/calibre-mimetypes.xml"
+
+  XDG_DATA_DIRS="${pkgdir}/usr/share" LANG='en_US.UTF-8' \
+    python2 setup.py install --staging-root="${pkgdir}/usr" --prefix=/usr
+
+  # Compiling bytecode FS#33392
+  python2 -m compileall "${pkgdir}/usr/lib/calibre/"
+  python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
+}

Deleted: community-x86_64/0001-Compatibility-with-qt5-5.9.0.patch
===================================================================
--- community-x86_64/0001-Compatibility-with-qt5-5.9.0.patch	2017-06-16 20:59:27 UTC (rev 237820)
+++ community-x86_64/0001-Compatibility-with-qt5-5.9.0.patch	2017-06-16 20:59:40 UTC (rev 237821)
@@ -1,88 +0,0 @@
-From 82bd2e1a51df0650cb40894c5dc2b958f601a91d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
-Date: Tue, 16 May 2017 14:20:51 -0400
-Subject: [PATCH] Compatibility with qt5-5.9.0
-
----
- src/calibre/headless/fontconfig_database.cpp | 16 ++++++++++------
- src/calibre/headless/fontconfig_database.h   | 12 ++++++++----
- 2 files changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp
-index 4e87b8f81b..33defd0b48 100644
---- a/src/calibre/headless/fontconfig_database.cpp
-+++ b/src/calibre/headless/fontconfig_database.cpp
-@@ -48,14 +48,18 @@
- #include <qpa/qplatformservices.h>
- 
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
--#include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
-+#  include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
- #else
--#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
-+#  include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
-+#endif
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
-+#  include <QtFontDatabaseSupport/private/qfontengine_ft_p.h>
-+#else
-+#  include <QtGui/private/qfontengine_ft_p.h>
- #endif
--#include <QtGui/private/qfontengine_ft_p.h>
- #include <QtGui/private/qguiapplication_p.h>
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
--#include <QtGui/private/qhighdpiscaling_p.h>
-+#  include <QtGui/private/qhighdpiscaling_p.h>
- #endif
- 
- #include <QtGui/qguiapplication.h>
-@@ -763,7 +767,7 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, void *usrPtr)
- 
- QFontEngine *QFontconfigDatabase::fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference)
- {
--    QFontEngineFT *engine = static_cast<QFontEngineFT*>(QBasicFontDatabase::fontEngine(fontData, pixelSize, hintingPreference));
-+    QFontEngineFT *engine = static_cast<QFontEngineFT*>(QFreeTypeFontDatabase::fontEngine(fontData, pixelSize, hintingPreference));
-     if (engine == 0)
-         return 0;
- 
-@@ -915,7 +919,7 @@ QStringList QFontconfigDatabase::addApplicationFont(const QByteArray &fontData,
- 
- QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const
- {
--    QString resolved = QBasicFontDatabase::resolveFontFamilyAlias(family);
-+    QString resolved = QFreeTypeFontDatabase::resolveFontFamilyAlias(family);
-     if (!resolved.isEmpty() && resolved != family)
-         return resolved;
-     FcPattern *pattern = FcPatternCreate();
-diff --git a/src/calibre/headless/fontconfig_database.h b/src/calibre/headless/fontconfig_database.h
-index e2fecff724..62afc129cf 100644
---- a/src/calibre/headless/fontconfig_database.h
-+++ b/src/calibre/headless/fontconfig_database.h
-@@ -7,17 +7,21 @@
- #pragma once
- 
- #include <qpa/qplatformfontdatabase.h>
--#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
--#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
-+#  include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h>
-+#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
-+#  include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
-+#  define QFreeTypeFontDatabase QBasicFontDatabase
- #else
--#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
-+#  include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
-+#  define QFreeTypeFontDatabase QBasicFontDatabase
- #endif
- 
- QT_BEGIN_NAMESPACE
- 
- class QFontEngineFT;
- 
--class QFontconfigDatabase : public QBasicFontDatabase
-+class QFontconfigDatabase : public QFreeTypeFontDatabase
- {
- public:
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
--- 
-2.13.0
-

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-06-16 20:59:27 UTC (rev 237820)
+++ community-x86_64/PKGBUILD	2017-06-16 20:59:40 UTC (rev 237821)
@@ -1,80 +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>
-# Contributor: Eli Schwartz <eschwartz93 at gmail.com>
-
-pkgname=calibre
-pkgver=2.85.1
-pkgrel=2
-pkgdesc="Ebook management application"
-arch=('i686' 'x86_64')
-url="https://calibre-ebook.com/"
-license=('GPL3')
-depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
-         'python2-mechanize' 'podofo' 'libwmf'
-         '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-pygments' 'mtdev'
-         'desktop-file-utils' 'gtk-update-icon-cache' 'optipng' 'udisks2')
-makedepends=('qt5-x11extras' 'xdg-utils')
-optdepends=('ipython2: to use calibre-debug'
-            'poppler: required for converting pdf to html'
-)
-source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
-        "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig"
-        "0001-Compatibility-with-qt5-5.9.0.patch")
-sha256sums=('8c8db280c51b26284bff1c066fb503ecef9e1f15f7e2e7b4f705c817ee041abd'
-            'SKIP'
-            '65f101c0264748a93909aa767eea198e58cc8522129880cfa3d46bd7f26ffb0f')
-validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
-
-prepare(){
-  cd "${pkgname}-${pkgver}"
-
-  # Remove unneeded files and libs
-  # FIXME: remove html5lib too, but the latest html5lib breaks calibre. And calibre
-  # really needs to get the latest changes into html5lib, cause forking is bad m'okay.
-  rm -rf resources/${pkgname}-portable.* \
-         src/cherrypy \
-         src/chardet
-
-  # Desktop integration (e.g. enforce arch defaults)
-  sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
-      -e "/cc(\['xdg-desktop-menu', 'forceupdate'\])/d" \
-      -e "/cc(\['xdg-mime', 'install', MIME\])/d" \
-      -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
-
-  patch -Np1 -i $srcdir/0001-Compatibility-with-qt5-5.9.0.patch
-}
-
-build() {
-  cd "${pkgname}-${pkgver}"
-
-  LANG='en_US.UTF-8' python2 setup.py build
-  LANG='en_US.UTF-8' python2 setup.py gui
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-
-  install -d "${pkgdir}/usr/share/zsh/site-functions" \
-             "${pkgdir}"/usr/share/{applications,desktop-directories,icons/hicolor}
-
-  install -Dm644 resources/calibre-mimetypes.xml \
-    "${pkgdir}/usr/share/mime/packages/calibre-mimetypes.xml"
-
-  XDG_DATA_DIRS="${pkgdir}/usr/share" LANG='en_US.UTF-8' \
-    python2 setup.py install --staging-root="${pkgdir}/usr" --prefix=/usr
-
-  # 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 237820, calibre/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-06-16 20:59:40 UTC (rev 237821)
@@ -0,0 +1,74 @@
+# $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>
+# Contributor: Eli Schwartz <eschwartz93 at gmail.com>
+
+pkgname=calibre
+pkgver=3.0.0
+pkgrel=1
+pkgdesc="Ebook management application"
+arch=('i686' 'x86_64')
+url="https://calibre-ebook.com/"
+license=('GPL3')
+depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-dukpy'
+         'python2-mechanize' 'podofo' 'libwmf'
+         '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-regex' 'python2-pygments' 'mtdev'
+         'desktop-file-utils' 'gtk-update-icon-cache' 'optipng' 'udisks2')
+makedepends=('qt5-x11extras' 'xdg-utils')
+optdepends=('ipython2: to use calibre-debug'
+            'poppler: required for converting pdf to html'
+)
+source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
+        "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig")
+sha256sums=('7cdaa5c55c8c13d6b5389ee11231c64944f5272297938e426be3a4fcf63a13fe'
+            'SKIP')
+validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
+
+prepare(){
+  cd "${pkgname}-${pkgver}"
+
+  # Remove unneeded files and libs
+  # FIXME: remove html5lib too, but the latest html5lib breaks calibre. And calibre
+  # really needs to get the latest changes into html5lib, cause forking is bad m'okay.
+  rm -rf resources/${pkgname}-portable.*
+
+  # Desktop integration (e.g. enforce arch defaults)
+  sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
+      -e "/cc(\['xdg-desktop-menu', 'forceupdate'\])/d" \
+      -e "/cc(\['xdg-mime', 'install', MIME\])/d" \
+      -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 "${pkgname}-${pkgver}"
+
+  LANG='en_US.UTF-8' python2 setup.py build
+  LANG='en_US.UTF-8' python2 setup.py gui
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+
+  install -d "${pkgdir}/usr/share/zsh/site-functions" \
+             "${pkgdir}"/usr/share/{applications,desktop-directories,icons/hicolor}
+
+  install -Dm644 resources/calibre-mimetypes.xml \
+    "${pkgdir}/usr/share/mime/packages/calibre-mimetypes.xml"
+
+  XDG_DATA_DIRS="${pkgdir}/usr/share" LANG='en_US.UTF-8' \
+    python2 setup.py install --staging-root="${pkgdir}/usr" --prefix=/usr
+
+  # Compiling bytecode FS#33392
+  python2 -m compileall "${pkgdir}/usr/lib/calibre/"
+  python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
+}



More information about the arch-commits mailing list