Author: arekm Date: Mon Jan 10 19:10:17 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; hack for build
---- Files affected:
packages/kde4-kdebindings:
kde4-kdebindings-sip.patch (1.1 -> 1.2) , kde4-kdebindings.spec (1.88 ->
1.89) , kde4-kdebindings-hack.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/kde4-kdebindings/kde4-kdebindings-sip.patch
diff -u packages/kde4-kdebindings/kde4-kdebindings-sip.patch:1.1
packages/kde4-kdebindings/kde4-kdebindings-sip.patch:1.2
--- packages/kde4-kdebindings/kde4-kdebindings-sip.patch:1.1 Wed Oct 6
21:54:19 2010
+++ packages/kde4-kdebindings/kde4-kdebindings-sip.patch Mon Jan 10
20:10:12 2011
@@ -62,3 +62,97 @@
template <TYPE*>
%MappedType QStack<TYPE*>
{
+--- kdebindings-4.5.5/python/pykde4/sip/kdecore/typedefs.sip~ 2011-01-10
19:51:15.525973439 +0100
++++ kdebindings-4.5.5/python/pykde4/sip/kdecore/typedefs.sip 2011-01-10
19:54:55.663714814 +0100
+@@ -582,90 +582,6 @@
+ %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>
+ {
+
================================================================
Index: packages/kde4-kdebindings/kde4-kdebindings.spec
diff -u packages/kde4-kdebindings/kde4-kdebindings.spec:1.88
packages/kde4-kdebindings/kde4-kdebindings.spec:1.89
--- packages/kde4-kdebindings/kde4-kdebindings.spec:1.88 Wed Jan 5
12:41:28 2011
+++ packages/kde4-kdebindings/kde4-kdebindings.spec Mon Jan 10 20:10:12 2011
@@ -15,13 +15,14 @@
Summary(pl.UTF-8): Dowiązania KDE dla języków innych niż C++
Name: kde4-kdebindings
Version: 4.5.5
-Release: 1
+Release: 2
License: GPL
Group: X11/Applications
Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
# Source0-md5: a1b3ed7fd4bf473e0e3e79c926bd6be2
Patch100: %{name}-branch.diff
Patch0: %{name}-sip.patch
+Patch1: %{name}-hack.patch
BuildRequires: PolicyKit-devel
BuildRequires: QtDesigner-devel >= %{qtver}
BuildRequires: QtGui-devel >= %{qtver}
@@ -212,6 +213,7 @@
%setup -q -n %{orgname}-%{version}
#%patch100 -p0
%patch0 -p1
+%patch1 -p1
# Very ugly hack, but damn, i'm sick of this package
%if %{without smoke}
%{__sed} -i -e 's/macro_optional_add_subdirectory(smoke)//' CMakeLists.txt
@@ -543,6 +545,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.89 2011/01/10 19:10:12 arekm
+- rel 2; hack for build
+
Revision 1.88 2011/01/05 11:41:28 shadzik
- adjusted to new cmake macro
================================================================
Index: packages/kde4-kdebindings/kde4-kdebindings-hack.patch
diff -u /dev/null packages/kde4-kdebindings/kde4-kdebindings-hack.patch:1.1
--- /dev/null Mon Jan 10 20:10:17 2011
+++ packages/kde4-kdebindings/kde4-kdebindings-hack.patch Mon Jan 10
20:10:12 2011
@@ -0,0 +1,12 @@
+diff -up kdebindings-4.5.95/generator/type_compiler.cpp.valgrind
kdebindings-4.5.95/generator/type_compiler.cpp
+--- kdebindings-4.5.95/generator/type_compiler.cpp.valgrind 2010-10-12
08:06:55.000000000 -0500
++++ kdebindings-4.5.95/generator/type_compiler.cpp 2011-01-08
20:02:55.623757621 -0600
+@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara
+
+ void TypeCompiler::visitPtrOperator(PtrOperatorAST* node)
+ {
++ if ( ! m_session->token_stream ) return;
++ if ( ! token_text(m_session->token_stream->kind(node->op)) ) return;
+ if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
+ QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
+ pointerDepth.append(cv.first);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebindings/kde4-kdebindings-sip.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebindings/kde4-kdebindings.spec?r1=1.88&r2=1.89&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
