diff --git a/.gitignore b/.gitignore index 0429d76..fafdaeb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /kdevelop-4.3.90.tar.bz2 /kdevelop-4.4.0.tar.bz2 /kdevelop-4.4.1.tar.bz2 +/kdevelop-4.4.90.tar.bz2 diff --git a/kdevelop-4.3.0-big_endian.patch b/kdevelop-4.3.0-big_endian.patch deleted file mode 100644 index fc74ea2..0000000 --- a/kdevelop-4.3.0-big_endian.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up kdevelop-4.3.0/utils/okteta/oktetaplugin.cpp.me kdevelop-4.3.0/utils/okteta/oktetaplugin.cpp ---- kdevelop-4.3.0/utils/okteta/oktetaplugin.cpp.me 2012-04-04 15:09:26.010283053 +0200 -+++ kdevelop-4.3.0/utils/okteta/oktetaplugin.cpp 2012-04-04 16:35:25.280291124 +0200 -@@ -94,7 +94,10 @@ OktetaPlugin::OktetaPlugin( QObject* par - addTool( uiController, new Kasten::ByteTableToolViewFactory(), new Kasten::ByteTableToolFactory() ); - addTool( uiController, new Kasten::InfoToolViewFactory(), new Kasten::InfoToolFactory() ); - addTool( uiController, new Kasten::PodDecoderToolViewFactory(), new Kasten::PodDecoderToolFactory() ); -+// disable Okteta Structures tool on big-endian as it's disable in kdesdk -+#ifndef BIG_ENDIAN - addTool( uiController, new Kasten::StructuresToolViewFactory(), new Kasten::StructuresToolFactory() ); -+#endif - addTool( uiController, new Kasten::BookmarksToolViewFactory, new Kasten::BookmarksToolFactory() ); - - KDevelop::IDocumentController* documentController = core()->documentController(); diff --git a/kdevelop-4.4.0-no-rpath.patch b/kdevelop-4.4.0-no-rpath.patch deleted file mode 100644 index 1eb2ac7..0000000 --- a/kdevelop-4.4.0-no-rpath.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kdevelop-4.4.0/CMakeLists.txt 2012-10-15 23:45:36.000000000 +0200 -+++ kdevelop-4.4.0/CMakeLists.no-rpath.txt 2012-10-24 09:36:23.590223262 +0200 -@@ -23,7 +23,6 @@ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_D - if("${_isSystemLibDir}" STREQUAL "-1") - set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}") - endif("${_isSystemLibDir}" STREQUAL "-1") --set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - - find_package(KDevPlatform 1.4.0 REQUIRED) - diff --git a/kdevelop-4.4.1-ninja-build.patch b/kdevelop-4.4.1-ninja-build.patch deleted file mode 100644 index dec6a23..0000000 --- a/kdevelop-4.4.1-ninja-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 24daa87..fdd6e38 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,11 +1,11 @@ -%define kdevplatform_ver 1.4.1 +%define kdevplatform_ver 1.4.90 Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 4.4.1 -Release: 4%{?dist} +Version: 4.4.90 +Release: 1%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ @@ -13,10 +13,6 @@ Group: Development/Tools Source0: http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-%{version}.tar.bz2 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 @@ -84,8 +80,6 @@ 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} @@ -159,6 +153,9 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null %changelog +* Thu Apr 25 2013 Jan Grulich - 9:4.4.90-4 +- Update to 4.4.90 (RC1) + * Mon Apr 01 2013 Kevin Kofler - 9:4.4.1-4 - Requires: cmake (as per discussion of kde#274246) diff --git a/sources b/sources index b485ba0..c8f0878 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ffa6a17019c8de09ce9da25b3b92925 kdevelop-4.4.1.tar.bz2 +b792caccd920135a3e4cc279535820ce kdevelop-4.4.90.tar.bz2