rpm/kate
SHA256
1
0
Fork 0
forked from pool/kate
Code Pull Requests Activity

Accepting request 159032 from KDE:Distro:Factory

Browse Source 
Update to 4.10.1 (forwarded request 158855 from tittiatcoke)

OBS-URL: https://build.opensuse.org/request/show/159032
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=29
This commit is contained in:
Stephan Kulow 2013-03-14 10:23:42 +00:00 committed by Git OBS Bridge
parent b75a0998c7
commit 215b96325b
6 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
fix-plugin-loading.diff
View File

@ -1,47 +0,0 @@
commit f934575613d7efc60b9b6be6203c777d42ab7ffc
Author: Dominik Haumann <dhaumann@kde.org>
Date: Sun Feb 10 22:18:38 2013 +0100
fix plugin loading in KDE SC 4.10.0
Thanks to Dorian and Loïc for finding the root of this issue.
BUG: 314530
FIXED-IN: 4.10.1
diff --git a/part/utils/katepartpluginmanager.cpp b/part/utils/katepartpluginmanager.cpp
index e9cb258..18fe6f0 100644
--- a/part/utils/katepartpluginmanager.cpp
+++ b/part/utils/katepartpluginmanager.cpp
@@ -75,17 +75,25 @@ KatePartPluginManager *KatePartPluginManager::self()
void KatePartPluginManager::setupPluginList ()
{
KService::List traderList = KServiceTypeTrader::self()->
- query("KTextEditor/Plugin",
- "([X-KDE-Version] >= 4.0) and ([X-KDE-Version] <= " + QString("%1.%2").arg(KDE::versionMajor()).arg(KDE::versionMinor()) + ')');
+ query("KTextEditor/Plugin");
foreach(const KService::Ptr &ptr, traderList)
{
- KatePartPluginInfo info(ptr);
+ QVariant version = ptr->property("X-KDE-Version", QVariant::String);
+ QStringList numbers = qvariant_cast<QString>(version).split('.');
+ unsigned int kdeVersion = KDE_MAKE_VERSION(numbers.value(0).toUInt(),
+ numbers.value(1).toUInt(),
+ numbers.value(2).toUInt());
- info.load = false;
- info.plugin = 0L;
+ if (KDE_MAKE_VERSION(4,0,0) <= kdeVersion && kdeVersion <= KDE::version())
+ {
+ KatePartPluginInfo info(ptr);
+
+ info.load = false;
+ info.plugin = 0L;
- m_pluginList.push_back (info);
+ m_pluginList.push_back (info);
+ }
}
}

3
kate-4.10.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c7c56228b7b917cba56a5ad53ba39834ac5284cf040de55a17bdad6d0ed2bd3
size 2387596

3
kate-4.10.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e7c273046998ac5dcc776345411091b20ef0b002c04e0f8ae37f8b5f0d99aa4f
size 2555700

14
kate.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Mar 13 09:54:26 UTC 2013 - hrvoje.senjan@gmail.com
- Added use-a-numeric-comparision.patch from upstream, fixes
building with python-qt 4.10
-------------------------------------------------------------------
Sat Mar 2 15:34:10 UTC 2013 - tittiatcoke@gmail.com
- Update to 4.10.1
* Contains bug fixes. See http://www.kde.org/announcements/
for more information
- Drop fix-plugin-loading.diff, applied upstream
-------------------------------------------------------------------
Mon Feb 11 20:12:44 UTC 2013 - hrvoje.senjan@gmail.com

6
kate.spec
View File

@ -17,15 +17,15 @@
Name: kate
Version: 4.10.0
Version: 4.10.1
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-UPSTREAM fix-plugin-loading.diff kde#314530
Patch0: fix-plugin-loading.diff
#PATCH-FIX-UPSTREAM use-a-numeric-comparision.patch -- Fixes build with python-qt 4.10
Patch0: use-a-numeric-comparision.patch
BuildRequires: fdupes
BuildRequires: libkactivities-devel
BuildRequires: libkde4-devel >= %version

37
use-a-numeric-comparision.patch Normal file
View File

@ -0,0 +1,37 @@
From: Shaheed Haque <srhaque@theiet.org>
Date: Sat, 09 Mar 2013 15:41:34 +0000
Subject: Fix Pate build for Qt 4.10
X-Git-Url: http://quickgit.kde.org/?p=kate.git&a=commitdiff&h=106f4ee310796170a28786a32f2a235d5464f83c
---
Fix Pate build for Qt 4.10
Use a numeric comparision, not a case-sensitive sring comparision!
---
--- a/kate/plugins/pate/CMakeLists.txt
+++ b/kate/plugins/pate/CMakeLists.txt
@@ -42,7 +42,7 @@
return()
endif (NOT PYTHON_LIBRARY)
if (NOT SIP_FOUND OR 0x${SIP_VERSION} LESS 0x40701)
- message(WARNING "Pate plugin needs SIP 4.7.1 or later.")
+ message(WARNING "Pate plugin needs SIP 4.7.1 or later. " ${SIP_VERSION})
return()
endif (NOT SIP_FOUND OR 0x${SIP_VERSION} LESS 0x40701)
if (NOT SIP_EXECUTABLE OR NOT EXISTS ${SIP_EXECUTABLE})
@@ -57,10 +57,10 @@
message(WARNING "Pate plugin needs the PyKDE4 development sip files kdecoremod.sip")
return()
endif()
-if (NOT PYQT4_FOUND OR PYQT4_VERSION LESS "040301")
- message(WARNING "Pate plugin needs PyQT 4.3.1 or later.")
+if (NOT PYQT4_FOUND OR 0x${PYQT4_VERSION} LESS 0x040301)
+ message(WARNING "Pate plugin needs PyQT 4.3.1 or later. " ${PYQT4_VERSION})
return()
-endif (NOT PYQT4_FOUND OR PYQT4_VERSION LESS "040301")
+endif (NOT PYQT4_FOUND OR 0x${PYQT4_VERSION} LESS 0x040301)
if (NOT PYKDE4_FOUND)
message(WARNING "Pate plugin needs PyKDE4.")
return()