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

Tue Nov 25 19:49:33 UTC 2008

Author: kkofler

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

Modified Files:
	kdelibs-4.1.72-parallel_devel.patch 
Log Message:
Remove whitespace-only changes from parallel_devel patch again (to facilitate merging).

Please either set your text editor not to remove trailing spaces or use diff -w. Whitespace changes make it harder to merge the patch. It is upstream's job to clean up their whitespace, not ours. :-)

kdelibs-4.1.72-parallel_devel.patch:

Index: kdelibs-4.1.72-parallel_devel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.1.72-parallel_devel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- kdelibs-4.1.72-parallel_devel.patch	20 Nov 2008 10:22:50 -0000	1.1
+++ kdelibs-4.1.72-parallel_devel.patch	25 Nov 2008 19:49:02 -0000	1.2
@@ -14,15 +14,6 @@
  #
  # The following variables point to the location of the KDE libraries,
  # but shouldn't be used directly:
-@@ -76,7 +76,7 @@
- #  KDE4_KFORMULA_LIBS         - the kformula library and all depending librairies
- #  KDE4_PLASMA_LIBS           - the plasma library and all depending librairies
- #
--# This module defines a bunch of variables used as locations for install directories. 
-+# This module defines a bunch of variables used as locations for install directories.
- # They can be relative (to CMAKE_INSTALL_PREFIX) or absolute.
- # Under Windows they are always relative.
- #
 @@ -128,7 +128,7 @@
  #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
  #
@@ -32,18 +23,6 @@
  #    for Qt Designer plugins.
  #
  #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
-@@ -299,9 +299,9 @@
- find_package(Perl ${_REQ_STRING_KDE4})
- 
- # Check that we really found everything.
--# If KDE4 was searched with REQUIRED, we error out with FATAL_ERROR if something wasn't found 
-+# If KDE4 was searched with REQUIRED, we error out with FATAL_ERROR if something wasn't found
- # already above in the other FIND_PACKAGE() calls.
--# If KDE4 was searched without REQUIRED and something in the FIND_PACKAGE() calls above wasn't found, 
-+# If KDE4 was searched without REQUIRED and something in the FIND_PACKAGE() calls above wasn't found,
- # then we get here and must check that everything has actually been found. If something is missing,
- # we must not fail with FATAL_ERROR, but only not set KDE4_FOUND.
- if(NOT PERL_FOUND)
 @@ -369,23 +369,23 @@
     if (WIN32)
        set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
@@ -74,20 +53,6 @@
     set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
  
     set(KDE4_INSTALLED_VERSION_OK TRUE)
-@@ -435,11 +435,11 @@
-    set(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib )
- 
-    if (WIN32)
--      # we don't want to be forced to set two paths into the build tree 
-+      # we don't want to be forced to set two paths into the build tree
-       set(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin )
- 
-       # on win32 the install dir is determined on runtime not install time
--      # KDELIBS_INSTALL_DIR and QT_INSTALL_DIR are used in KDELibsDependencies.cmake to setup 
-+      # KDELIBS_INSTALL_DIR and QT_INSTALL_DIR are used in KDELibsDependencies.cmake to setup
-       # kde install paths and library dependencies
-       get_filename_component(_DIR ${KDE4_KDECONFIG_EXECUTABLE} PATH )
-       get_filename_component(KDE4_INSTALL_DIR ${_DIR} PATH )
 @@ -451,69 +451,69 @@
     include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
  
@@ -207,53 +172,7 @@
  
     # allow searching cmake modules in all given kde install locations (KDEDIRS based)
     execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-@@ -584,14 +584,14 @@
- 
- # # This option enables the reduced link interface for libs on UNIX
- # #
--# # The purpose of the KDE4_DISABLE_PROPERTY_ variable is to be used as a prefix for 
-+# # The purpose of the KDE4_DISABLE_PROPERTY_ variable is to be used as a prefix for
- # # the target property LINK_INTERFACE_LIBRARIES. If it is empty, the property will have its
- # # correct name, if it's not empty, it will be a different name, i.e. the actual property
- # # will not be set, i.e. disabled. See kdelibs/kdecore/CMakeLists.txt for an example.
- # #
--# # By default (i.e. also for Windows) make it non-empty, so the property name will 
--# # change from "LINK_INTERFACE_LIBRARIES" to "DISABLED_LINK_INTERFACE_LIBRARIES", 
--# # which is a different (non-existing) target property, and so setting that property 
-+# # By default (i.e. also for Windows) make it non-empty, so the property name will
-+# # change from "LINK_INTERFACE_LIBRARIES" to "DISABLED_LINK_INTERFACE_LIBRARIES",
-+# # which is a different (non-existing) target property, and so setting that property
- # # won't have an effect
- 
- # disable this for now for Windows, since there is an issue with the use of "debug" and
-@@ -600,7 +600,7 @@
- # disable the reduced linking temporarily for Windows, cmake HEAD and the soon-to-be-released cmake 2.6.2
- # With 2.6.0 and 2.6.1 it can happen that the "debug", "optimized" and "general" keywords are
- # misinterpreted by cmake as library names, the linking fails. Usually this happens under Windows.
--# In 2.6.2 this will be an error at cmake time, so we disable it for now and once we require 
-+# In 2.6.2 this will be an error at cmake time, so we disable it for now and once we require
- # 2.6.2 we'll fix it the right way (using TARGET_LINK_LIBRARIES(foo LINK_INTERFACE_LIBRARIES ...)
- if (WIN32  OR  "${CMAKE_MINOR_VERSION}" EQUAL 7  OR  "${CMAKE_PATCH_VERSION}" EQUAL 2)
-    set(KDE4_DISABLE_PROPERTY_ "DISABLED_")
-@@ -761,7 +761,7 @@
- 
- # The INSTALL_TARGETS_DEFAULT_ARGS variable should be used when libraries are installed.
- # The arguments are also ok for regular executables, i.e. executables which don't go
--# into sbin/ or libexec/, but for installing executables the basic syntax 
-+# into sbin/ or libexec/, but for installing executables the basic syntax
- # INSTALL(TARGETS kate DESTINATION "${BIN_INSTALL_DIR}")
- # is enough, so using this variable there doesn't help a lot.
- # The variable must not be used for installing plugins.
-@@ -771,7 +771,7 @@
- # This will install libraries correctly under UNIX, OSX and Windows (i.e. dll's go
- # into bin/.
- # Later on it will be possible to extend this for installing OSX frameworks
--# The COMPONENT Devel argument has the effect that static libraries belong to the 
-+# The COMPONENT Devel argument has the effect that static libraries belong to the
- # "Devel" install component. If we use this also for all install() commands
- # for header files, it will be possible to install
- #   -everything: make install OR cmake -P cmake_install.cmake
-@@ -803,13 +803,14 @@
+@@ -803,7 +803,8 @@
  set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
                                "${KDE4_BIN_INSTALL_DIR}" )
  
@@ -263,25 +182,6 @@
                                "${KDE4_LIB_INSTALL_DIR}" )
  
  # under Windows dlls may be also installed in bin/
- if(WIN32)
--  set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
--                                "${_CMAKE_INSTALL_DIR}/bin" 
-+  set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
-+                                "${_CMAKE_INSTALL_DIR}/bin"
-                                 "${CMAKE_INSTALL_PREFIX}/bin" )
- endif(WIN32)
- 
-@@ -834,8 +835,8 @@
- 
-    find_package(KDEWIN32 REQUIRED)
- 
--   # limit win32 packaging to kdelibs at now 
--   # don't know if package name, version and notes are always available 
-+   # limit win32 packaging to kdelibs at now
-+   # don't know if package name, version and notes are always available
-    if(_kdeBootStrapping)
-       find_package(KDEWIN_Packager)
-       if (KDEWIN_PACKAGER_FOUND)
 @@ -1198,9 +1199,9 @@
     endif (NOT _kdeBootStrapping)
  
@@ -294,15 +194,6 @@
     endif(KDE4_KCFGC_EXECUTABLE)
  
     if(AUTOMOC4_EXECUTABLE)
-@@ -1241,7 +1242,7 @@
-    ${KDE4_INCLUDE_DIR}/KDE
-    ${KDE4_PHONON_INCLUDES}
-    ${QT_INCLUDES}
--   ${_KDE4_PLATFORM_INCLUDE_DIRS} 
-+   ${_KDE4_PLATFORM_INCLUDE_DIRS}
- )
- 
- set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DKDE_DEPRECATED_WARNINGS )
 diff -Naur kdelibs-4.1.72/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.72.parallel_devel/doc/api/doxygen-preprocess-kcfg.sh
 --- kdelibs-4.1.72/doc/api/doxygen-preprocess-kcfg.sh	2008-05-21 13:07:26.000000000 +0200
 +++ kdelibs-4.1.72.parallel_devel/doc/api/doxygen-preprocess-kcfg.sh	2008-11-12 18:34:17.000000000 +0100
@@ -369,20 +260,6 @@
 diff -Naur kdelibs-4.1.72/kdewidgets/CMakeLists.txt kdelibs-4.1.72.parallel_devel/kdewidgets/CMakeLists.txt
 --- kdelibs-4.1.72/kdewidgets/CMakeLists.txt	2008-10-30 15:19:04.000000000 +0100
 +++ kdelibs-4.1.72.parallel_devel/kdewidgets/CMakeLists.txt	2008-11-12 18:34:17.000000000 +0100
-@@ -1,10 +1,10 @@
- 
- project(kdewidgets)
- 
--add_subdirectory( pics ) 
--add_subdirectory( tests ) 
-+add_subdirectory( pics )
-+add_subdirectory( tests )
- 
--include_directories( 
-+include_directories(
-   ${KDE4_KIO_INCLUDES}
-   ${CMAKE_SOURCE_DIR}/kde3support
-   ${CMAKE_SOURCE_DIR}/kde3support/kdeui
 @@ -16,22 +16,22 @@
  set(makekdewidgets_SRCS makekdewidgets.cpp )
  


