From 0e8d473cf3f339e36a0799c1db890476599df564 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Nov 22 2012 15:31:07 +0000 Subject: Don't execute cmake every time when you use ninja --- diff --git a/kdevelop-4.4.1-ninja-build.patch b/kdevelop-4.4.1-ninja-build.patch new file mode 100644 index 0000000..dec6a23 --- /dev/null +++ b/kdevelop-4.4.1-ninja-build.patch @@ -0,0 +1,11 @@ +--- kdevelop-4.4.1/projectmanagers/cmake/cmakeutils.cpp_new 2012-11-03 01:45:57.000000000 +0100 ++++ kdevelop-4.4.1/projectmanagers/cmake/cmakeutils.cpp 2012-11-22 10:08:32.049406021 +0100 +@@ -191,7 +191,7 @@ bool checkForNeedingConfigure( KDevelop: + + return true; + } else if( !QFileInfo( builddir.toLocalFile() + "/CMakeCache.txt" ).exists() || +- !QFileInfo( builddir.toLocalFile() + "/Makefile" ).exists() ++ !(QFileInfo( builddir.toLocalFile() + "/Makefile" ).exists() || QFileInfo( builddir.toLocalFile() + "/build.ninja" ).exists()) + ) + { + // User entered information already, but cmake hasn't actually been run yet. diff --git a/kdevelop.spec b/kdevelop.spec index 4a8e41b..c486c0e 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -5,7 +5,7 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 4.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ @@ -15,7 +15,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line Patch0: kdevelop-4.4.0-no-rpath.patch - +# fix ninja build +Patch1: kdevelop-4.4.1-ninja-build.patch # upstreamable patches # upstream patches @@ -83,6 +84,7 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver} %prep %setup -q -n kdevelop-%{version} %patch0 -p1 -b .no-rpath +%patch1 -p1 -b .ninja-build %build mkdir -p %{_target_platform} @@ -156,6 +158,9 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null %changelog +* Thu Nov 22 2012 Jan Grulich 9:4.4.1-2 +- Don't execute cmake every time when you use ninja + * Mon Nov 05 2012 Jan Grulich 9:4.4.1-1 - Update to 4.4.1 - Remove unnecessary fix for splash