smani pushed to qt-creator (f22). "Add patch to correctly call ninja-build"

[notifications at fedoraproject.org]

>From c8361e0836deb1bc9d5b810e372b90743ad1055b Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro at gmail.com>
Date: Tue, 28 Apr 2015 23:00:51 +0200
Subject: Add patch to correctly call ninja-build


diff --git a/qt-creator.spec b/qt-creator.spec
index 3829852..47fbfe8 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -2,7 +2,7 @@
 
 Name:           qt-creator
 Version:        3.4.0
-Release:        1%{?pre:.%pre}%{?dist}
+Release:        2%{?pre:.%pre}%{?dist}
 Summary:        Cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -14,6 +14,8 @@ Patch0:         qt-creator_docdir.patch
 # Use absolute paths for the specified rpaths, not $ORIGIN-relative paths
 # (to fix some /usr/bin/<binary> having rpath $ORIGIN/..)
 Patch1:         qt-creator_rpath.patch
+# In Fedora, the ninja command is called ninja-build
+Patch2:         qt-creator_ninja-build.patch
 
 Source1:        qtcreator.desktop
 Source2:        qt-creator-Fedora-privlibs
@@ -75,6 +77,7 @@ tailored to the needs of Qt developers.
 %setup -q -n qt-creator-opensource-src-%{version}%{?pre:-%pre}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export QTDIR="%{_qt5_prefix}"
@@ -153,6 +156,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Apr 23 2015 Sandro Mani <manisandro at gmail.com> - 3.4.0-2
+- Add patch to correctly call ninja-build (#1216189)
+
 * Thu Apr 23 2015 Sandro Mani <manisandro at gmail.com> - 3.4.0-1
 - 3.4.0 release
 
diff --git a/qt-creator_ninja-build.patch b/qt-creator_ninja-build.patch
new file mode 100644
index 0000000..e7950db
--- /dev/null
+++ b/qt-creator_ninja-build.patch
@@ -0,0 +1,12 @@
+diff -rupN qt-creator-opensource-src-3.4.0/src/plugins/cmakeprojectmanager/makestep.cpp qt-creator-opensource-src-3.4.0-new/src/plugins/cmakeprojectmanager/makestep.cpp
+--- qt-creator-opensource-src-3.4.0/src/plugins/cmakeprojectmanager/makestep.cpp	2015-04-21 17:56:56.000000000 +0200
++++ qt-creator-opensource-src-3.4.0-new/src/plugins/cmakeprojectmanager/makestep.cpp	2015-04-28 21:53:37.014334401 +0200
+@@ -316,7 +316,7 @@ QString MakeStep::makeCommand(ProjectExp
+     if (!bc)
+         bc = targetsActiveBuildConfiguration();
+     if (bc && bc->useNinja())
+-        return QLatin1String("ninja");
++        return QLatin1String("ninja-build");
+ 
+     if (tc)
+         return tc->makeCommand(env);
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qt-creator.git/commit/?h=f22&id=c8361e0836deb1bc9d5b810e372b90743ad1055b