rpms/kdelibs/devel kdelibs-4.0.72-parallel_devel.patch, 1.1, 1.2 kdelibs.spec, 1.312, 1.313

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Fri May 2 01:09:58 UTC 2008 

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19457/devel

Modified Files:
	kdelibs-4.0.72-parallel_devel.patch kdelibs.spec 
Log Message:
Fix parallel_devel patch. (${KDE4_LIB_INSTALL_DIR}/kde4/devel MUST come BEFORE ${CMAKE_SYSTEM_LIBRARY_PATH} or it will link the KDE 3 libs instead of the KDE 4 ones!)

kdelibs-4.0.72-parallel_devel.patch:

Index: kdelibs-4.0.72-parallel_devel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.0.72-parallel_devel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.0.72-parallel_devel.patch	2 May 2008 00:52:55 -0000	1.1
+++ kdelibs-4.0.72-parallel_devel.patch	2 May 2008 01:09:22 -0000	1.2
@@ -1,7 +1,6 @@
-Index: cmake/modules/FindKDE4Internal.cmake
-===================================================================
---- cmake/modules/FindKDE4Internal.cmake	(revision 801429)
-+++ cmake/modules/FindKDE4Internal.cmake	(working copy)
+diff -ur kdelibs-4.0.72/cmake/modules/FindKDE4Internal.cmake kdelibs-4.0.72-parallel-devel/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.0.72/cmake/modules/FindKDE4Internal.cmake	2008-04-23 17:51:59.000000000 +0200
++++ kdelibs-4.0.72-parallel-devel/cmake/modules/FindKDE4Internal.cmake	2008-05-02 02:59:56.000000000 +0200
 @@ -15,10 +15,10 @@
  # The following variables are defined for the various tools required to
  # compile KDE software:
@@ -15,6 +14,15 @@
  #
  # The following variables point to the location of the KDE libraries,
  # but shouldn't be used directly:
+@@ -125,7 +125,7 @@
+ #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
+ #
+ #  KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
+-#    Use this to add widget description files for the makekdewidgets code generator
++#    Use this to add widget description files for the makekdewidgets4 code generator
+ #    for Qt Designer plugins.
+ #
+ #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
 @@ -274,24 +274,24 @@
     if (WIN32)
        set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
@@ -167,11 +175,13 @@
  
     # 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)
-@@ -660,6 +660,7 @@
+@@ -659,7 +659,8 @@
+                               "${_CMAKE_INSTALL_DIR}/bin"
                                "${CMAKE_INSTALL_PREFIX}/bin" )
  
- set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
-+                              "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
++set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
++                              ${CMAKE_SYSTEM_LIBRARY_PATH} 
                                "${KDE4_LIB_INSTALL_DIR}"
                                "${_CMAKE_INSTALL_DIR}/lib" 
                                "${CMAKE_INSTALL_PREFIX}/lib" )
@@ -187,10 +197,9 @@
     endif(KDE4_KCFGC_EXECUTABLE)
  
     if(KDE4_AUTOMOC_EXECUTABLE)
-Index: doc/api/doxygen-preprocess-kcfg.sh
-===================================================================
---- doc/api/doxygen-preprocess-kcfg.sh	(revision 801429)
-+++ doc/api/doxygen-preprocess-kcfg.sh	(working copy)
+diff -ur kdelibs-4.0.72/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.0.72-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh
+--- kdelibs-4.0.72/doc/api/doxygen-preprocess-kcfg.sh	2008-01-05 01:00:05.000000000 +0100
++++ kdelibs-4.0.72-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh	2008-05-02 02:58:14.000000000 +0200
 @@ -2,9 +2,9 @@
  # Generates and cleans KConfigXT source code during a API dox build
  #
@@ -203,55 +212,9 @@
  	exit 1;
  fi
  
-Index: kdewidgets/CMakeLists.txt
-===================================================================
---- kdewidgets/CMakeLists.txt	(revision 801429)
-+++ kdewidgets/CMakeLists.txt	(working copy)
-@@ -16,22 +16,22 @@
- set(makekdewidgets_SRCS makekdewidgets.cpp )
- 
- 
--kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
-+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
- 
--target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
-+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
- 
--install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
-+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
- 
- 
- ########### next target ###############
- 
- 
- # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
--get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
-+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
- 
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
-   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
--  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
-+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
- 
- set(kdewidgets_PART_SRCS
-    classpreviews.cpp
-Index: kdeui/tests/kconfig_compiler/CMakeLists.txt
-===================================================================
---- kdeui/tests/kconfig_compiler/CMakeLists.txt	(revision 801429)
-+++ kdeui/tests/kconfig_compiler/CMakeLists.txt	(working copy)
-@@ -9,7 +9,7 @@
-    add_custom_command(
-       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
-       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
--      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
-+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
- 
- #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
-    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
-Index: kdecore/kconfig_compiler/checkkcfg.pl
-===================================================================
---- kdecore/kconfig_compiler/checkkcfg.pl	(revision 801429)
-+++ kdecore/kconfig_compiler/checkkcfg.pl	(working copy)
+diff -ur kdelibs-4.0.72/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.0.72-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl
+--- kdelibs-4.0.72/kdecore/kconfig_compiler/checkkcfg.pl	2008-01-05 01:00:40.000000000 +0100
++++ kdelibs-4.0.72-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl	2008-05-02 02:58:14.000000000 +0200
 @@ -15,12 +15,12 @@
  
  $kcfgc = $file . "c";
@@ -267,10 +230,9 @@
    exit 1;
  }
  
-Index: kdecore/kconfig_compiler/CMakeLists.txt
-===================================================================
---- kdecore/kconfig_compiler/CMakeLists.txt	(revision 801429)
-+++ kdecore/kconfig_compiler/CMakeLists.txt	(working copy)
+diff -ur kdelibs-4.0.72/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.0.72-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt
+--- kdelibs-4.0.72/kdecore/kconfig_compiler/CMakeLists.txt	2008-01-05 01:00:40.000000000 +0100
++++ kdelibs-4.0.72-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt	2008-05-02 02:58:14.000000000 +0200
 @@ -8,11 +8,11 @@
  set(kconfig_compiler_SRCS kconfig_compiler.cpp)
  
@@ -286,3 +248,46 @@
  
  
  ########### install files ###############
+diff -ur kdelibs-4.0.72/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.0.72-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
+--- kdelibs-4.0.72/kdeui/tests/kconfig_compiler/CMakeLists.txt	2008-01-05 01:00:24.000000000 +0100
++++ kdelibs-4.0.72-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt	2008-05-02 02:58:14.000000000 +0200
+@@ -9,7 +9,7 @@
+    add_custom_command(
+       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
+       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
+-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
++      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
+ 
+ #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
+    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
+diff -ur kdelibs-4.0.72/kdewidgets/CMakeLists.txt kdelibs-4.0.72-parallel-devel/kdewidgets/CMakeLists.txt
+--- kdelibs-4.0.72/kdewidgets/CMakeLists.txt	2008-01-05 01:00:20.000000000 +0100
++++ kdelibs-4.0.72-parallel-devel/kdewidgets/CMakeLists.txt	2008-05-02 02:58:14.000000000 +0200
+@@ -16,22 +16,22 @@
+ set(makekdewidgets_SRCS makekdewidgets.cpp )
+ 
+ 
+-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
++kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+ 
+-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
++target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
+ 
+-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
++install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
+ 
+ 
+ ########### next target ###############
+ 
+ 
+ # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
+-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
++get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
+ 
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
+   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
+-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
++  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
+ 
+ set(kdewidgets_PART_SRCS
+    classpreviews.cpp


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- kdelibs.spec	2 May 2008 00:52:55 -0000	1.312
+++ kdelibs.spec	2 May 2008 01:09:22 -0000	1.313
@@ -180,7 +180,7 @@
 %prep
 %setup -q -n kdelibs-%{version}
 
-%patch0 -p0 -b .parallel_devel
+%patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
 %patch4 -p1 -b .alsa-default
 %if 0%{?fedora} >= 9
@@ -362,7 +362,7 @@
 %changelog
 * Fri May  2 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.72-1
 - update to 4.0.72 (4.1 alpha 1)
-- parallel-devel patch ported by Lorenzo Villani <lvillani at binaryhelix.net>
+- parallel_devel patch ported by Lorenzo Villani <lvillani at binaryhelix.net>
 - update file list (Lorenzo Villani)
 - drop upstreamed khtml-security, kconfig_sync_crash and klauncher-crash patches
 - update xdg-menu (Administration menu) patch

More information about the scm-commits mailing list