diff --git a/kdelibs-4.1.1-cmake.patch b/kdelibs-4.1.1-cmake.patch new file mode 100644 index 0000000..c83d290 --- /dev/null +++ b/kdelibs-4.1.1-cmake.patch @@ -0,0 +1,34 @@ +diff -up kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig 2008-09-12 23:54:36.000000000 +0200 ++++ kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake 2008-09-13 00:02:50.000000000 +0200 +@@ -745,6 +745,7 @@ endif(WIN32) + # CMake generators if no build type is set. + if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RelWithDebInfo) ++ set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE}) + endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) + + +@@ -953,10 +954,6 @@ endif(MSVC) + + + if (CMAKE_COMPILER_IS_GNUCXX) +- if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5) +- set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull") +- endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5) +- + set (KDE4_ENABLE_EXCEPTIONS -fexceptions) + # Select flags. + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") +@@ -1063,11 +1060,6 @@ endif (CMAKE_COMPILER_IS_GNUCXX) + + + if (CMAKE_C_COMPILER MATCHES "icc") +- +- if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5) +- set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull") +- endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5) +- + set (KDE4_ENABLE_EXCEPTIONS -fexceptions) + # Select flags. + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") diff --git a/kdelibs.spec b/kdelibs.spec index e663ef9..406357c 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -19,7 +19,7 @@ Name: kdelibs4 License: LGPLv2 URL: http://www.kde.org/ Group: System Environment/Libraries -Source0: http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %ifarch noarch @@ -77,6 +77,7 @@ Patch12: kdelibs-4.1.0-xdg-menu.patch Patch14: kdelibs-4.0.85-libexecdir.patch # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4 Patch18: kdelibs-4.1.0-kstandarddirs.patch +Patch20: kdelibs-4.1.1-cmake.patch BuildRequires: qt4-devel >= 4.4.0 Requires: qt4 >= %{_qt4_version} @@ -202,6 +203,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch12 -p1 -b .Administration-menu %patch14 -p1 -b .libexecdir %patch18 -p1 -b .kstandarddirs +%patch20 -p1 -b .cmake %build