Mailinglist Archive: opensuse-commit (1670 mails)

< Previous Next >
commit koffice
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 5 Oct 2006 09:54:13 +0200 (CEST)
  • Message-id: <20061005075413.89D5F18C69F@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package koffice
checked in at Thu Oct 5 09:54:13 CEST 2006.

--------
--- KDE/koffice/koffice.changes 2006-09-27 13:52:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/koffice/koffice.changes 2006-10-05 01:18:53.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Oct 5 01:18:39 CEST 2006 - dmueller@xxxxxxx
+
+- build against python 2.5
+
+-------------------------------------------------------------------

New:
----
koffice-python25.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ koffice.spec ++++++
--- /var/tmp/diff_new_pack.v3fZ31/_old 2006-10-05 09:53:42.000000000 +0200
+++ /var/tmp/diff_new_pack.v3fZ31/_new 2006-10-05 09:53:42.000000000 +0200
@@ -29,7 +29,7 @@
Group: Productivity/Office/Suite
Summary: Libraries and Base Files for the KDE Office Suite
Version: 1.5.92
-Release: 3
+Release: 5
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: koffice-%{version}.tar.bz2
@@ -37,6 +37,7 @@
Source5: esstix.zip
#Patch0: 1_5_BRANCH.diff
Patch1: fixme.diff
+Patch2: koffice-python25.diff
Patch5: fix-compile.diff
Patch7: kross-ruby.diff
Patch8: libexif0610.diff
@@ -255,6 +256,7 @@
%setup -q -n koffice-%version
#%patch
%patch1
+%patch2
%patch5
%patch7
%if %suse_version == 920
@@ -708,6 +710,8 @@
/opt/kde3/include/*

%changelog -n koffice
+* Thu Oct 05 2006 - dmueller@xxxxxxx
+- build against python 2.5
* Wed Sep 27 2006 - stbinner@xxxxxxx
- build with GraphicsMagick dependency/functionality
* Wed Sep 20 2006 - stbinner@xxxxxxx



++++++ koffice-python25.diff ++++++
Index: lib/kross/python/cxx/cxx_extensions.cxx
===================================================================
--- lib/kross/python/cxx/cxx_extensions.cxx (revision 592285)
+++ lib/kross/python/cxx/cxx_extensions.cxx (working copy)
@@ -147,16 +147,19 @@ extern "C"
static long hash_handler (PyObject*);
static PyObject* call_handler (PyObject*, PyObject*, PyObject*);

+#if PY_VERSION_HEX < 0x02050000
+ typedef int Py_ssize_t;
+#endif
// Sequence methods
- static int sequence_length_handler(PyObject*);
+ static Py_ssize_t sequence_length_handler(PyObject*);
static PyObject* sequence_concat_handler(PyObject*,PyObject*);
- static PyObject* sequence_repeat_handler(PyObject*, int);
- static PyObject* sequence_item_handler(PyObject*, int);
- static PyObject* sequence_slice_handler(PyObject*, int, int);
- static int sequence_ass_item_handler(PyObject*, int, PyObject*);
- static int sequence_ass_slice_handler(PyObject*, int, int, PyObject*);
+ static PyObject* sequence_repeat_handler(PyObject*, Py_ssize_t);
+ static PyObject* sequence_item_handler(PyObject*, Py_ssize_t);
+ static PyObject* sequence_slice_handler(PyObject*, Py_ssize_t, Py_ssize_t);
+ static int sequence_ass_item_handler(PyObject*, Py_ssize_t, PyObject*);
+ static int sequence_ass_slice_handler(PyObject*, Py_ssize_t, Py_ssize_t, PyObject*);
// Mapping
- static int mapping_length_handler(PyObject*);
+ static Py_ssize_t mapping_length_handler(PyObject*);
static PyObject* mapping_subscript_handler(PyObject*, PyObject*);
static int mapping_ass_subscript_handler(PyObject*, PyObject*, PyObject*);

@@ -185,9 +188,9 @@ extern "C"
static PyObject* number_power_handler(PyObject*, PyObject*, PyObject*);

// Buffer
- static int buffer_getreadbuffer_handler (PyObject*, int, void**);
- static int buffer_getwritebuffer_handler (PyObject*, int, void**);
- static int buffer_getsegcount_handler (PyObject*, int*);
+ static Py_ssize_t buffer_getreadbuffer_handler (PyObject*, Py_ssize_t, void**);
+ static Py_ssize_t buffer_getwritebuffer_handler (PyObject*, Py_ssize_t, void**);
+ static Py_ssize_t buffer_getsegcount_handler (PyObject*, Py_ssize_t*);
}


@@ -555,7 +558,7 @@ extern "C" PyObject* call_handler( PyObj


// Sequence methods
-extern "C" int sequence_length_handler( PyObject *self )
+extern "C" Py_ssize_t sequence_length_handler( PyObject *self )
{
try
{
@@ -581,7 +584,7 @@ extern "C" PyObject* sequence_concat_han
}
}

-extern "C" PyObject* sequence_repeat_handler( PyObject *self, int count )
+extern "C" PyObject* sequence_repeat_handler( PyObject *self, Py_ssize_t count )
{
try
{
@@ -594,7 +597,7 @@ extern "C" PyObject* sequence_repeat_han
}
}

-extern "C" PyObject* sequence_item_handler( PyObject *self, int index )
+extern "C" PyObject* sequence_item_handler( PyObject *self, Py_ssize_t index )
{
try
{
@@ -607,7 +610,7 @@ extern "C" PyObject* sequence_item_handl
}
}

-extern "C" PyObject* sequence_slice_handler( PyObject *self, int first, int last )
+extern "C" PyObject* sequence_slice_handler( PyObject *self, Py_ssize_t first, Py_ssize_t last )
{
try
{
@@ -620,7 +623,7 @@ extern "C" PyObject* sequence_slice_hand
}
}

-extern "C" int sequence_ass_item_handler( PyObject *self, int index, PyObject *value )
+extern "C" int sequence_ass_item_handler( PyObject *self, Py_ssize_t index, PyObject *value )
{
try
{
@@ -633,7 +636,7 @@ extern "C" int sequence_ass_item_handler
}
}

-extern "C" int sequence_ass_slice_handler( PyObject *self, int first, int last, PyObject *value )
+extern "C" int sequence_ass_slice_handler( PyObject *self, Py_ssize_t first, Py_ssize_t last, PyObject *value )
{
try
{
@@ -647,7 +650,7 @@ extern "C" int sequence_ass_slice_handle
}

// Mapping
-extern "C" int mapping_length_handler( PyObject *self )
+extern "C" Py_ssize_t mapping_length_handler( PyObject *self )
{
try
{
@@ -974,7 +977,7 @@ extern "C" PyObject* number_power_handle
}

// Buffer
-extern "C" int buffer_getreadbuffer_handler( PyObject *self, int index, void **pp )
+extern "C" Py_ssize_t buffer_getreadbuffer_handler( PyObject *self, Py_ssize_t index, void **pp )
{
try
{
@@ -987,7 +990,7 @@ extern "C" int buffer_getreadbuffer_hand
}
}

-extern "C" int buffer_getwritebuffer_handler( PyObject *self, int index, void **pp )
+extern "C" Py_ssize_t buffer_getwritebuffer_handler( PyObject *self, Py_ssize_t index, void **pp )
{
try
{
@@ -1000,12 +1003,15 @@ extern "C" int buffer_getwritebuffer_han
}
}

-extern "C" int buffer_getsegcount_handler( PyObject *self, int *count )
+extern "C" Py_ssize_t buffer_getsegcount_handler( PyObject *self, Py_ssize_t *count )
{
try
{
PythonExtensionBase *p = static_cast<PythonExtensionBase *>( self );
- return p->buffer_getsegcount( count );
+ int i_count = *count;
+ Py_ssize_t r = p->buffer_getsegcount( &i_count );
+ *count = i_count;
+ return r;
}
catch( Py::Exception & )
{

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread