Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2012-12-21 09:15:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2012-12-07 14:17:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2012-12-21 09:15:30.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 19 18:33:51 UTC 2012 - tittiatc...@gmail.com + +- Update to 4.9.95 + * This is the first RC release for 4.10. Contains bugfixes +- Added fix_build_for_unicode_python.diff patch, fixes 32bit + compilation + +------------------------------------------------------------------- Old: ---- kate-4.9.90.tar.xz New: ---- fix_build_for_unicode_python.diff kate-4.9.95.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.2ZTv5S/_old 2012-12-21 09:15:31.000000000 +0100 +++ /var/tmp/diff_new_pack.2ZTv5S/_new 2012-12-21 09:15:31.000000000 +0100 @@ -17,14 +17,17 @@ Name: kate -Version: 4.9.90 +Version: 4.9.95 Release: 0 Summary: Advanced Text Editor License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://www.kde.org/ Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE fix_build_for_unicode_python.diff lbeltr...@kde.org -- Fixes 32bit compilation +Patch0: fix_build_for_unicode_python.diff BuildRequires: fdupes +BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %version BuildRequires: libqjson-devel BuildRequires: python-devel @@ -43,6 +46,7 @@ %prep %setup -q +%patch0 -p1 %build %ifarch ppc64 @@ -102,7 +106,6 @@ %{_kde4_appsdir}/ktexteditor_exporter/ %{_kde4_appsdir}/ktexteditor_iconinserter/ %{_kde4_appsdir}/ktexteditor_insertfile/ -%{_kde4_appsdir}/ktexteditor_kdatatool/ %{_kde4_iconsdir}/hicolor/*/apps/ktexteditorautobrace.svgz %{_kde4_iconsdir}/oxygen/*/actions/*.png %{_kde4_libdir}/libkatepartinterfaces.so.* ++++++ fix_build_for_unicode_python.diff ++++++ diff --git a/kate/plugins/pate/src/utilities.cpp b/kate/plugins/pate/src/utilities.cpp index 0e405e3..6be8949 100644 --- a/kate/plugins/pate/src/utilities.cpp +++ b/kate/plugins/pate/src/utilities.cpp @@ -371,7 +371,7 @@ QString Python::unicode(PyObject *string) return QString::fromWCharArray(PyUnicode_AsUnicode(string), unichars); #else #ifdef Py_UNICODE_WIDE - return QString::fromUcs4(PyUnicode_AsUnicode(string), unichars); + return QString::fromUcs4((const unsigned int*)PyUnicode_AsUnicode(string), unichars); #else return QString::fromUtf16(PyUnicode_AsUnicode(string), unichars); #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
