[kate] revert upstream commit that breaks build

Rex Dieter rdieter at fedoraproject.org
Mon Dec 2 14:58:48 UTC 2013


commit bcb4b0bfdbf0592c5114e1c92612418ccb89cd15
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 2 08:58:31 2013 -0600

    revert upstream commit that breaks build

 ...r-exception-rollback-as-it-was-before-T.C.patch |   27 ++++++++++++++++++++
 kate.spec                                          |    4 +++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/0001-fix-KeyError-exception-rollback-as-it-was-before-T.C.patch b/0001-fix-KeyError-exception-rollback-as-it-was-before-T.C.patch
new file mode 100644
index 0000000..df7717d
--- /dev/null
+++ b/0001-fix-KeyError-exception-rollback-as-it-was-before-T.C.patch
@@ -0,0 +1,27 @@
+From 3115a93d4f35cdb9ab37768cdc90a944c0a7f36d Mon Sep 17 00:00:00 2001
+From: Alex Turbov <i.zaufi at gmail.com>
+Date: Tue, 5 Nov 2013 20:26:52 +0400
+Subject: [PATCH 01/29] fix KeyError exception (rollback as it was before T.C.
+ Hollingsworth broke it 4 days ago)
+
+---
+ .../pate/src/plugins/cmake_utils/command_completers/param_types.py     | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/addons/kate/pate/src/plugins/cmake_utils/command_completers/param_types.py b/addons/kate/pate/src/plugins/cmake_utils/command_completers/param_types.py
+index edc5b8d..d32b6c0 100644
+--- a/addons/kate/pate/src/plugins/cmake_utils/command_completers/param_types.py
++++ b/addons/kate/pate/src/plugins/cmake_utils/command_completers/param_types.py
+@@ -211,8 +211,7 @@ class MultiSignature(object):
+ class OneOf(object):
+     '''Class to choose one of possible syntax'''
+ 
+-    def __init__(self, *syntaxes, **kwargs):
+-        exppos = kwargs['exppos']
++    def __init__(self, *syntaxes, exppos=None):
+         self.syntaxes = syntaxes
+         assert(exppos is None or isinstance(exppos, int))
+         self.exppos = exppos
+-- 
+1.8.4.2
+
diff --git a/kate.spec b/kate.spec
index 49996eb..c2a626e 100644
--- a/kate.spec
+++ b/kate.spec
@@ -24,6 +24,8 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 ## upstreamable patches
 
 ## upstream patches
+# revert upstream commit that breaks build
+Patch0001: 0001-fix-KeyError-exception-rollback-as-it-was-before-T.C.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: kactivities-devel >= %{version}
@@ -95,6 +97,8 @@ Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 %prep
 %setup -q
 
+%patch0001 -p1 -R -b .0001
+
 
 %build
 mkdir -p %{_target_platform}


More information about the scm-commits mailing list