adapted kdelibs-4.1.96-parallel_devel.patch
This commit is contained in:
parent
255d8d8e5f
commit
4c3b013e23
@ -1,6 +1,6 @@
|
|||||||
diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-parallel_devel/cmake/modules/FindKDE4Internal.cmake
|
diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake
|
||||||
--- kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake 2008-12-04 09:35:54.000000000 +0100
|
--- kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2009-01-07 01:13:55.000000000 +0100
|
||||||
+++ kdelibs-4.1.85-parallel_devel/cmake/modules/FindKDE4Internal.cmake 2008-12-14 03:44:34.000000000 +0100
|
+++ kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake 2009-01-07 22:42:22.000000000 +0100
|
||||||
@@ -15,10 +15,10 @@
|
@@ -15,10 +15,10 @@
|
||||||
# The following variables are defined for the various tools required to
|
# The following variables are defined for the various tools required to
|
||||||
# compile KDE software:
|
# compile KDE software:
|
||||||
@ -14,7 +14,7 @@ diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-para
|
|||||||
#
|
#
|
||||||
# The following variables point to the location of the KDE libraries,
|
# The following variables point to the location of the KDE libraries,
|
||||||
# but shouldn't be used directly:
|
# but shouldn't be used directly:
|
||||||
@@ -128,7 +128,7 @@
|
@@ -131,7 +131,7 @@
|
||||||
# Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
|
# 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)
|
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
|
||||||
@ -23,7 +23,7 @@ diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-para
|
|||||||
# for Qt Designer plugins.
|
# for Qt Designer plugins.
|
||||||
#
|
#
|
||||||
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
|
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
|
||||||
@@ -369,23 +369,23 @@
|
@@ -370,23 +370,23 @@ if (_kdeBootStrapping)
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
|
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
|
||||||
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
|
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
|
||||||
@ -53,36 +53,33 @@ diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-para
|
|||||||
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
|
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
|
||||||
|
|
||||||
set(KDE4_INSTALLED_VERSION_OK TRUE)
|
set(KDE4_INSTALLED_VERSION_OK TRUE)
|
||||||
@@ -542,7 +542,8 @@
|
@@ -488,7 +488,8 @@ else (_kdeBootStrapping)
|
||||||
set(KDE4_PLASMA_LIBRARY plasma )
|
|
||||||
set(KDE4_PLASMA_LIBS plasma )
|
|
||||||
|
|
||||||
|
# KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
|
||||||
|
# use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
|
||||||
- set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
|
- set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
|
||||||
+ set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
|
+ set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
|
||||||
+ link_directories("${KDE4_LIB_DIR}")
|
+ link_directories("${KDE4_LIB_DIR}")
|
||||||
|
set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
|
||||||
|
|
||||||
# kpassworddialog.h is new with KDE4
|
|
||||||
# KDE4_INCLUDE_INSTALL_DIR is defined by KDELibsDependencies.cmake
|
|
||||||
@@ -550,14 +551,14 @@
|
|
||||||
|
|
||||||
# at first look in LIBEXEC_INSTALL_DIR and no default paths,
|
@@ -501,12 +502,12 @@ else (_kdeBootStrapping)
|
||||||
# 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 )
|
# get the build CONFIGURATIONS which were exported in this file, and use just the first
|
||||||
find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
|
# of them to get the location of the installed executables
|
||||||
|
- get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
|
||||||
|
+ get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
|
||||||
|
list(GET _importedConfigurations 0 _firstConfig)
|
||||||
|
|
||||||
- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
|
- get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${firstConfig})
|
||||||
- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
|
+ get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${firstConfig})
|
||||||
+ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
|
get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${firstConfig})
|
||||||
+ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
|
- get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${firstConfig})
|
||||||
|
+ get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4 LOCATION_${firstConfig})
|
||||||
|
|
||||||
mark_as_advanced(KDE4_KCFGC_EXECUTABLE KDE4_MEINPROC_EXECUTABLE KDE4_MAKEKDEWIDGETS_EXECUTABLE)
|
# 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)
|
||||||
@@ -795,7 +796,8 @@
|
@@ -738,7 +739,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
|
||||||
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
|
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
|
||||||
"${KDE4_BIN_INSTALL_DIR}" )
|
"${KDE4_BIN_INSTALL_DIR}" )
|
||||||
|
|
||||||
@ -92,7 +89,7 @@ diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-para
|
|||||||
"${KDE4_LIB_INSTALL_DIR}" )
|
"${KDE4_LIB_INSTALL_DIR}" )
|
||||||
|
|
||||||
# under Windows dlls may be also installed in bin/
|
# under Windows dlls may be also installed in bin/
|
||||||
@@ -1185,9 +1187,9 @@
|
@@ -1121,9 +1123,9 @@ macro (KDE4_PRINT_RESULTS)
|
||||||
endif (NOT _kdeBootStrapping)
|
endif (NOT _kdeBootStrapping)
|
||||||
|
|
||||||
if(KDE4_KCFGC_EXECUTABLE)
|
if(KDE4_KCFGC_EXECUTABLE)
|
||||||
@ -104,9 +101,9 @@ diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-para
|
|||||||
endif(KDE4_KCFGC_EXECUTABLE)
|
endif(KDE4_KCFGC_EXECUTABLE)
|
||||||
|
|
||||||
if(AUTOMOC4_EXECUTABLE)
|
if(AUTOMOC4_EXECUTABLE)
|
||||||
diff -ur kdelibs-4.1.85/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.85-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh
|
diff -up kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh
|
||||||
--- kdelibs-4.1.85/doc/api/doxygen-preprocess-kcfg.sh 2008-05-21 13:07:26.000000000 +0200
|
--- kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200
|
||||||
+++ kdelibs-4.1.85-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh 2008-12-14 03:21:42.000000000 +0100
|
+++ kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh 2009-01-07 22:04:13.000000000 +0100
|
||||||
@@ -2,9 +2,9 @@
|
@@ -2,9 +2,9 @@
|
||||||
# Generates and cleans KConfigXT source code during a API dox build
|
# Generates and cleans KConfigXT source code during a API dox build
|
||||||
#
|
#
|
||||||
@ -119,10 +116,10 @@ diff -ur kdelibs-4.1.85/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.85-parall
|
|||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
diff -ur kdelibs-4.1.85/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.85-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl
|
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl
|
||||||
--- kdelibs-4.1.85/kdecore/kconfig_compiler/checkkcfg.pl 2008-05-21 13:09:13.000000000 +0200
|
--- kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200
|
||||||
+++ kdelibs-4.1.85-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl 2008-12-14 03:21:42.000000000 +0100
|
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl 2009-01-07 22:04:13.000000000 +0100
|
||||||
@@ -15,12 +15,12 @@
|
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
|
||||||
|
|
||||||
$kcfgc = $file . "c";
|
$kcfgc = $file . "c";
|
||||||
|
|
||||||
@ -137,10 +134,10 @@ diff -ur kdelibs-4.1.85/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.85-par
|
|||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff -ur kdelibs-4.1.85/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.85-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt
|
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt
|
||||||
--- kdelibs-4.1.85/kdecore/kconfig_compiler/CMakeLists.txt 2008-10-30 15:19:14.000000000 +0100
|
--- kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-01-06 18:27:49.000000000 +0100
|
||||||
+++ kdelibs-4.1.85-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt 2008-12-14 03:21:42.000000000 +0100
|
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt 2009-01-07 22:44:57.000000000 +0100
|
||||||
@@ -8,11 +8,11 @@
|
@@ -8,13 +8,13 @@ add_subdirectory( example )
|
||||||
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
||||||
|
|
||||||
|
|
||||||
@ -150,15 +147,17 @@ diff -ur kdelibs-4.1.85/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.85-p
|
|||||||
-target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
-target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
||||||
+target_link_libraries(kconfig_compiler4 ${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} )
|
# "export" this target too so we can use the LOCATION property of the imported target in
|
||||||
+install(TARGETS kconfig_compiler4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
# FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
|
||||||
|
-install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||||
|
+install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||||
|
|
||||||
|
|
||||||
########### install files ###############
|
########### install files ###############
|
||||||
diff -ur kdelibs-4.1.85/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.1.85-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
diff -up kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||||
--- kdelibs-4.1.85/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-05-21 13:08:30.000000000 +0200
|
--- kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:08:30.000000000 +0200
|
||||||
+++ kdelibs-4.1.85-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-12-14 03:21:42.000000000 +0100
|
+++ kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt 2009-01-07 22:04:13.000000000 +0100
|
||||||
@@ -9,7 +9,7 @@
|
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
|
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
|
COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
|
||||||
@ -167,10 +166,10 @@ diff -ur kdelibs-4.1.85/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.1.
|
|||||||
|
|
||||||
# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
|
# 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 )
|
qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
|
||||||
diff -ur kdelibs-4.1.85/kdewidgets/CMakeLists.txt kdelibs-4.1.85-parallel_devel/kdewidgets/CMakeLists.txt
|
diff -up kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdewidgets/CMakeLists.txt
|
||||||
--- kdelibs-4.1.85/kdewidgets/CMakeLists.txt 2008-11-12 17:38:22.000000000 +0100
|
--- kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel 2009-01-06 18:27:44.000000000 +0100
|
||||||
+++ kdelibs-4.1.85-parallel_devel/kdewidgets/CMakeLists.txt 2008-12-14 03:21:42.000000000 +0100
|
+++ kdelibs-4.1.96/kdewidgets/CMakeLists.txt 2009-01-07 22:46:30.000000000 +0100
|
||||||
@@ -14,22 +14,22 @@
|
@@ -14,24 +14,24 @@ include_directories(
|
||||||
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
||||||
|
|
||||||
|
|
||||||
@ -180,8 +179,10 @@ diff -ur kdelibs-4.1.85/kdewidgets/CMakeLists.txt kdelibs-4.1.85-parallel_devel/
|
|||||||
-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
|
-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
|
||||||
+target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
|
+target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
|
||||||
|
|
||||||
-install(TARGETS makekdewidgets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
# "export" this target too so we can use the LOCATION property of the imported target in
|
||||||
+install(TARGETS makekdewidgets4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
# FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
|
||||||
|
-install(TARGETS makekdewidgets EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||||
|
+install(TARGETS makekdewidgets4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||||
|
|
||||||
|
|
||||||
########### next target ###############
|
########### next target ###############
|
@ -46,7 +46,7 @@ Source1: kde4.sh
|
|||||||
Source2: kde4.csh
|
Source2: kde4.csh
|
||||||
|
|
||||||
# make -devel packages parallel-installable
|
# make -devel packages parallel-installable
|
||||||
Patch0: kdelibs-4.1.85-parallel_devel.patch
|
Patch0: kdelibs-4.1.96-parallel_devel.patch
|
||||||
# fix kde#149705
|
# fix kde#149705
|
||||||
Patch2: kdelibs-4.1.82-kde149705.patch
|
Patch2: kdelibs-4.1.82-kde149705.patch
|
||||||
# Hunspell support for K3Spell
|
# Hunspell support for K3Spell
|
||||||
|
Loading…
Reference in New Issue
Block a user