diff --git a/.gitignore b/.gitignore index 669e771..0c9ed87 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/kdebindings-4.5.2.tar.bz2 -/kdebindings-4.5.3.tar.bz2 +/kdebindings-4.5.80.tar.bz2 diff --git a/kdebindings-4.5.1-sip_api_8.patch b/kdebindings-4.5.1-sip_api_8.patch deleted file mode 100644 index fa44602..0000000 --- a/kdebindings-4.5.1-sip_api_8.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -up kdebindings-4.5.1/python/pykde4/sip/kdecore/typedefs.sip.sip_api_8 kdebindings-4.5.1/python/pykde4/sip/kdecore/typedefs.sip ---- kdebindings-4.5.1/python/pykde4/sip/kdecore/typedefs.sip.sip_api_8 2010-01-20 10:25:59.000000000 -0600 -+++ kdebindings-4.5.1/python/pykde4/sip/kdecore/typedefs.sip 2010-09-09 19:20:27.502436770 -0500 -@@ -733,61 +733,6 @@ template - }; - - --%MappedType QList --{ --%TypeHeaderCode --#include --%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 *ql = new QList; -- -- 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 - %MappedType QStack - { diff --git a/kdebindings-4.5.2-mono28.patch b/kdebindings-4.5.2-mono28.patch deleted file mode 100644 index 3e71a52..0000000 --- a/kdebindings-4.5.2-mono28.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up kdebindings-4.5.2/csharp/kimono/CMakeLists.txt.mono28 kdebindings-4.5.2/csharp/kimono/CMakeLists.txt ---- kdebindings-4.5.2/csharp/kimono/CMakeLists.txt.mono28 2010-05-20 06:43:57.000000000 -0500 -+++ kdebindings-4.5.2/csharp/kimono/CMakeLists.txt 2010-10-24 07:57:33.181380065 -0500 -@@ -22,7 +22,7 @@ TARGET_LINK_LIBRARIES(kimono qyoto smoke - ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS}) - - # write FindPackage modules for these --pkg_search_module(LIBMONO mono) -+pkg_search_module(LIBMONO mono-2 mono) - pkg_search_module(GLIB2 glib-2.0) - - macro_log_feature(LIBMONO_FOUND "libmono" "Mono library" "http://www.mono-project.com" FALSE "" "Required to compile kimonopluginfactory") -diff -up kdebindings-4.5.2/csharp/kimono/src/kimonopluginfactory.cpp.mono28 kdebindings-4.5.2/csharp/kimono/src/kimonopluginfactory.cpp ---- kdebindings-4.5.2/csharp/kimono/src/kimonopluginfactory.cpp.mono28 2010-05-16 05:04:56.000000000 -0500 -+++ kdebindings-4.5.2/csharp/kimono/src/kimonopluginfactory.cpp 2010-10-24 07:58:49.048630157 -0500 -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/kdebindings.spec b/kdebindings.spec index 3139eeb..028d098 100644 --- a/kdebindings.spec +++ b/kdebindings.spec @@ -37,7 +37,7 @@ %global _cmake_skip_rpath %{nil} Name: kdebindings -Version: 4.5.3 +Version: 4.5.80 Release: 1%{?dist} Summary: KDE bindings to non-C++ languages @@ -50,15 +50,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar. BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstreamable patches -# fix build with newer sip/PyQt (borrowed from opensuse) -Patch51: kdebindings-4.5.1-sip_api_8.patch ## upstream patches ## trunk -# kdebindings-csharp fails to build with mono 2.8, http://bugs.kde.org/254629 -# should backport this if not already done -# Patch150: kdebindings-4.5.2-mono28.patch BuildRequires: akonadi-devel BuildRequires: kdebase-workspace-devel >= %{version} @@ -266,11 +261,6 @@ Falcon plugin for the Kross archtecture in KDE4. %prep %setup -q -n kdebindings-%{version}%{?alphatag} -%if 0%{?_sip_api_major} >= 8 -%patch51 -p1 -b .sip_api_8 -%endif -#%patch150 -p1 -b .mono28 - %build mkdir -p %{_target_platform} @@ -557,6 +547,9 @@ fi %changelog +* Sun Nov 21 2010 Rex Dieter - 4.5.80-1 +- 4.5.80 (4.6beta1) + * Fri Oct 29 2010 Than Ngo - 4.5.3-1 - 4.5.3 diff --git a/sources b/sources index 73ba4f4..6e3b60f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -639a3ff6de7b19ca9437560a134f8629 kdebindings-4.5.3.tar.bz2 +916b10688f7a6f87e35ee257d134359f kdebindings-4.5.80.tar.bz2