From 0200c68c9882e4898b9e4b0b7775aa4613ad2584 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Jul 11 2014 08:36:41 +0000
Subject: Update to 4.6.90 (beta1)


---

diff --git a/.gitignore b/.gitignore
index 19928d3..4c11b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /kdevelop-4.5.80.tar.xz
 /kdevelop-4.5.90.tar.xz
 /kdevelop-4.6.0.tar.xz
+/kdevelop-4.6.90.tar.xz
diff --git a/kdevelop-4.6.0-ninja-builder.patch b/kdevelop-4.6.0-ninja-builder.patch
deleted file mode 100644
index f1ab12d..0000000
--- a/kdevelop-4.6.0-ninja-builder.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp b/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp
-index 909d146..dc28408 100644
---- a/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp
-+++ b/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp
-@@ -20,7 +20,6 @@
- #include "ninjajob.h"
- #include <KAboutData>
- #include <KPluginFactory>
--#include <KStandardDirs>
- #include <KDebug>
- #include <KConfigGroup>
- #include <KShell>
-@@ -43,7 +42,7 @@ KDevNinjaBuilderPlugin::KDevNinjaBuilderPlugin(QObject* parent, const QVariantLi
- 
- bool KDevNinjaBuilderPlugin::hasError() const
- {
--    return KStandardDirs::findExe("ninja").isEmpty();
-+    return NinjaJob::ninjaBinary().isEmpty();
- }
- 
- static QStringList targetsInFolder(KDevelop::ProjectFolderItem* item)
-diff --git a/projectbuilders/ninjabuilder/ninjajob.cpp b/projectbuilders/ninjabuilder/ninjajob.cpp
-index 9efa57c..acb5d07 100644
---- a/projectbuilders/ninjabuilder/ninjajob.cpp
-+++ b/projectbuilders/ninjabuilder/ninjajob.cpp
-@@ -22,6 +22,7 @@
- #include <KDebug>
- #include <KLocalizedString>
- #include <KConfigGroup>
-+#include <KStandardDirs>
- #include <interfaces/iproject.h>
- #include <outputview/outputmodel.h>
- #include <project/interfaces/ibuildsystemmanager.h>
-@@ -44,7 +45,7 @@ NinjaJob::NinjaJob(KDevelop::ProjectBaseItem* item, const QStringList& arguments
-     setFilteringStrategy( KDevelop::OutputModel::CompilerFilter );
-     setProperties( NeedWorkingDirectory | PortableMessages | DisplayStderr | IsBuilderHint | PostProcessOutput );
- 
--    *this << "ninja";
-+    *this << ninjaBinary();
-     *this << arguments;
- 
-     QStringList targets;
-@@ -68,6 +69,15 @@ void NinjaJob::setIsInstalling( bool isInstalling )
-     m_isInstalling = isInstalling;
- }
- 
-+QString NinjaJob::ninjaBinary()
-+{
-+    QString path = KStandardDirs::findExe("ninja-build");
-+    if (path.isEmpty()) {
-+        path = KStandardDirs::findExe("ninja");
-+    }
-+    return path;
-+}
-+
- KUrl NinjaJob::workingDirectory() const
- {
-     KDevelop::ProjectBaseItem* it = item();
-diff --git a/projectbuilders/ninjabuilder/ninjajob.h b/projectbuilders/ninjabuilder/ninjajob.h
-index 0bd1725..1186c06 100644
---- a/projectbuilders/ninjabuilder/ninjajob.h
-+++ b/projectbuilders/ninjabuilder/ninjajob.h
-@@ -39,6 +39,7 @@ class NinjaJob : public KDevelop::OutputExecuteJob
-     public:
-         NinjaJob( KDevelop::ProjectBaseItem* item, const QStringList& arguments, const QByteArray& signal, QObject* parent );
-         void setIsInstalling( bool isInstalling );
-+        static QString ninjaBinary();
- 
-         virtual KUrl workingDirectory() const;
-         virtual QStringList privilegedExecutionCommand() const;
-
diff --git a/kdevelop.spec b/kdevelop.spec
index 70af6b8..c62d93f 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -1,11 +1,11 @@
 
-%define kdevplatform_ver 1.6.0
+%define kdevplatform_ver 1.6.90
 
 Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
-Version: 4.6.0
-Release: 5%{?dist}
+Version: 4.6.90
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kdevelop.org/
@@ -13,8 +13,6 @@ Source0: http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-%{versi
 
 # remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line
 Patch0:  kdevelop-4.5.0-no-rpath.patch
-# fix ninja builder
-Patch1:  kdevelop-4.6.0-ninja-builder.patch
 
 # upstreamable patches
 
@@ -88,7 +86,6 @@ Requires: okteta >= 4.10.1
 %prep
 %setup -q -n kdevelop-%{version}
 %patch0 -p1 -b .no-rpath
-%patch1 -p1 -b .ninja-build
 
 %build
 mkdir -p %{_target_platform}
@@ -129,7 +126,7 @@ update-desktop-database -q &> /dev/null
 update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || :
 
 %files -f %{name}.lang
-%doc AUTHORS COPYING COPYING.DOC COPYING.LIB CHANGELOG.4.6.0 TODO NEWS
+%doc AUTHORS COPYING COPYING.DOC COPYING.LIB CHANGELOG.4.6.90
 %{_kde4_bindir}/kdevelop
 %{_kde4_bindir}/kdevelop!
 %{_kde4_configdir}/kdeveloprc
@@ -156,6 +153,9 @@ update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Fri Jul 11 2014 Jan Grulich <jgrulich@redhat.com> 9:4.6.90-1
+- Update to 4.6.90 (beta1)
+
 * Thu Jul 03 2014 Rex Dieter <rdieter@fedoraproject.org> 9:4.6.0-5
 - optimize mimeinfo scriptlet, .spec cleanup
 - BR: qtwebkit ...
diff --git a/sources b/sources
index b1702b9..3565a81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c1a1e880d27990246e3bdd712db1037  kdevelop-4.6.0.tar.xz
+6f3db3b10483cbc39f303344956fff08  kdevelop-4.6.90.tar.xz