Hello community,
here is the log from the commit of package kdebindings3
checked in at Thu Oct 12 15:18:49 CEST 2006.
--------
--- KDE/kdebindings3/kdebindings3-java.changes 2006-10-03 17:54:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebindings3/kdebindings3-java.changes 2006-10-12 15:18:11.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Oct 12 01:02:31 CEST 2006 - dmueller@suse.de
+
+- update 3_5_BRANCH.diff to include fixes for python 2.5
+ bindings
+
+-------------------------------------------------------------------
kdebindings3-javascript.changes: same change
kdebindings3-python.changes: same change
kdebindings3.changes: same change
New:
----
3_5_BRANCH.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebindings3-java.spec ++++++
--- /var/tmp/diff_new_pack.hTVGRk/_old 2006-10-12 15:18:21.000000000 +0200
+++ /var/tmp/diff_new_pack.hTVGRk/_new 2006-10-12 15:18:21.000000000 +0200
@@ -24,12 +24,12 @@
Summary: Java Bindings for KDE
Provides: kdebindings3:/opt/kde3/lib/java
Version: 3.5.5
-Release: 1
+Release: 3
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: python2.diff
Patch2: perl.diff
Patch3: lib64.diff
@@ -85,7 +85,7 @@
%endif
%prep
%setup -q -n kdebindings-%{version}
-#%patch0
+%patch0
%patch1
%patch2
if [ "lib64" = %_lib ]; then
@@ -267,6 +267,9 @@
%endif
%changelog -n kdebindings3-java
+* Thu Oct 12 2006 - dmueller@suse.de
+- update 3_5_BRANCH.diff to include fixes for python 2.5
+ bindings
* Tue Oct 03 2006 - stbinner@suse.de
- update to 3.5.5 release tarball
* Fri Sep 29 2006 - dmueller@suse.de
++++++ kdebindings3-javascript.spec ++++++
--- /var/tmp/diff_new_pack.hTVGRk/_old 2006-10-12 15:18:21.000000000 +0200
+++ /var/tmp/diff_new_pack.hTVGRk/_new 2006-10-12 15:18:21.000000000 +0200
@@ -24,12 +24,12 @@
Summary: JavaScript Bindings and Interpreter for KDE
Provides: kdebindings
Version: 3.5.5
-Release: 1
+Release: 3
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: python2.diff
Patch2: perl.diff
Patch3: lib64.diff
@@ -92,7 +92,7 @@
%endif
%prep
%setup -q -n kdebindings-%{version}
-#%patch0
+%patch0
%patch1
%patch2
if [ "lib64" = %_lib ]; then
@@ -274,6 +274,9 @@
%endif
%changelog -n kdebindings3-javascript
+* Thu Oct 12 2006 - dmueller@suse.de
+- update 3_5_BRANCH.diff to include fixes for python 2.5
+ bindings
* Tue Oct 03 2006 - stbinner@suse.de
- update to 3.5.5 release tarball
* Fri Sep 29 2006 - dmueller@suse.de
++++++ kdebindings3-python.spec ++++++
--- /var/tmp/diff_new_pack.hTVGRk/_old 2006-10-12 15:18:21.000000000 +0200
+++ /var/tmp/diff_new_pack.hTVGRk/_new 2006-10-12 15:18:21.000000000 +0200
@@ -24,12 +24,12 @@
Summary: Python Bindings for KDE
Provides: sip PyKDE
Version: 3.5.5
-Release: 1
+Release: 3
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) python-qt = %{version}
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: python2.diff
Patch2: perl.diff
Patch3: lib64.diff
@@ -85,7 +85,7 @@
%endif
%prep
%setup -q -n kdebindings-%{version}
-#%patch0
+%patch0
%patch1
%patch2
if [ "lib64" = %_lib ]; then
@@ -267,6 +267,9 @@
%endif
%changelog -n kdebindings3-python
+* Thu Oct 12 2006 - dmueller@suse.de
+- update 3_5_BRANCH.diff to include fixes for python 2.5
+ bindings
* Tue Oct 03 2006 - stbinner@suse.de
- update to 3.5.5 release tarball
* Fri Sep 29 2006 - dmueller@suse.de
++++++ kdebindings3.spec ++++++
--- /var/tmp/diff_new_pack.hTVGRk/_old 2006-10-12 15:18:21.000000000 +0200
+++ /var/tmp/diff_new_pack.hTVGRk/_new 2006-10-12 15:18:21.000000000 +0200
@@ -24,12 +24,12 @@
Summary: Bindings for Qt and KDE Libraries
Provides: kdebindings
Version: 3.5.5
-Release: 1
+Release: 3
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: python2.diff
Patch2: perl.diff
Patch3: lib64.diff
@@ -99,7 +99,7 @@
%endif
%prep
%setup -q -n kdebindings-%{version}
-#%patch0
+%patch0
%patch1
%patch2
if [ "lib64" = %_lib ]; then
@@ -281,6 +281,9 @@
%endif
%changelog -n kdebindings3
+* Thu Oct 12 2006 - dmueller@suse.de
+- update 3_5_BRANCH.diff to include fixes for python 2.5
+ bindings
* Tue Oct 03 2006 - stbinner@suse.de
- update to 3.5.5 release tarball
* Fri Sep 29 2006 - dmueller@suse.de
++++++ 3_5_BRANCH.diff ++++++
package: kdebindings-3.5.5.tar.bz2
kdemod: kdebindings
svn di between /tags/KDE/3.5.5 and /branches/KDE//branches/KDE/3.5
--- python/Makefile.am
+++ python/Makefile.am
@@ -26,7 +26,7 @@
cd $(srcdir)/sip ; \
export QTDIR=${qt_dir} ; \
export PYTHONPATH=$$builddir/sip:$$PYTHONPATH ; \
- @PYTHON@ configure.py -b @bindir@ -d ${site_packages} -e ${python_inc_dir} -l qt-mt -v ${sip_dir} -t "$$builddir/sip" INCDIR_QT=@qt_includes@
+ @PYTHON@ configure.py -b @bindir@ -d ${site_packages} -e ${python_inc_dir} -l qt-mt -v ${sip_dir} -t "$$builddir/sip" INCDIR_QT=@qt_includes@ CXXFLAGS_WARN_OFF='' CFLAGS_WARN_OFF=''
@(cd sip ; $(MAKE))
echo "" > sipdone
--- python/sip/siplib/sip.h
+++ python/sip/siplib/sip.h
@@ -47,6 +47,12 @@
#define SIP_VERSION_STR "4.2.1"
#define SIP_BUILD "297"
+/* Some internal compatibility stuff. */
+#if PY_VERSION_HEX >= 0x02050000
+#define _SIP_SSIZE_T Py_ssize_t
+#else
+#define _SIP_SSIZE_T int
+#endif
/*
* Define the current API version number. SIP must handle modules with the
@@ -535,12 +541,12 @@
* The following are part of the public API.
*/
void (*api_bad_catcher_result)(PyObject *method);
- void (*api_bad_length_for_slice)(int seqlen,int slicelen);
+ void (*api_bad_length_for_slice)(_SIP_SSIZE_T seqlen,_SIP_SSIZE_T slicelen);
PyObject *(*api_build_result)(int *isErr,char *fmt,...);
PyObject *(*api_call_method)(int *isErr,PyObject *method,char *fmt,...);
PyObject *(*api_class_name)(PyObject *self);
PyObject *(*api_connect_rx)(PyObject *txObj,const char *sig,PyObject *rxObj,const char *slot);
- int (*api_convert_from_sequence_index)(int idx,int len);
+ _SIP_SSIZE_T (*api_convert_from_sequence_index)(_SIP_SSIZE_T idx,_SIP_SSIZE_T len);
void *(*api_convert_to_cpp)(PyObject *sipSelf,sipWrapperType *type,int *iserrp);
PyObject *(*api_disconnect_rx)(PyObject *txObj,const char *sig,PyObject *rxObj,const char *slot);
int (*api_emit_signal)(PyObject *self,const char *sig,PyObject *sigargs);
--- python/sip/siplib/siplib.c
+++ python/sip/siplib/siplib.c
@@ -28,12 +28,12 @@
* These are the functions that make up the public and private SIP API.
*/
static void sip_api_bad_catcher_result(PyObject *method);
-static void sip_api_bad_length_for_slice(int seqlen,int slicelen);
+static void sip_api_bad_length_for_slice(_SIP_SSIZE_T seqlen,_SIP_SSIZE_T slicelen);
static PyObject *sip_api_build_result(int *isErr,char *fmt,...);
static PyObject *sip_api_call_method(int *isErr,PyObject *method,char *fmt,
...);
static PyObject *sip_api_class_name(PyObject *self);
-static int sip_api_convert_from_sequence_index(int idx,int len);
+static _SIP_SSIZE_T sip_api_convert_from_sequence_index(_SIP_SSIZE_T idx, _SIP_SSIZE_T len);
static void *sip_api_convert_to_cpp(PyObject *sipSelf,sipWrapperType *type,
int *iserrp);
static PyObject *sip_api_get_wrapper(void *cppPtr,sipWrapperType *type);
@@ -2340,7 +2340,7 @@
* Convert a sequence index. Return the index or a negative value if there was
* an error.
*/
-static int sip_api_convert_from_sequence_index(int idx,int len)
+static _SIP_SSIZE_T sip_api_convert_from_sequence_index(_SIP_SSIZE_T idx,_SIP_SSIZE_T len)
{
/* Negative indices start from the other end. */
if (idx < 0)
@@ -2934,9 +2934,15 @@
/*
* Report a sequence length that does not match the length of a slice.
*/
-static void sip_api_bad_length_for_slice(int seqlen,int slicelen)
+static void sip_api_bad_length_for_slice(_SIP_SSIZE_T seqlen,_SIP_SSIZE_T slicelen)
{
- PyErr_Format(PyExc_ValueError,"attempt to assign sequence of size %d to slice of size %d",seqlen,slicelen);
+ PyErr_Format(PyExc_ValueError,
+#if PY_VERSION_HEX >= 0x02050000
+ "attempt to assign sequence of size %zd to slice of size %zd",
+#else
+ "attempt to assign sequence of size %d to slice of size %d",
+#endif
+ seqlen,slicelen);
}
@@ -4075,7 +4081,7 @@
/*
* The type alloc slot.
*/
-static PyObject *sipWrapperType_alloc(PyTypeObject *self, int nitems)
+static PyObject *sipWrapperType_alloc(PyTypeObject *self, _SIP_SSIZE_T nitems)
{
PyObject *o;
--- python/sip/sipgen/gencode.c
+++ python/sip/sipgen/gencode.c
@@ -3053,7 +3053,7 @@
" return Py_NotImplemented;\n"
" }\n"
"\n"
- ,classFQCName(cd));
+ ,classFQCName(cd),classFQCName(cd));
prcode(fp,
" %S *sipCpp = reinterpret_cast<%S *>(sipGetCppPtr((sipWrapper *)sipSelf,sipClass_%C));\n"
--- python/pykde/sip/kio/global.sip
+++ python/pykde/sip/kio/global.sip
@@ -675,7 +675,7 @@
QMap