rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
kdelibs/kdelibs-4.1.85-parallel_dev...

204 lines
10 KiB
Diff
Raw Normal View History

* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2 - tweak parallel_devel patch to get a -L flag for the symlink directory
2008-12-14 02:29:07 +00:00
diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-parallel_devel/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake 2008-12-04 09:35:54.000000000 +0100
+++ kdelibs-4.1.85-parallel_devel/cmake/modules/FindKDE4Internal.cmake 2008-12-14 03:24:15.000000000 +0100
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
@@ -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)
- rebase parallel_devel and kde149705 patch, I'm not sure about the slight modifications made to the latter, can someone verify it?
2008-12-09 13:24:29 +00:00
@@ -542,7 +542,7 @@
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
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
- rebase parallel_devel and kde149705 patch, I'm not sure about the slight modifications made to the latter, can someone verify it?
2008-12-09 13:24:29 +00:00
@@ -550,14 +550,14 @@
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
# 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 )
- rebase parallel_devel and kde149705 patch, I'm not sure about the slight modifications made to the latter, can someone verify it?
2008-12-09 13:24:29 +00:00
mark_as_advanced(KDE4_KCFGC_EXECUTABLE KDE4_MEINPROC_EXECUTABLE KDE4_MAKEKDEWIDGETS_EXECUTABLE)
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2 - tweak parallel_devel patch to get a -L flag for the symlink directory
2008-12-14 02:29:07 +00:00
@@ -795,9 +795,12 @@
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
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}" )
* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2 - tweak parallel_devel patch to get a -L flag for the symlink directory
2008-12-14 02:29:07 +00:00
+link_directories("${KDE4_LIB_INSTALL_DIR}/kde4/devel")
+
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
# under Windows dlls may be also installed in bin/
* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2 - tweak parallel_devel patch to get a -L flag for the symlink directory
2008-12-14 02:29:07 +00:00
if(WIN32)
set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
@@ -1185,9 +1188,9 @@
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
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)
* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2 - tweak parallel_devel patch to get a -L flag for the symlink directory
2008-12-14 02:29:07 +00:00
diff -ur kdelibs-4.1.85/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.85-parallel_devel/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.85-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh 2008-12-14 03:21:42.000000000 +0100
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
@@ -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
* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2 - tweak parallel_devel patch to get a -L flag for the symlink directory
2008-12-14 02:29:07 +00:00
diff -ur kdelibs-4.1.85/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.85-parallel_devel/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.85-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl 2008-12-14 03:21:42.000000000 +0100
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
@@ -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;
}
* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2 - tweak parallel_devel patch to get a -L flag for the symlink directory
2008-12-14 02:29:07 +00:00
diff -ur kdelibs-4.1.85/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.85-parallel_devel/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.85-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt 2008-12-14 03:21:42.000000000 +0100
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
@@ -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 ###############
* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2 - tweak parallel_devel patch to get a -L flag for the symlink directory
2008-12-14 02:29:07 +00:00
diff -ur kdelibs-4.1.85/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.1.85-parallel_devel/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.85-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-12-14 03:21:42.000000000 +0100
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
@@ -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 )
* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2 - tweak parallel_devel patch to get a -L flag for the symlink directory
2008-12-14 02:29:07 +00:00
diff -ur kdelibs-4.1.85/kdewidgets/CMakeLists.txt kdelibs-4.1.85-parallel_devel/kdewidgets/CMakeLists.txt
--- kdelibs-4.1.85/kdewidgets/CMakeLists.txt 2008-11-12 17:38:22.000000000 +0100
+++ kdelibs-4.1.85-parallel_devel/kdewidgets/CMakeLists.txt 2008-12-14 03:21:42.000000000 +0100
- update parallel_devel patch Note: tweaks to KdeLibsLibraryDependencies.cmake and/or KdeLibsLibraryDependencies-release.cmake may also be needed. Looking at those files, they seem to link the library by the fully-versioned path or by the soname, if that's true, no fixes are needed (because those aren't moved out of the way, only the .so symlinks are).
2008-11-25 20:20:43 +00:00
@@ -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