From 292638f425cab3684de7efc011aa87ebbde9817ffd0798d5646161bcaa6e85ae Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 7 Jan 2013 14:24:26 +0000 Subject: [PATCH] Accepting request 146997 from KDE:Distro:Factory Update KDE to KDE 4.10 RC2 OBS-URL: https://build.opensuse.org/request/show/146997 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=24 --- fix_build_for_unicode_python.diff | 13 ------------- kate-4.9.95.tar.xz | 3 --- kate-4.9.97.tar.xz | 3 +++ kate.changes | 8 ++++++++ kate.spec | 7 ++----- 5 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 fix_build_for_unicode_python.diff delete mode 100644 kate-4.9.95.tar.xz create mode 100644 kate-4.9.97.tar.xz diff --git a/fix_build_for_unicode_python.diff b/fix_build_for_unicode_python.diff deleted file mode 100644 index 1902e54..0000000 --- a/fix_build_for_unicode_python.diff +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/kate-4.9.95.tar.xz b/kate-4.9.95.tar.xz deleted file mode 100644 index 0f0acd9..0000000 --- a/kate-4.9.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54987c8754712a9f3aeb20b8550b7f1e0e625739e7c8976b57754c6ca6c73b0f -size 2408504 diff --git a/kate-4.9.97.tar.xz b/kate-4.9.97.tar.xz new file mode 100644 index 0000000..310529b --- /dev/null +++ b/kate-4.9.97.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa95fda312f80d66b0a3308acb27b20b9c8983435a68d513219f3a3bec2c195d +size 2409176 diff --git a/kate.changes b/kate.changes index feaddb8..53c9058 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 3 21:06:39 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.9.97 + * This is the second RC release for 4.10. Contains bugfixes +- Dropped patch fix_build_for_unicode_python.diff as this was + incorporated upstream + ------------------------------------------------------------------- Wed Dec 19 18:33:51 UTC 2012 - tittiatcoke@gmail.com diff --git a/kate.spec b/kate.spec index e32eb00..b335e58 100644 --- a/kate.spec +++ b/kate.spec @@ -1,7 +1,7 @@ # # spec file for package kate # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: kate -Version: 4.9.95 +Version: 4.9.97 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 lbeltrame@kde.org -- Fixes 32bit compilation -Patch0: fix_build_for_unicode_python.diff BuildRequires: fdupes BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %version @@ -46,7 +44,6 @@ Kate is an advanced text editor for KDE. %prep %setup -q -%patch0 -p1 %build %ifarch ppc64