--- kdelibs-3.94.0/cmake/modules/FindOpenEXR.cmake 2007-10-03 06:49:51.000000000 -0400 +++ kdelibs-3.94.0-new/cmake/modules/FindOpenEXR.cmake 2007-10-15 22:35:09.000000000 -0400 @@ -58,9 +58,16 @@ ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf ) + FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread + PATHS + ${_OPENEXRLinkDir} + /usr/lib + /usr/local/lib + ) + if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) set(OPENEXR_FOUND TRUE) - set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") + set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") if (WIN32) set(_OPENEXR_DEFINITIONS -DOPENEXR_DLL) @@ -88,6 +95,7 @@ OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY + OPENEXR_ILMTHREAD_LIBRARY OPENEXR_IMATH_LIBRARY OPENEXR_IEX_LIBRARY OPENEXR_HALF_LIBRARY --- kdelibs-3.94.0/cmake/modules/FindOpenGL.cmake 1969-12-31 19:00:00.000000000 -0500 +++ kdelibs-3.94.0-new/cmake/modules/FindOpenGL.cmake 2007-10-15 22:35:09.000000000 -0400 @@ -0,0 +1,156 @@ +# - Try to find OpenGL +# Once done this will define +# +# OPENGL_FOUND - system has OpenGL +# OPENGL_XMESA_FOUND - system has XMESA +# OPENGL_GLU_FOUND - system has GLU +# OPENGL_INCLUDE_DIR - the GL include directory +# OPENGL_LIBRARIES - Link these to use OpenGL and GLU +# +# If you want to use just GL you can use these values +# OPENGL_gl_LIBRARY - Path to OpenGL Library +# OPENGL_glu_LIBRARY - Path to GLU Library +# +# On OSX default to using the framework version of opengl +# People will have to change the cache values of OPENGL_glu_LIBRARY +# and OPENGL_gl_LIBRARY to use OpenGL with X11 on OSX +IF (APPLE AND NOT CMAKE_IGNORE_OPENGL_FRAMEWORK) + FIND_LIBRARY(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL lib for OSX") + FIND_LIBRARY(OPENGL_glu_LIBRARY AGL DOC "AGL lib for OSX") + FIND_PATH(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX") +ENDIF (APPLE AND NOT CMAKE_IGNORE_OPENGL_FRAMEWORK) + +IF (WIN32) + IF (CYGWIN) + + FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h + /usr/include + /usr/include/w32api + /usr/X11R6/include + ) + + FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32 + /usr/lib + /usr/lib/w32api + ) + + FIND_LIBRARY(OPENGL_glu_LIBRARY glu32 + /usr/lib + /usr/lib/w32api + ) + + ELSE (CYGWIN) + + IF(BORLAND) + SET (OPENGL_gl_LIBRARY import32 CACHE STRING "OpenGL library for win32") + SET (OPENGL_glu_LIBRARY import32 CACHE STRING "GLU library for win32") + ELSE(BORLAND) + SET (OPENGL_gl_LIBRARY opengl32 CACHE STRING "OpenGL library for win32") + SET (OPENGL_glu_LIBRARY glu32 CACHE STRING "GLU library for win32") + ENDIF(BORLAND) + + ENDIF (CYGWIN) + +ELSE (WIN32) + IF(NOT APPLE OR CMAKE_IGNORE_OPENGL_FRAMEWORK) + + # The first line below is to make sure that the proper headers + # are used on a Linux machine with the NVidia drivers installed. + # They replace Mesa with NVidia's own library but normally do not + # install headers and that causes the linking to + # fail since the compiler finds the Mesa headers but NVidia's library. + # Make sure the NVIDIA directory comes BEFORE the others. + # - Atanas Georgiev + + FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h + /usr/share/doc/NVIDIA_GLX-1.0/include + /usr/include + /usr/local/include + /usr/openwin/share/include + /opt/graphics/OpenGL/include + /usr/X11R6/include + ) + + FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h + /usr/share/doc/NVIDIA_GLX-1.0/include + /usr/include + /usr/local/include + /usr/openwin/share/include + /opt/graphics/OpenGL/include + /usr/X11R6/include + ) + + FIND_LIBRARY(OPENGL_gl_LIBRARY + NAMES GL MesaGL + PATHS /usr/lib + /usr/local/lib + /opt/graphics/OpenGL/lib + /usr/openwin/lib + /usr/X11R6/lib + /usr/shlib + ) + + # On Unix OpenGL most certainly always requires X11. + # Feel free to tighten up these conditions if you don't + # think this is always true. + # It's not true on OSX. + + IF (OPENGL_gl_LIBRARY) + IF(NOT X11_FOUND) + INCLUDE(FindX11) + ENDIF(NOT X11_FOUND) + IF (X11_FOUND) + IF (NOT APPLE OR CMAKE_IGNORE_OPENGL_FRAMEWORK) + SET (OPENGL_LIBRARIES ${X11_LIBRARIES}) + ENDIF (NOT APPLE OR CMAKE_IGNORE_OPENGL_FRAMEWORK) + ENDIF (X11_FOUND) + ENDIF (OPENGL_gl_LIBRARY) + + FIND_LIBRARY(OPENGL_glu_LIBRARY + NAMES GLU MesaGLU + PATHS ${OPENGL_gl_LIBRARY} + /usr/lib + /usr/local/lib + /opt/graphics/OpenGL/lib + /usr/openwin/lib + /usr/X11R6/lib + /usr/shlib + ) + + ENDIF(NOT APPLE OR CMAKE_IGNORE_OPENGL_FRAMEWORK) +ENDIF (WIN32) + +SET( OPENGL_FOUND "NO" ) +IF(OPENGL_gl_LIBRARY) + + IF(OPENGL_xmesa_INCLUDE_DIR) + SET( OPENGL_XMESA_FOUND "YES" ) + ELSE(OPENGL_xmesa_INCLUDE_DIR) + SET( OPENGL_XMESA_FOUND "NO" ) + ENDIF(OPENGL_xmesa_INCLUDE_DIR) + + SET( OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_LIBRARIES}) + IF(OPENGL_glu_LIBRARY) + SET( OPENGL_GLU_FOUND "YES" ) + SET( OPENGL_LIBRARIES ${OPENGL_glu_LIBRARY} ${OPENGL_LIBRARIES} ) + ELSE(OPENGL_glu_LIBRARY) + SET( OPENGL_GLU_FOUND "NO" ) + ENDIF(OPENGL_glu_LIBRARY) + + SET( OPENGL_FOUND "YES" ) + + # This deprecated setting is for backward compatibility with CMake1.4 + + SET (OPENGL_LIBRARY ${OPENGL_LIBRARIES}) + +ENDIF(OPENGL_gl_LIBRARY) + +# This deprecated setting is for backward compatibility with CMake1.4 +SET(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR}) + +MARK_AS_ADVANCED( + OPENGL_INCLUDE_DIR + OPENGL_xmesa_INCLUDE_DIR + OPENGL_glu_LIBRARY + OPENGL_gl_LIBRARY +) --- kdelibs-3.94.0/kdecore/kernel/kstandarddirs.cpp 2007-10-08 03:41:56.000000000 -0400 +++ kdelibs-3.94.0-new/kdecore/kernel/kstandarddirs.cpp 2007-10-15 22:38:50.000000000 -0400 @@ -1432,7 +1432,7 @@ #ifdef Q_WS_MACX localKdeDir = QDir::homePath() + "/Library/Preferences/KDE/"; #else - localKdeDir = QDir::homePath() + "/.kde/"; + localKdeDir = QDir::homePath() + "/.kde4/"; #endif } --- kdelibs-3.94.0/kdeui/util/kcrash.cpp 2007-10-03 06:50:17.000000000 -0400 +++ kdelibs-3.94.0-new/kdeui/util/kcrash.cpp 2007-10-15 22:38:54.000000000 -0400 @@ -495,7 +495,7 @@ if (!kde_home || !kde_home[0]) { - kde_home = "~/.kde/"; + kde_home = "~/.kde4/"; } if (kde_home[0] == '~') --- kdelibs-3.94.0/kinit/lnusertemp.c 2007-06-27 06:53:14.000000000 -0400 +++ kdelibs-3.94.0-new/kinit/lnusertemp.c 2007-10-15 22:37:24.000000000 -0400 @@ -123,7 +123,7 @@ if (!kde_home || !kde_home[0]) { - kde_home = "~/.kde/"; + kde_home = "~/.kde4/"; } if (kde_home[0] == '~') --- kdelibs-3.94.0/kinit/wrapper.c 2007-06-27 06:53:15.000000000 -0400 +++ kdelibs-3.94.0-new/kinit/wrapper.c 2007-10-15 22:38:58.000000000 -0400 @@ -142,7 +142,7 @@ if (!kde_home || !kde_home[0]) { - kde_home = "~/.kde/"; + kde_home = "~/.kde4/"; } if (kde_home[0] == '~') --- kdelibs-3.94.0/kpty/CMakeLists.txt 2007-10-03 06:50:13.000000000 -0400 +++ kdelibs-3.94.0-new/kpty/CMakeLists.txt 2007-10-15 22:35:09.000000000 -0400 @@ -13,7 +13,7 @@ target_link_libraries(kpty ${KDE4_KDECORE_LIBS} ${UTIL_LIBRARY}) -#set_target_properties(kdecore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} ) +set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS kpty RUNTIME DESTINATION ${BIN_INSTALL_DIR} LIBRARY DESTINATION ${LIB_INSTALL_DIR} --- kdelibs-3.94.0/security/kcert/CMakeLists.txt 2007-10-03 06:50:17.000000000 -0400 +++ kdelibs-3.94.0-new/security/kcert/CMakeLists.txt 2007-10-15 22:35:09.000000000 -0400 @@ -2,8 +2,8 @@ add_definitions(-DQT3_SUPPORT_WARNINGS -DQT3_SUPPORT) -include_directories( ${OPENSSL_INCLUDE_DIR} ) include_directories( ${KDE4_KPARTS_INCLUDES} ) +include_directories( ${OPENSSL_INCLUDE_DIR} ) include_directories( ${CMAKE_BINARY_DIR}/kio/kssl ) include_directories( ${CMAKE_SOURCE_DIR}/kio/kssl ${CMAKE_SOURCE_DIR}/kde3support ${CMAKE_SOURCE_DIR}/kde3support/kdeui ) include_directories( ${KDE4_KIO_INCLUDES} ) --- kdelibs-3.94.0/sonnet/plugins/enchant/enchantclient.h 2007-10-03 06:50:02.000000000 -0400 +++ kdelibs-3.94.0-new/sonnet/plugins/enchant/enchantclient.h 2007-10-15 22:35:09.000000000 -0400 @@ -25,7 +25,7 @@ #include #include -#include +#include namespace Sonnet { class SpellerPlugin; --- kdelibs-3.94.0/sonnet/plugins/enchant/enchantdict.h 2007-06-27 06:56:20.000000000 -0400 +++ kdelibs-3.94.0-new/sonnet/plugins/enchant/enchantdict.h 2007-10-15 22:35:09.000000000 -0400 @@ -22,7 +22,7 @@ #include "spellerplugin_p.h" -#include +#include class QSpellEnchantDict : public Sonnet::SpellerPlugin {