[packages/python-PyKDE4] - typedefs patch no longer needed

baggins baggins at pld-linux.org
Mon Dec 10 17:02:45 CET 2012


commit 814d0a098cb14fdd6cf8a5c85d64b8961e74d3e7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Dec 10 17:02:31 2012 +0100

    - typedefs patch no longer needed

 python-PyKDE4-typedefs.patch | 80 --------------------------------------------
 python-PyKDE4.spec           |  2 --
 2 files changed, 82 deletions(-)
---
diff --git a/python-PyKDE4.spec b/python-PyKDE4.spec
index bbb7093..64079ef 100644
--- a/python-PyKDE4.spec
+++ b/python-PyKDE4.spec
@@ -15,7 +15,6 @@ License:	GPL
 Group:		Libraries/Python
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5:	f099684d5dc39ad04d237766b166468e
-Patch0:		%{name}-typedefs.patch
 BuildRequires:	cmake >= 2.8.0
 BuildRequires:	kde4-kdebase-workspace-devel >= %{version}
 BuildRequires:	python-PyQt4-devel >= %{pyqtver}
@@ -80,7 +79,6 @@ Przykłady dla PyKDE4.
 
 %prep
 %setup -q -n %{orgname}-%{version}
-#%patch0 -p1
 
 %build
 install -d build
diff --git a/python-PyKDE4-typedefs.patch b/python-PyKDE4-typedefs.patch
deleted file mode 100644
index 2c8f9ab..0000000
--- a/python-PyKDE4-typedefs.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- pykde4-4.9.2/sip/kdecore/typedefs.sip~	2012-09-28 02:18:24.000000000 +0200
-+++ pykde4-4.9.2/sip/kdecore/typedefs.sip	2012-11-16 14:14:42.000000000 +0100
-@@ -951,77 +951,3 @@
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.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)
--    {
--        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<int> *qv = new QVector<int>;
-- 
--    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
--};
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-PyKDE4.git/commitdiff/814d0a098cb14fdd6cf8a5c85d64b8961e74d3e7



More information about the pld-cvs-commit mailing list