[arch-commits] Commit in kdebindings/kde-unstable (PKGBUILD sip4.12.patch)
Date: Wednesday, January 5, 2011 @ 06:49:09
Author: andrea
Revision: 104868
KDE 4.5.95
Modified:
kdebindings/kde-unstable/PKGBUILD
Deleted:
kdebindings/kde-unstable/sip4.12.patch
---+
PKGBUILD | 12 ++-
sip4.12.patch | 93
2 files changed, 4 insertions(+), 101 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-01-05 11:49:06 UTC (rev 104867)
+++ PKGBUILD2011-01-05 11:49:09 UTC (rev 104868)
@@ -7,23 +7,19 @@
'kdebindings-python'
'kdebindings-ruby'
'kdebindings-smoke')
-pkgver=4.5.90
-pkgrel=2
+pkgver=4.5.95
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'pyqt' 'kdepim-runtime' 'mono'
'kdegraphics-okular' 'qwt' 'docbook-xsl' 'boost' 'qscintilla' 'ruby')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";
-'sip4.12.patch')
-sha1sums=('721ea1ba951255701f7137bdf2c122fca61c6b55'
-'59b3992de8def0e415a055246d2d3d0a2934d8d9')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";)
+sha1sums=('55ce512006f53b31c41675fabe4565b6e4eb4483')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
-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}"
Deleted: sip4.12.patch
===
--- sip4.12.patch 2011-01-05 11:49:06 UTC (rev 104867)
+++ sip4.12.patch 2011-01-05 11:49:09 UTC (rev 104868)
@@ -1,93 +0,0 @@
pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip2010-12-26
00:33:58.884995287 +0100
-+++ pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip2010-12-26
00:34:36.146000281 +0100
-@@ -582,90 +582,6 @@ template
- %End
- };
-
--template
--%MappedType QSet
--{
--%TypeHeaderCode
--#include
--%End
--
--%ConvertFromTypeCode
--// Create the list.
--PyObject *l;
--
--if ((l = PyList_New(sipCpp->size())) == NULL)
--return NULL;
--
--// Set the list elements.
--QSet 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 *qs = new QSet;
--
--for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--{
--int state;
--
--TYPE *t = reinterpret_cast(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
- %MappedType QPair
- {
[arch-commits] Commit in kdebindings/kde-unstable (PKGBUILD sip4.12.patch)
Date: Monday, December 27, 2010 @ 07:33:00
Author: andrea
Revision: 104048
pyqt/sip rebuild
Added:
kdebindings/kde-unstable/sip4.12.patch
Modified:
kdebindings/kde-unstable/PKGBUILD
---+
PKGBUILD |8 +++-
sip4.12.patch | 93
2 files changed, 99 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-12-27 12:15:19 UTC (rev 104047)
+++ PKGBUILD2010-12-27 12:33:00 UTC (rev 104048)
@@ -14,12 +14,16 @@
license=('GPL' 'LGPL')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'pyqt' 'kdepim-runtime' 'mono'
'kdegraphics-okular' 'qwt' 'docbook-xsl' 'boost' 'qscintilla' 'ruby')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";)
-sha1sums=('721ea1ba951255701f7137bdf2c122fca61c6b55')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";
+'sip4.12.patch')
+sha1sums=('721ea1ba951255701f7137bdf2c122fca61c6b55'
+'59b3992de8def0e415a055246d2d3d0a2934d8d9')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
+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}"
Added: sip4.12.patch
===
--- sip4.12.patch (rev 0)
+++ sip4.12.patch 2010-12-27 12:33:00 UTC (rev 104048)
@@ -0,0 +1,93 @@
+--- pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip2010-12-26
00:33:58.884995287 +0100
pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip2010-12-26
00:34:36.146000281 +0100
+@@ -582,90 +582,6 @@ template
+ %End
+ };
+
+-template
+-%MappedType QSet
+-{
+-%TypeHeaderCode
+-#include
+-%End
+-
+-%ConvertFromTypeCode
+-// Create the list.
+-PyObject *l;
+-
+-if ((l = PyList_New(sipCpp->size())) == NULL)
+-return NULL;
+-
+-// Set the list elements.
+-QSet 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 *qs = new QSet;
+-
+-for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-{
+-int state;
+-
+-TYPE *t = reinterpret_cast(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
+ %MappedType QPair
+ {
