[arch-commits] Commit in kdebindings/trunk (PKGBUILD sip4.11.2.patch sip4.12.patch)
Andrea Scarpino
andrea at archlinux.org
Wed Jan 26 19:56:49 UTC 2011
Date: Wednesday, January 26, 2011 @ 14:56:49
Author: andrea
Revision: 107561
KDE 4.6.0
Modified:
kdebindings/trunk/PKGBUILD
Deleted:
kdebindings/trunk/sip4.11.2.patch
kdebindings/trunk/sip4.12.patch
-----------------+
PKGBUILD | 18 ++--------
sip4.11.2.patch | 64 -------------------------------------
sip4.12.patch | 93 ------------------------------------------------------
3 files changed, 5 insertions(+), 170 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-01-26 19:56:46 UTC (rev 107560)
+++ PKGBUILD 2011-01-26 19:56:49 UTC (rev 107561)
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59825 2009-11-28 01:40:17Z andrea $
+# $Id: PKGBUILD 107102 2011-01-21 11:16:03Z andrea $
# Maintainer: Andrea Scarpino <andrea at archlinux.org>
# Contributor: Pierre Schmitz <pierre at archlinux.de>
@@ -7,26 +7,19 @@
'kdebindings-python'
'kdebindings-ruby'
'kdebindings-smoke')
-pkgver=4.5.5
-pkgrel=2
+pkgver=4.6.0
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'python2-qt' 'kdepim-runtime' 'mono'
'kdegraphics-okular' 'qwt' 'docbook-xsl' 'boost' 'qscintilla' 'ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'sip4.11.2.patch'
- 'sip4.12.patch')
-sha1sums=('5f754f0b6989df9557c5ccec18b4f96207fceb94'
- '36b52d147fee24a65c756baaad00e3d1ac081d3d'
- '59b3992de8def0e415a055246d2d3d0a2934d8d9')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('a2d641bbee7fddfbd76652fb41cd784d8c92288c')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
- patch -Np0 -i ${srcdir}/sip4.11.2.patch
- patch -Np1 -i ${srcdir}/sip4.12.patch
-
# fix ruby
for f in `find ruby -name CMakeLists.txt`; do
sed -i "s|\${RUBY_INCLUDE_PATH}|\${RUBY_INCLUDE_PATH} /usr/include/ruby-1.9.1/${_ARCHITECTURE}-linux|" "${f}"
@@ -41,7 +34,6 @@
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_falcon=OFF \
-DBUILD_java=OFF \
- -DBUILD_perl=OFF \
-DBUILD_php=OFF \
-DWITH_PolkitQt=OFF
make
Deleted: sip4.11.2.patch
===================================================================
--- sip4.11.2.patch 2011-01-26 19:56:46 UTC (rev 107560)
+++ sip4.11.2.patch 2011-01-26 19:56:49 UTC (rev 107561)
@@ -1,64 +0,0 @@
---- python/pykde4/sip/kdecore/typedefs.sip
-+++ python/pykde4/sip/kdecore/typedefs.sip
-@@ -733,61 +733,6 @@
- };
-
-
--%MappedType QList<uint>
--{
--%TypeHeaderCode
--#include <qlist.h>
--%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) {
-- PyObject *pobj;
--
--#if PY_MAJOR_VERSION >= 3
-- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
--#else
-- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
--#endif
-- Py_DECREF(l);
--
-- return NULL;
-- }
--
-- PyList_SET_ITEM(l, i, pobj);
-- }
--
-- return l;
--%End
--
--%ConvertToTypeCode
-- // Check the type if that is all that is required.
-- if (sipIsErr == NULL)
-- return PyList_Check(sipPy);
--
-- QList<uint> *ql = new QList<uint>;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--#if PY_MAJOR_VERSION >= 3
-- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
--#else
-- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
--#endif
-- }
--
-- *sipCppPtr = ql;
--
-- return sipGetState(sipTransferObj);
--%End
--};
--
--
- template <TYPE*>
- %MappedType QStack<TYPE*>
- {
Deleted: sip4.12.patch
===================================================================
--- sip4.12.patch 2011-01-26 19:56:46 UTC (rev 107560)
+++ sip4.12.patch 2011-01-26 19:56:49 UTC (rev 107561)
@@ -1,93 +0,0 @@
---- pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip 2010-12-26 00:33:58.884995287 +0100
-+++ pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip 2010-12-26 00:34:36.146000281 +0100
-@@ -582,90 +582,6 @@ template <TYPE1,TYPE2*>
- %End
- };
-
--template <TYPE>
--%MappedType QSet<TYPE>
--{
--%TypeHeaderCode
--#include <qset.h>
--%End
--
--%ConvertFromTypeCode
-- // Create the list.
-- PyObject *l;
--
-- if ((l = PyList_New(sipCpp->size())) == NULL)
-- return NULL;
--
-- // Set the list elements.
-- QSet<TYPE> set = *sipCpp;
-- int i = 0;
-- foreach (TYPE value, set)
-- {
-- PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj);
-- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
-- {
-- Py_DECREF(l);
--
-- if (obj)
-- Py_DECREF(obj);
--
-- return NULL;
-- }
--
-- Py_DECREF(obj);
-- i++;
-- }
--
-- return l;
--%End
--
--%ConvertToTypeCode
-- // Check the type if that is all that is required.
-- if (sipIsErr == NULL)
-- {
-- if (!PyList_Check(sipPy))
-- return 0;
-- }
--
-- // 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)
-- if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
-- return 0;
-- }
--
-- QSet<TYPE> *qs = new QSet<TYPE>;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-- {
-- int state;
--
-- TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
--
-- if (*sipIsErr)
-- {
-- sipReleaseType(t, sipType_TYPE, state);
--
-- delete qs;
-- return 0;
-- }
--
-- *qs << *t;
--
-- sipReleaseType(t, sipType_TYPE, state);
-- }
--
-- *sipCppPtr = qs;
--
-- return sipGetState(sipTransferObj);
--%End
--};
--
--
- template <TYPE1,TYPE2>
- %MappedType QPair<TYPE1,TYPE2>
- {
More information about the arch-commits
mailing list