Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=3beaf8463d0969e9a290c381bf17e266c283e1e7
commit 3beaf8463d0969e9a290c381bf17e266c283e1e7
Author: Devil505 <devil505li...@gmail.com>
Date: Sun Jan 30 15:57:12 2011 +0100
kdebindings-4.6.0-1-i686
* version bump
* removed useless patches
diff --git a/source/kde/kdebindings/FrugalBuild
b/source/kde/kdebindings/FrugalBuild
index ee6718c..cc0677c 100644
--- a/source/kde/kdebindings/FrugalBuild
+++ b/source/kde/kdebindings/FrugalBuild
@@ -14,10 +14,7 @@ replaces=('pykde' 'pykdeextensions')
makedepends=("${makedepends[@]}" 'sip' "qimageblitz>=0.0.4-2"
"kdewebdev>=$_F_kde_ver" 'mono' "libqtgui>=$_F_kde_qt_ver" \
"kdesdk>=$_F_kde_ver" 'boost' "kdegraphics>=$_F_kde_ver" 'gcc-gcj' \
"kdebase-workspace>=${_F_kde_ver}"
"kdebase-workspace-compiletime>=${_F_kde_ver}" 'libqtmultimedia' 'docbook-xsl')
-source=("${source[@]}" sip4.11.2.patch sip4.12.patch)
-sha1sums=('5f754f0b6989df9557c5ccec18b4f96207fceb94' \
- '36b52d147fee24a65c756baaad00e3d1ac081d3d' \
- '59b3992de8def0e415a055246d2d3d0a2934d8d9')
+sha1sums=('a2d641bbee7fddfbd76652fb41cd784d8c92288c')
if [ "$CARCH" != "ppc" ]; then
makedepends=(${makedepends[@]} "ruby>=1.9.1-3")
fi
diff --git a/source/kde/kdebindings/kill-broken-example.patch
b/source/kde/kdebindings/kill-broken-example.patch
deleted file mode 100644
index f77678e..0000000
--- a/source/kde/kdebindings/kill-broken-example.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur kdebindings-4.3.4/csharp/plasma/CMakeLists.txt
kdebindings-4.3.4-p/csharp/plasma/CMakeLists.txt
---- kdebindings-4.3.4/csharp/plasma/CMakeLists.txt 2009-07-21
17:22:11.000000000 +0200
-+++ kdebindings-4.3.4-p/csharp/plasma/CMakeLists.txt 2010-01-15
18:33:41.000000000 +0100
-@@ -4,7 +4,6 @@
- FIND_PACKAGE(Qt4 REQUIRED)
- ENDIF (NOT QT4_FOUND)
-
--add_subdirectory( examples )
-
- SET(SRC_CPP src/plasma.cpp src/plasmahandlers.cpp)
-
diff --git a/source/kde/kdebindings/qt4.6.2.patch
b/source/kde/kdebindings/qt4.6.2.patch
deleted file mode 100644
index da61668..0000000
--- a/source/kde/kdebindings/qt4.6.2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur kdebindings-4.3.5/kalyptus/kalyptusCxxToSmoke.pm
kdebindings-4.3.5-p/kalyptus/kalyptusCxxToSmoke.pm
---- kdebindings-4.3.5/kalyptus/kalyptusCxxToSmoke.pm 2010-01-21
21:47:43.000000000 +0100
-+++ kdebindings-4.3.5-p/kalyptus/kalyptusCxxToSmoke.pm 2010-02-24
18:24:18.000000000 +0100
-@@ -449,7 +449,7 @@
- || $className eq 'QTestKeyClicksEvent'
- || $className eq 'QTestKeyEvent'
- || $className eq 'QTestMouseEvent'
--
-+ || $className eq 'QWidget::setupUi'
- || $className eq 'std'
- || $className eq 'std::string'
- || $className eq 'std::wstring'
-@@ -718,7 +718,7 @@
- || ($className eq 'Wt::Ext::ToolBar' and $name eq
'jsAfterPanelRendered')
- || ($className eq 'Wt::Ext::Widget' and $name eq
'bindEventHandler')
- || ($className eq 'Wt::Ext::Widget' and $name eq
'createMixed')
--
-+ || ($className eq 'QWidget' and $name eq 'setupUi')
- || ($className eq 'KTextEditor::Range' and $name =~
/operator/)
- || ($className eq 'KTextEditor::Range' and $name eq
'boundaryOnColumn')
- || ($className eq 'KTextEditor::Cursor' and $name =~
/operator/)
diff --git a/source/kde/kdebindings/sip.patch b/source/kde/kdebindings/sip.patch
deleted file mode 100644
index a9121c0..0000000
--- a/source/kde/kdebindings/sip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur kdebindings-4.3.4/python/pykde4/sip/kdecore/typedefs.sip
kdebindings-4.3.4-p/python/pykde4/sip/kdecore/typedefs.sip
---- kdebindings-4.3.4/python/pykde4/sip/kdecore/typedefs.sip 2009-10-02
10:21:29.000000000 +0200
-+++ kdebindings-4.3.4-p/python/pykde4/sip/kdecore/typedefs.sip 2010-01-15
17:52:40.000000000 +0100
-@@ -466,7 +466,7 @@
- %End
- };
-
--
-+/*
- template <TYPE*>
- %MappedType QSet<TYPE*>
- {
-@@ -549,7 +549,7 @@
- return sipGetState(sipTransferObj);
- %End
- };
--
-+*/
-
- template <TYPE>
- %MappedType QSet<TYPE>
diff --git a/source/kde/kdebindings/sip4.11.2.patch
b/source/kde/kdebindings/sip4.11.2.patch
deleted file mode 100644
index 249ccb8..0000000
--- a/source/kde/kdebindings/sip4.11.2.patch
+++ /dev/null
@@ -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*>
- {
diff --git a/source/kde/kdebindings/sip4.12.patch
b/source/kde/kdebindings/sip4.12.patch
deleted file mode 100644
index 4a5c16e..0000000
--- a/source/kde/kdebindings/sip4.12.patch
+++ /dev/null
@@ -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>
- {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
