rpms/kdelibs/devel kdelibs-4.3.85-parallel_devel.patch,1.1,1.2

Rex Dieter rdieter at fedoraproject.org
Fri Dec 18 14:53:27 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8739

Modified Files:
	kdelibs-4.3.85-parallel_devel.patch 
Log Message:
drop hunk from kdelibs-4.1.70-cmake.patch


kdelibs-4.3.85-parallel_devel.patch:
 cmake/modules/FindKDE4Internal.cmake        |   34 ++++++++++++++--------------
 doc/api/doxygen-preprocess-kcfg.sh          |    4 +--
 kdecore/kconfig_compiler/CMakeLists.txt     |    6 ++--
 kdecore/kconfig_compiler/checkkcfg.pl       |    4 +--
 kdeui/tests/kconfig_compiler/CMakeLists.txt |    2 -
 kdewidgets/CMakeLists.txt                   |   12 ++++-----
 6 files changed, 32 insertions(+), 30 deletions(-)

Index: kdelibs-4.3.85-parallel_devel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.3.85-parallel_devel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdelibs-4.3.85-parallel_devel.patch	18 Dec 2009 14:41:20 -0000	1.1
+++ kdelibs-4.3.85-parallel_devel.patch	18 Dec 2009 14:53:27 -0000	1.2
@@ -126,14 +126,6 @@ diff -up kdelibs-4.3.85/cmake/modules/Fi
                                "${KDE4_LIB_INSTALL_DIR}" )
  
  # under Windows dlls may be also installed in bin/
-@@ -849,6 +851,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)
- 
- 
 @@ -1224,9 +1227,9 @@ macro (KDE4_PRINT_RESULTS)
     endif (NOT _kdeBootStrapping)
  




More information about the scm-commits mailing list