diff options
| -rw-r--r-- | pcr/python-poppler-qt5/PKGBUILD | 30 | ||||
| -rw-r--r-- | pcr/python-poppler-qt5/python-poppler-qt5-0.24.2.patch | 51 |
2 files changed, 17 insertions, 64 deletions
diff --git a/pcr/python-poppler-qt5/PKGBUILD b/pcr/python-poppler-qt5/PKGBUILD index 781b6928c..7006ba00d 100644 --- a/pcr/python-poppler-qt5/PKGBUILD +++ b/pcr/python-poppler-qt5/PKGBUILD @@ -1,22 +1,26 @@ -# Maintainer (AUR): Johan Reitan (venatux) <johan.reitan@gmail.com> +# Maintainer (AUR): Caleb Maclennan <caleb@alerque.com> +# Contributor (AUR): Lucki <https://aur.archlinux.org/account/Lucki/> +# Contributor (AUR): Johan Reitan (venatux) <johan.reitan@gmail.com> # Contributer (AUR): Kenneth Lyons (ixjlyons) <ixjlyons@gmail.com> -# parabola changes and rationale: -# no changes. - pkgname=python-poppler-qt5 -pkgver=0.25.1 -pkgrel=1 -pkgdesc='Python binding to libpoppler-qt5.' +pkgver=0.75.0 +pkgrel=4 +pkgdesc='Python binding to libpoppler-qt5' arch=('any') -# url="https://github.com/wbsoft/${pkgname}" -url="https://github.com/zehome/$pkgname" +url="https://github.com/frescobaldi/$pkgname" license=('LGPL') depends=('python-pyqt5' 'poppler-qt5') -makedepends=('python-sip-pyqt5' 'python-sip' 'sip' 'python-setuptools') -# source=("https://github.com/wbsoft/${pkgname}/archive/v${pkgver}.tar.gz") -source=("https://github.com/zehome/$pkgname/archive/v$pkgver.tar.gz") -sha256sums=('f3d0f649964872275bd8e5ac45b9a7915ca18a4b2a46de904cd920e2c67a8627') +makedepends=('python-sip' 'sip' 'python-setuptools') +source=($pkgname-$pkgver.tar.gz::https://github.com/frescobaldi/$pkgname/archive/v$pkgver.tar.gz) +sha256sums=('92e6bd8f4ce90ba4e3e0c2ada026b643481ba1b109d45e8fdbdaedca8416a995') + +build() { + cd "$pkgname-$pkgver" + # python setup.py build + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + python setup.py build_ext --pyqt-sip-dir="$site_packages"/PyQt5/bindings/ +} package() { cd "$pkgname-$pkgver" diff --git a/pcr/python-poppler-qt5/python-poppler-qt5-0.24.2.patch b/pcr/python-poppler-qt5/python-poppler-qt5-0.24.2.patch deleted file mode 100644 index fcd427002..000000000 --- a/pcr/python-poppler-qt5/python-poppler-qt5-0.24.2.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -aur python-poppler-qt5-0.24.2/poppler-qt5.sip python-poppler-qt5-0.24.2.new/poppler-qt5.sip ---- python-poppler-qt5-0.24.2/poppler-qt5.sip 2015-02-24 07:54:42.000000000 +0100 -+++ python-poppler-qt5-0.24.2.new/poppler-qt5.sip 2017-01-27 13:12:04.849162349 +0100 -@@ -6,10 +6,13 @@ - */ - - -+%Feature QTXML_AVAILABLE -+ - %Import QtCore/QtCoremod.sip - %Import QtGui/QtGuimod.sip -- --%Feature QTXML_AVAILABLE -+%If(QTXML_AVAILABLE) -+%Import QtXml/QtXmlmod.sip -+%End - - %Timeline { - POPPLER_V0_20_0 -diff -aur python-poppler-qt5-0.24.2/types.sip python-poppler-qt5-0.24.2.new/types.sip ---- python-poppler-qt5-0.24.2/types.sip 2015-02-24 07:54:42.000000000 +0100 -+++ python-poppler-qt5-0.24.2.new/types.sip 2017-01-27 13:13:53.539750992 +0100 -@@ -212,7 +212,7 @@ - return 0; - - for (int i = 0; i < PySequence_Size(sipPy); ++i) -- if (!sipCanConvertToMappedType(PySequence_ITEM(sipPy, i), qlinkedlist_type, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(PySequence_ITEM(sipPy, i), qlinkedlist_type, SIP_NOT_NONE)) - return 0; - - return 1; -@@ -224,16 +224,16 @@ - for (int i = 0; i < PySequence_Size(sipPy); ++i) - { - int state; -- QLinkedList<TYPE> * t = reinterpret_cast< QLinkedList<TYPE> * >(sipConvertToMappedType(PySequence_ITEM(sipPy, i), qlinkedlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ QLinkedList<TYPE> * t = reinterpret_cast< QLinkedList<TYPE> * >(sipConvertToType(PySequence_ITEM(sipPy, i), qlinkedlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t, sipClass_TYPE, state); -+ sipReleaseType(t, qlinkedlist_type, state); - delete ql; - return 0; - } - ql->append(*t); -- sipReleaseInstance(t, sipClass_TYPE, state); -+ sipReleaseType(t, qlinkedlist_type, state); - } - - *sipCppPtr = ql; |