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

Jelle van der Waa jelle at archlinux.org
Wed Jan 25 10:04:54 UTC 2017


    Date: Wednesday, January 25, 2017 @ 10:04:54
  Author: jelle
Revision: 209021

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

Added:
  calibre/repos/community-testing-i686/
  calibre/repos/community-testing-i686/PKGBUILD
    (from rev 209020, calibre/trunk/PKGBUILD)
  calibre/repos/community-testing-i686/calibre-qt-5.8.patch
    (from rev 209020, calibre/trunk/calibre-qt-5.8.patch)
  calibre/repos/community-testing-x86_64/
  calibre/repos/community-testing-x86_64/PKGBUILD
    (from rev 209020, calibre/trunk/PKGBUILD)
  calibre/repos/community-testing-x86_64/calibre-qt-5.8.patch
    (from rev 209020, calibre/trunk/calibre-qt-5.8.patch)

-----------------------------------------------+
 community-testing-i686/PKGBUILD               |   81 ++++++++++++++++++++++++
 community-testing-i686/calibre-qt-5.8.patch   |   67 +++++++++++++++++++
 community-testing-x86_64/PKGBUILD             |   81 ++++++++++++++++++++++++
 community-testing-x86_64/calibre-qt-5.8.patch |   67 +++++++++++++++++++
 4 files changed, 296 insertions(+)

Copied: calibre/repos/community-testing-i686/PKGBUILD (from rev 209020, calibre/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD	                        (rev 0)
+++ community-testing-i686/PKGBUILD	2017-01-25 10:04:54 UTC (rev 209021)
@@ -0,0 +1,81 @@
+# $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.77.0
+pkgrel=4
+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')
+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"
+        calibre-qt-5.8.patch)
+sha256sums=('575d1f197d5df95258ac6de3b2b7f6f8706e38d0044dbb4ae791653d229b69c0'
+            'SKIP'
+            '2292db146f4ef020281cd40b31fabaeb377a2bcda49751b6746b5de153ae0d92')
+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
+
+  # Fix build with Qt 5.8
+  patch -p1 -i ../calibre-qt-5.8.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-testing-i686/calibre-qt-5.8.patch (from rev 209020, calibre/trunk/calibre-qt-5.8.patch)
===================================================================
--- community-testing-i686/calibre-qt-5.8.patch	                        (rev 0)
+++ community-testing-i686/calibre-qt-5.8.patch	2017-01-25 10:04:54 UTC (rev 209021)
@@ -0,0 +1,67 @@
+diff -aur calibre-2.77.0/setup/build.py calibre-2.77.0.new/setup/build.py
+--- calibre-2.77.0/setup/build.py	2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/setup/build.py	2017-01-25 09:49:28.128533094 +0000
+@@ -360,8 +360,9 @@
+             TARGET = headless
+             PLUGIN_TYPE = platforms
+             PLUGIN_CLASS_NAME = HeadlessIntegrationPlugin
+-            load(qt_plugin)
+-            QT += core-private gui-private platformsupport-private
++            TEMPLATE = lib
++            CONFIG += plugin
++            QT += core-private gui-private fontdatabase_support_private service_support_private eventdispatcher_support_private
+             HEADERS = {headers}
+             SOURCES = {sources}
+             OTHER_FILES = {others}
+diff -aur calibre-2.77.0/src/calibre/headless/fontconfig_database.cpp calibre-2.77.0.new/src/calibre/headless/fontconfig_database.cpp
+--- calibre-2.77.0/src/calibre/headless/fontconfig_database.cpp	2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/fontconfig_database.cpp	2017-01-24 21:12:25.995347259 +0000
+@@ -41,7 +41,7 @@
+ #include <qpa/qplatformintegration.h>
+ #include <qpa/qplatformservices.h>
+ 
+-#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
++#include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
+ #include <QtGui/private/qfontengine_ft_p.h>
+ #include <QtGui/private/qguiapplication_p.h>
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+diff -aur calibre-2.77.0/src/calibre/headless/fontconfig_database.h calibre-2.77.0.new/src/calibre/headless/fontconfig_database.h
+--- calibre-2.77.0/src/calibre/headless/fontconfig_database.h	2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/fontconfig_database.h	2017-01-24 21:12:25.998680585 +0000
+@@ -7,7 +7,7 @@
+ #pragma once
+ 
+ #include <qpa/qplatformfontdatabase.h>
+-#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
++#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+diff -aur calibre-2.77.0/src/calibre/headless/headless_integration.cpp calibre-2.77.0.new/src/calibre/headless/headless_integration.cpp
+--- calibre-2.77.0/src/calibre/headless/headless_integration.cpp	2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/headless_integration.cpp	2017-01-24 21:12:25.998680585 +0000
+@@ -4,10 +4,10 @@
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 1))
+ #include "fontconfig_database.h"
+ #else
+-#include <QtPlatformSupport/private/qfontconfigdatabase_p.h>
++#include <QtFontDatabaseSupport/private/qfontconfigdatabase_p.h>
+ #endif
+ #ifndef Q_OS_WIN
+-#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
++#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
+ #else
+ #include <QtCore/private/qeventdispatcher_win_p.h>
+ #endif
+diff -aur calibre-2.77.0/src/calibre/headless/headless_integration.h calibre-2.77.0.new/src/calibre/headless/headless_integration.h
+--- calibre-2.77.0/src/calibre/headless/headless_integration.h	2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/headless_integration.h	2017-01-24 21:12:25.998680585 +0000
+@@ -3,7 +3,7 @@
+ #include <qpa/qplatformintegration.h>
+ #include <qpa/qplatformscreen.h>
+ #include <qpa/qplatformservices.h>
+-#include <QtPlatformSupport/private/qgenericunixservices_p.h>
++#include <QtServiceSupport/private/qgenericunixservices_p.h>
+ #include <QScopedPointer>
+ 
+ QT_BEGIN_NAMESPACE

Copied: calibre/repos/community-testing-x86_64/PKGBUILD (from rev 209020, calibre/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2017-01-25 10:04:54 UTC (rev 209021)
@@ -0,0 +1,81 @@
+# $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.77.0
+pkgrel=4
+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')
+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"
+        calibre-qt-5.8.patch)
+sha256sums=('575d1f197d5df95258ac6de3b2b7f6f8706e38d0044dbb4ae791653d229b69c0'
+            'SKIP'
+            '2292db146f4ef020281cd40b31fabaeb377a2bcda49751b6746b5de153ae0d92')
+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
+
+  # Fix build with Qt 5.8
+  patch -p1 -i ../calibre-qt-5.8.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-testing-x86_64/calibre-qt-5.8.patch (from rev 209020, calibre/trunk/calibre-qt-5.8.patch)
===================================================================
--- community-testing-x86_64/calibre-qt-5.8.patch	                        (rev 0)
+++ community-testing-x86_64/calibre-qt-5.8.patch	2017-01-25 10:04:54 UTC (rev 209021)
@@ -0,0 +1,67 @@
+diff -aur calibre-2.77.0/setup/build.py calibre-2.77.0.new/setup/build.py
+--- calibre-2.77.0/setup/build.py	2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/setup/build.py	2017-01-25 09:49:28.128533094 +0000
+@@ -360,8 +360,9 @@
+             TARGET = headless
+             PLUGIN_TYPE = platforms
+             PLUGIN_CLASS_NAME = HeadlessIntegrationPlugin
+-            load(qt_plugin)
+-            QT += core-private gui-private platformsupport-private
++            TEMPLATE = lib
++            CONFIG += plugin
++            QT += core-private gui-private fontdatabase_support_private service_support_private eventdispatcher_support_private
+             HEADERS = {headers}
+             SOURCES = {sources}
+             OTHER_FILES = {others}
+diff -aur calibre-2.77.0/src/calibre/headless/fontconfig_database.cpp calibre-2.77.0.new/src/calibre/headless/fontconfig_database.cpp
+--- calibre-2.77.0/src/calibre/headless/fontconfig_database.cpp	2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/fontconfig_database.cpp	2017-01-24 21:12:25.995347259 +0000
+@@ -41,7 +41,7 @@
+ #include <qpa/qplatformintegration.h>
+ #include <qpa/qplatformservices.h>
+ 
+-#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
++#include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
+ #include <QtGui/private/qfontengine_ft_p.h>
+ #include <QtGui/private/qguiapplication_p.h>
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+diff -aur calibre-2.77.0/src/calibre/headless/fontconfig_database.h calibre-2.77.0.new/src/calibre/headless/fontconfig_database.h
+--- calibre-2.77.0/src/calibre/headless/fontconfig_database.h	2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/fontconfig_database.h	2017-01-24 21:12:25.998680585 +0000
+@@ -7,7 +7,7 @@
+ #pragma once
+ 
+ #include <qpa/qplatformfontdatabase.h>
+-#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
++#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+diff -aur calibre-2.77.0/src/calibre/headless/headless_integration.cpp calibre-2.77.0.new/src/calibre/headless/headless_integration.cpp
+--- calibre-2.77.0/src/calibre/headless/headless_integration.cpp	2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/headless_integration.cpp	2017-01-24 21:12:25.998680585 +0000
+@@ -4,10 +4,10 @@
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 1))
+ #include "fontconfig_database.h"
+ #else
+-#include <QtPlatformSupport/private/qfontconfigdatabase_p.h>
++#include <QtFontDatabaseSupport/private/qfontconfigdatabase_p.h>
+ #endif
+ #ifndef Q_OS_WIN
+-#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
++#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
+ #else
+ #include <QtCore/private/qeventdispatcher_win_p.h>
+ #endif
+diff -aur calibre-2.77.0/src/calibre/headless/headless_integration.h calibre-2.77.0.new/src/calibre/headless/headless_integration.h
+--- calibre-2.77.0/src/calibre/headless/headless_integration.h	2017-01-13 03:38:35.000000000 +0000
++++ calibre-2.77.0.new/src/calibre/headless/headless_integration.h	2017-01-24 21:12:25.998680585 +0000
+@@ -3,7 +3,7 @@
+ #include <qpa/qplatformintegration.h>
+ #include <qpa/qplatformscreen.h>
+ #include <qpa/qplatformservices.h>
+-#include <QtPlatformSupport/private/qgenericunixservices_p.h>
++#include <QtServiceSupport/private/qgenericunixservices_p.h>
+ #include <QScopedPointer>
+ 
+ QT_BEGIN_NAMESPACE



More information about the arch-commits mailing list