diff --git a/kdelibs-4.1.72-parallel_devel.patch b/kdelibs-4.1.72-parallel_devel.patch deleted file mode 100644 index a465e54..0000000 --- a/kdelibs-4.1.72-parallel_devel.patch +++ /dev/null @@ -1,290 +0,0 @@ -diff -Naur kdelibs-4.1.72/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.72.parallel_devel/cmake/modules/FindKDE4Internal.cmake ---- kdelibs-4.1.72/cmake/modules/FindKDE4Internal.cmake 2008-11-12 18:31:44.000000000 +0100 -+++ kdelibs-4.1.72.parallel_devel/cmake/modules/FindKDE4Internal.cmake 2008-11-12 18:35:47.000000000 +0100 -@@ -15,10 +15,10 @@ - # The following variables are defined for the various tools required to - # compile KDE software: - # --# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable -+# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable - # KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead - # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable --# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable -+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable - # - # The following variables point to the location of the KDE libraries, - # but shouldn't be used directly: -@@ -128,7 +128,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) -@@ -369,23 +369,23 @@ - if (WIN32) - set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) - # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC -- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) -+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) - - set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) -- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) -+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 ) - else (WIN32) - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) -- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell ) -+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell ) - - set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) -- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) -+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell ) - endif (WIN32) - - set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) - - # when building kdelibs, make the kcfg rules depend on the binaries... -- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) -- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) -+ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4) -+ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4) - set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) - - set(KDE4_INSTALLED_VERSION_OK TRUE) -@@ -451,69 +451,69 @@ - include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) - - if (UNIX) -- find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} ) - endif (UNIX) - -- find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) - -- find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ) -- find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} ) - -- find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} ) - -- find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} ) - -- find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} ) - -- find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} ) - -- find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} ) - -- find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} ) - -- find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} ) - -- find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} ) - - if (UNIX) -- find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} ) - -- find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ) - endif (UNIX) - -- find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} ) - -- find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} ) - -- find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} ) - -- find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ) - -- find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} ) - -- find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} ) - -- find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} ) - - # Can't do that, it's not always compiled. -@@ -527,7 +527,7 @@ - find_library(KDE4_KFORMULA_LIBRARY NAMES kformula PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) - set(KDE4_KFORMULA_LIBS ${kformula_LIB_DEPENDS} ${KDE4_KFORMULA_LIBRARY} ) - -- find_library(KDE4_PLASMA_LIBRARY NAMES plasma PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_library(KDE4_PLASMA_LIBRARY NAMES plasma PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH ) - set(KDE4_PLASMA_LIBS ${plasma_LIB_DEPENDS} ${KDE4_PLASMA_LIBRARY} ) - - -@@ -540,14 +540,14 @@ - - # at first look in LIBEXEC_INSTALL_DIR and no default paths, - # if this didn't succeed, the second call makes cmake search again, but in the standard paths -- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) -- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) -+ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 ) - - find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) - find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 ) - -- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) -- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) -+ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) -+ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 ) - - # 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) -@@ -803,7 +803,8 @@ - set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} - "${KDE4_BIN_INSTALL_DIR}" ) - --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}" ) - - # under Windows dlls may be also installed in bin/ -@@ -1198,9 +1199,9 @@ - endif (NOT _kdeBootStrapping) - - if(KDE4_KCFGC_EXECUTABLE) -- message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") -+ message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}") - else(KDE4_KCFGC_EXECUTABLE) -- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") -+ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor") - endif(KDE4_KCFGC_EXECUTABLE) - - if(AUTOMOC4_EXECUTABLE) -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 -@@ -2,9 +2,9 @@ - # Generates and cleans KConfigXT source code during a API dox build - # - --kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler" -+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4" - if test -z "$kcfg_compiler"; then -- echo "kconfig_compiler not found!" -+ echo "kconfig_compiler4 not found!" - exit 1; - fi - -diff -Naur kdelibs-4.1.72/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.72.parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl ---- kdelibs-4.1.72/kdecore/kconfig_compiler/checkkcfg.pl 2008-05-21 13:09:13.000000000 +0200 -+++ kdelibs-4.1.72.parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl 2008-11-12 18:34:17.000000000 +0100 -@@ -15,12 +15,12 @@ - - $kcfgc = $file . "c"; - --$cmd = "./kconfig_compiler $file $kcfgc"; -+$cmd = "./kconfig_compiler4 $file $kcfgc"; - - #print "CMD $cmd\n"; - - if ( system( $cmd ) != 0 ) { -- print STDERR "Unable to run kconfig_compiler\n"; -+ print STDERR "Unable to run kconfig_compiler4\n"; - exit 1; - } - -diff -Naur kdelibs-4.1.72/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.72.parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt ---- kdelibs-4.1.72/kdecore/kconfig_compiler/CMakeLists.txt 2008-10-30 15:19:14.000000000 +0100 -+++ kdelibs-4.1.72.parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt 2008-11-12 18:34:17.000000000 +0100 -@@ -8,11 +8,11 @@ - set(kconfig_compiler_SRCS kconfig_compiler.cpp) - - --kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) -+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) - --target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) -+target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) - --install(TARGETS kconfig_compiler ${INSTALL_TARGETS_DEFAULT_ARGS} ) -+install(TARGETS kconfig_compiler4 ${INSTALL_TARGETS_DEFAULT_ARGS} ) - - - ########### install files ############### -diff -Naur kdelibs-4.1.72/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.1.72.parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt ---- kdelibs-4.1.72/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-05-21 13:08:30.000000000 +0200 -+++ kdelibs-4.1.72.parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-11-12 18:34:17.000000000 +0100 -@@ -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 -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 -@@ -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 ${INSTALL_TARGETS_DEFAULT_ARGS} ) -+install(TARGETS makekdewidgets4 ${INSTALL_TARGETS_DEFAULT_ARGS} ) - - - ########### 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 diff --git a/kdelibs-4.1.80-parallel_devel.patch b/kdelibs-4.1.80-parallel_devel.patch new file mode 100644 index 0000000..b3b497c --- /dev/null +++ b/kdelibs-4.1.80-parallel_devel.patch @@ -0,0 +1,199 @@ +diff -ur kdelibs-4.1.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.80-parallel_devel/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.1.80/cmake/modules/FindKDE4Internal.cmake 2008-11-19 11:19:49.000000000 +0100 ++++ kdelibs-4.1.80-parallel_devel/cmake/modules/FindKDE4Internal.cmake 2008-11-25 21:15:01.000000000 +0100 +@@ -15,10 +15,10 @@ + # The following variables are defined for the various tools required to + # compile KDE software: + # +-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable ++# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable + # KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead + # KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable +-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable ++# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable + # + # The following variables point to the location of the KDE libraries, + # but shouldn't be used directly: +@@ -128,7 +128,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) +@@ -369,23 +369,23 @@ + if (WIN32) + set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) + # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC +- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) ++ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 ) + + set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 ) +- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets ) ++ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 ) + else (WIN32) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) +- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell ) ++ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell ) + + set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell ) +- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell ) ++ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell ) + endif (WIN32) + + set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}) + + # when building kdelibs, make the kcfg rules depend on the binaries... +- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) +- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) ++ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4) ++ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4) + set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) + + set(KDE4_INSTALLED_VERSION_OK TRUE) +@@ -590,7 +590,7 @@ + set(KDE4_PLASMA_LIBRARY plasma ) + set(KDE4_PLASMA_LIBS plasma ) + +- set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} ) ++ set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel ) + + # kpassworddialog.h is new with KDE4 + # KDE4_INCLUDE_INSTALL_DIR is defined by KDELibsDependencies.cmake +@@ -598,14 +598,14 @@ + + # at first look in LIBEXEC_INSTALL_DIR and no default paths, + # if this didn't succeed, the second call makes cmake search again, but in the standard paths +- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) +- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler ) ++ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) ++ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 ) + + find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) + find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 ) + +- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) +- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) ++ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH ) ++ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 ) + + # 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) +@@ -841,7 +841,8 @@ + set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} + "${KDE4_BIN_INSTALL_DIR}" ) + +-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}" ) + + # under Windows dlls may be also installed in bin/ +@@ -1231,9 +1232,9 @@ + endif (NOT _kdeBootStrapping) + + if(KDE4_KCFGC_EXECUTABLE) +- message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") ++ message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}") + else(KDE4_KCFGC_EXECUTABLE) +- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") ++ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor") + endif(KDE4_KCFGC_EXECUTABLE) + + if(AUTOMOC4_EXECUTABLE) +diff -ur kdelibs-4.1.80/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.80-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh +--- kdelibs-4.1.80/doc/api/doxygen-preprocess-kcfg.sh 2008-05-21 13:07:26.000000000 +0200 ++++ kdelibs-4.1.80-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh 2008-11-25 21:10:41.000000000 +0100 +@@ -2,9 +2,9 @@ + # Generates and cleans KConfigXT source code during a API dox build + # + +-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler" ++kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4" + if test -z "$kcfg_compiler"; then +- echo "kconfig_compiler not found!" ++ echo "kconfig_compiler4 not found!" + exit 1; + fi + +diff -ur kdelibs-4.1.80/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.80-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl +--- kdelibs-4.1.80/kdecore/kconfig_compiler/checkkcfg.pl 2008-05-21 13:09:13.000000000 +0200 ++++ kdelibs-4.1.80-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl 2008-11-25 21:10:41.000000000 +0100 +@@ -15,12 +15,12 @@ + + $kcfgc = $file . "c"; + +-$cmd = "./kconfig_compiler $file $kcfgc"; ++$cmd = "./kconfig_compiler4 $file $kcfgc"; + + #print "CMD $cmd\n"; + + if ( system( $cmd ) != 0 ) { +- print STDERR "Unable to run kconfig_compiler\n"; ++ print STDERR "Unable to run kconfig_compiler4\n"; + exit 1; + } + +diff -ur kdelibs-4.1.80/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.80-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt +--- kdelibs-4.1.80/kdecore/kconfig_compiler/CMakeLists.txt 2008-10-30 15:19:14.000000000 +0100 ++++ kdelibs-4.1.80-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt 2008-11-25 21:10:41.000000000 +0100 +@@ -8,11 +8,11 @@ + set(kconfig_compiler_SRCS kconfig_compiler.cpp) + + +-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) ++kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) + +-target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) ++target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) + +-install(TARGETS kconfig_compiler ${INSTALL_TARGETS_DEFAULT_ARGS} ) ++install(TARGETS kconfig_compiler4 ${INSTALL_TARGETS_DEFAULT_ARGS} ) + + + ########### install files ############### +diff -ur kdelibs-4.1.80/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.1.80-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt +--- kdelibs-4.1.80/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-05-21 13:08:30.000000000 +0200 ++++ kdelibs-4.1.80-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-11-25 21:10:41.000000000 +0100 +@@ -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.1.80/kdewidgets/CMakeLists.txt kdelibs-4.1.80-parallel_devel/kdewidgets/CMakeLists.txt +--- kdelibs-4.1.80/kdewidgets/CMakeLists.txt 2008-11-12 17:38:22.000000000 +0100 ++++ kdelibs-4.1.80-parallel_devel/kdewidgets/CMakeLists.txt 2008-11-25 21:10:41.000000000 +0100 +@@ -14,22 +14,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 ${INSTALL_TARGETS_DEFAULT_ARGS} ) ++install(TARGETS makekdewidgets4 ${INSTALL_TARGETS_DEFAULT_ARGS} ) + + + ########### 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 diff --git a/kdelibs.spec b/kdelibs.spec index 37083a4..a65d279 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -46,7 +46,7 @@ Source1: kde4.sh Source2: kde4.csh # make -devel packages parallel-installable -Patch0: kdelibs-4.1.72-parallel_devel.patch +Patch0: kdelibs-4.1.80-parallel_devel.patch # fix kde#149705 Patch2: kdelibs-3.95.0-kde149705.patch # Hunspell support for K3Spell @@ -358,6 +358,7 @@ rm -rf %{buildroot} - remove workaround BR on phonon-backend-gstreamer, it's ineffective since phonon now explicitly Requires: phonon-backend-xine and the dependency is no longer circular anyway +- update parallel_devel patch * Tue Nov 25 2008 Than Ngo 4.1.80-4 - respin