From c3ff6b4da8966c22dcbf0f5d8a957b875242789f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Oct 2012 01:23:34 -0700 Subject: Thu Oct 4 01:23:34 PDT 2012 --- staging/kdebindings-python/PKGBUILD | 25 ++++-- staging/kdebindings-python/pyqt495.patch | 95 ++++++++++++++++++++++ staging/qscintilla/PKGBUILD | 80 ++++++++++++++++++ .../qscintilla/configure.py-objdir-support.diff | 39 +++++++++ staging/systemd/PKGBUILD | 18 +--- staging/systemd/initcpio-install-udev | 2 +- 6 files changed, 235 insertions(+), 24 deletions(-) create mode 100644 staging/kdebindings-python/pyqt495.patch create mode 100644 staging/qscintilla/PKGBUILD create mode 100644 staging/qscintilla/configure.py-objdir-support.diff (limited to 'staging') diff --git a/staging/kdebindings-python/PKGBUILD b/staging/kdebindings-python/PKGBUILD index ad995b59e..089744aa4 100644 --- a/staging/kdebindings-python/PKGBUILD +++ b/staging/kdebindings-python/PKGBUILD @@ -1,29 +1,36 @@ -# $Id: PKGBUILD 160989 2012-06-07 20:23:50Z andrea $ +# $Id: PKGBUILD 167875 2012-10-03 15:10:39Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') -pkgver=4.8.4 -pkgrel=1 -url='http://kde.org/' +pkgver=4.9.2 +pkgrel=2 +url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla') -source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('e629d7a1d7d1aa1d1dd24769dc5412a60b6ac256') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' + 'pyqt' 'qscintilla' 'python2-sip' 'python-sip') +source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz" + 'pyqt495.patch') +sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11' + '17b699b9096d10e118ef49fbe5e4cd5687e676a5') build() { export PYTHONDONTWRITEBYTECODE="TRUE" - cd "${srcdir}" + cd pykde4-${pkgver} + patch -p1 -i "${srcdir}"/pyqt495.patch + cd ../ + mkdir build cd build cmake ../pykde4-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0 + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0 make cd .. diff --git a/staging/kdebindings-python/pyqt495.patch b/staging/kdebindings-python/pyqt495.patch new file mode 100644 index 000000000..b8a9df258 --- /dev/null +++ b/staging/kdebindings-python/pyqt495.patch @@ -0,0 +1,95 @@ +From: Luca Beltrame +Date: Mon, 01 Oct 2012 18:47:56 +0000 +Subject: Remove duplicated QVector definition, since it's in PyQt now. +X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6 +--- +Remove duplicated QVector definition, since it's in PyQt now. +Simon, if you have time, please review if everything is OK. + +CCMAIL: simon@simonzone.com +--- + + +--- a/sip/kdecore/typedefs.sip ++++ b/sip/kdecore/typedefs.sip +@@ -951,78 +951,4 @@ + %End + }; + +-%MappedType QVector +-{ +-%TypeHeaderCode +-#include +-%End +- +-%ConvertFromTypeCode +- // Create the list. +- PyObject *l; +- +- if ((l = PyList_New(sipCpp->size())) == NULL) +- return NULL; +- +- // Set the list elements. +- for (int i = 0; i < sipCpp->size(); ++i) +- { +- int t = (sipCpp->at(i)); +- +-#if PY_MAJOR_VERSION >= 3 +- PyObject *tobj = PyLong_FromLong(t); +-#else +- PyObject *tobj = PyInt_FromLong(t); +-#endif +- +- PyList_SET_ITEM(l, i, tobj); +- } +- +- return l; +-%End +- +-%ConvertToTypeCode +- // Check the type if that is all that is required. +- if (sipIsErr == NULL) +- { +- if (!PyList_Check(sipPy)) +- return 0; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { +- PyObject *tobj = PyList_GET_ITEM(sipPy, i); +-#if PY_MAJOR_VERSION >= 3 +- if (!PyNumber_Check(tobj)) +-#else +- if (!PyInt_Check(tobj)) +-#endif +- return 0; +- } +- return 1; +- } +- +- QVector *qv = new QVector; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) +- { +- PyObject *tobj = PyList_GET_ITEM(sipPy, i); +- #if PY_MAJOR_VERSION >= 3 +- int t = PyLong_AsLong (tobj); +-#else +- int t = PyInt_AS_LONG (tobj); +-#endif +- +- if (*sipIsErr) +- { +- delete qv; +- return 0; +- } +- +- qv->append(t); +- } +- +- *sipCppPtr = qv; +- +- return sipGetState(sipTransferObj); +-%End +-}; +- ++ + diff --git a/staging/qscintilla/PKGBUILD b/staging/qscintilla/PKGBUILD new file mode 100644 index 000000000..acb9eadfd --- /dev/null +++ b/staging/qscintilla/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 167919 2012-10-03 20:22:14Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Douglas Soares de Andrade + +pkgbase=qscintilla +pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' + 'python-qscintilla-common') +pkgver=2.6.2 +pkgrel=3 +license=('GPL') +arch=('i686' 'x86_64') +url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" +makedepends=('python2-pyqt' 'pyqt' 'chrpath') +source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" + 'configure.py-objdir-support.diff') +md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9' + '8cf9c06252e2f11ab00e62848e322fd3') + +build() { + cd "${srcdir}/QScintilla-gpl-${pkgver}" + patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" + + cd Qt4Qt5 + qmake qscintilla.pro + make + + cd ../designer-Qt4 + qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 + make + + cd ../ + cp -rf Python Python2 + cd Python + python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 + make + + cd ../Python2 + python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 + make +} + +package_qscintilla() { + pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class" + depends=('qt') + + cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install +} + +package_python-qscintilla-common() { + pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" + depends=('qscintilla') + + cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by python-qscintilla + rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" +} + +package_python-qscintilla() { + pkgdesc="Python 3.x bindings for QScintilla2" + depends=('python-qscintilla-common' 'pyqt') + + cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" + install -Dm755 Qsci.so \ + "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" +} + +package_python2-qscintilla() { + pkgdesc="Python 2.x bindings for QScintilla2" + depends=('python-qscintilla-common' 'python2-pyqt') + + cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" + install -Dm755 Qsci.so \ + "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so" +} diff --git a/staging/qscintilla/configure.py-objdir-support.diff b/staging/qscintilla/configure.py-objdir-support.diff new file mode 100644 index 000000000..b595de18c --- /dev/null +++ b/staging/qscintilla/configure.py-objdir-support.diff @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_configure.dpatch by Torsten Marek +## +## DP: patch the configure script for the Python bindings to support object dir builds + +@DPATCH@ +Index: qscintilla2-2.4.2/Python/configure.py +=================================================================== +--- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.000000000 +0100 ++++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417 +0100 +@@ -33,6 +33,7 @@ + import glob + import optparse + ++src_dir = os.path.dirname(os.path.abspath(__file__)) + + # Import SIP's configuration module so that we have access to the error + # reporting. Then try and import the configuration modules for both PyQt3 and +@@ -162,7 +163,7 @@ + if os.access(sciglobal, os.F_OK): + # Get the QScintilla version string. + _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR") +- ++ return # Debian: do not check for the installed version, we're good this way. + if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")): + # Because we include the Python bindings with the C++ code we can + # reasonably force the same version to be used and not bother about +@@ -232,9 +233,9 @@ + argv.append(buildfile) + + if pyqt.pyqt_version >= 0x040000: +- argv.append("sip/qscimod4.sip") ++ argv.append(os.path.join(src_dir, "sip/qscimod4.sip")) + else: +- argv.append("sip/qscimod3.sip") ++ argv.append(os.path.join(src_dir, "sip/qscimod3.sip")) + + os.system(" ".join(argv)) + diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD index d29f4d172..18c285073 100644 --- a/staging/systemd/PKGBUILD +++ b/staging/systemd/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=193 +pkgver=194 pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -17,14 +17,12 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - '0001-tmpfiles-restore-previous-behavior-for-F-f.patch' 'use-split-usr-path.patch') -md5sums=('732a9de2b1d2a15cab639c987ff9e90e' +md5sums=('0ebb73aea444693b9b86f7a76f5df23c' 'e99e9189aa2f6084ac28b8ddf605aeb8' - '59e91c4d7a69b7bf12c86a9982e37ced' + 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - '1f435290db227c3a4f4396f86819227e' 'fd5b5f04ab0a847373d357555129d4c0') build() { @@ -36,9 +34,6 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0 - patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch" - ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -140,14 +135,9 @@ package_systemd() { package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit' 'initscripts') + conflicts=('sysvinit') depends=('sysvinit-tools') - # the initscripts conflict here isn't actually needed, but in order to make - # this package remove both sysvinit and initscripts, the initscripts conflict - # is needed. There's no case in which you would ever want initscripts installed - # without sysvinit, and vice versa, as in both cases, they are unusable. - mv "$srcdir/_sysvcompat"/* "$pkgdir" install -dm755 "$pkgdir/sbin" diff --git a/staging/systemd/initcpio-install-udev b/staging/systemd/initcpio-install-udev index 762429983..15124b8f7 100644 --- a/staging/systemd/initcpio-install-udev +++ b/staging/systemd/initcpio-install-udev @@ -7,7 +7,7 @@ build() { add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd add_binary /usr/bin/udevadm - for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do add_file "/usr/lib/udev/rules.d/$rules" done for tool in ata_id scsi_id; do -- cgit v1.2.3