From b79967eca8ea0247475e29f5fd1ab0405c92cbd2eafcb4ea26cd5b27ee58b9b8 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 21 Dec 2012 08:15:28 +0000
Subject: [PATCH] Accepting request 145969 from KDE:Distro:Factory

Update KDE to KDE 4.10 RC

OBS-URL: https://build.opensuse.org/request/show/145969
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=23
---
 fix_build_for_unicode_python.diff | 13 +++++++++++++
 kate-4.9.90.tar.xz                |  3 ---
 kate-4.9.95.tar.xz                |  3 +++
 kate.changes                      |  8 ++++++++
 kate.spec                         |  7 +++++--
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 fix_build_for_unicode_python.diff
 delete mode 100644 kate-4.9.90.tar.xz
 create mode 100644 kate-4.9.95.tar.xz

diff --git a/fix_build_for_unicode_python.diff b/fix_build_for_unicode_python.diff
new file mode 100644
index 0000000..1902e54
--- /dev/null
+++ b/fix_build_for_unicode_python.diff
@@ -0,0 +1,13 @@
+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.90.tar.xz b/kate-4.9.90.tar.xz
deleted file mode 100644
index 38b9dc2..0000000
--- a/kate-4.9.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b648a9c8954b0b3bdf75292a678fade6afc9a0fe81eba7cf10cece7f6fbe2deb
-size 2414232
diff --git a/kate-4.9.95.tar.xz b/kate-4.9.95.tar.xz
new file mode 100644
index 0000000..0f0acd9
--- /dev/null
+++ b/kate-4.9.95.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54987c8754712a9f3aeb20b8550b7f1e0e625739e7c8976b57754c6ca6c73b0f
+size 2408504
diff --git a/kate.changes b/kate.changes
index 5f8c7f2..feaddb8 100644
--- a/kate.changes
+++ b/kate.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Dec 19 18:33:51 UTC 2012 - tittiatcoke@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
+
 -------------------------------------------------------------------
 Sat Dec  1 20:00:24 UTC 2012 - tittiatcoke@gmail.com
 
diff --git a/kate.spec b/kate.spec
index ec06710..e32eb00 100644
--- a/kate.spec
+++ b/kate.spec
@@ -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 lbeltrame@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 @@ Kate is an advanced text editor for KDE.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %ifarch ppc64
@@ -102,7 +106,6 @@ The libraries shared by kwrite and kate editors.
 %{_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.*