- Fix missing patches to fix the build

4 files changed, 117 insertions, 0 deletions

diff --git a/misc/kdeedu4/files/patch-cmake__modules__FindBoostPython.cmake b/misc/kdeedu4/files/patch-cmake__modules__FindBoostPython.cmake
new file mode 100644
index 000000000000..c0ecd68cc762
--- /dev/null
+++ b/misc/kdeedu4/files/patch-cmake__modules__FindBoostPython.cmake
@@ -0,0 +1,13 @@
+--- ../cmake/modules/FindBoostPython.cmake.orig	2008-11-04 17:12:46.000000000 +0000
++++ ../cmake/modules/FindBoostPython.cmake	2008-12-30 21:25:59.000000000 +0000
+@@ -21,8 +21,8 @@
+ include(CheckLibraryExists)
+ 
+ # reset vars
+-set(BOOST_PYTHON_INCLUDES)
+-set(BOOST_PYTHON_LIBS)
++# set(BOOST_PYTHON_INCLUDES)
++# set(BOOST_PYTHON_LIBS)
+ 
+ # handy arrays
+ set(PYTHON_VERSIONS "python;python2.6;python2.5;python2.4;python2.3;python2.2")
diff --git a/misc/kdeedu4/files/patch-cmake__modules__FindCFitsio.cmake b/misc/kdeedu4/files/patch-cmake__modules__FindCFitsio.cmake
new file mode 100644
index 000000000000..820f49eb159d
--- /dev/null
+++ b/misc/kdeedu4/files/patch-cmake__modules__FindCFitsio.cmake
@@ -0,0 +1,25 @@
+--- ../cmake/modules/FindCFitsio.cmake.orig	2008-12-21 20:20:00.000000000 +0000
++++ ../cmake/modules/FindCFitsio.cmake	2009-01-30 22:25:02.000000000 +0000
+@@ -23,19 +23,19 @@
+   IF (NOT WIN32)
+     find_package(PkgConfig)
+     IF (PKG_CONFIG_FOUND)    
+-      pkg_check_modules(CFITSIO cfitsio)
++      pkg_check_modules(PC_CFITSIO cfitsio)
+     ENDIF (PKG_CONFIG_FOUND)
+   ENDIF (NOT WIN32)
+ 
+   find_path(CFITSIO_INCLUDE_DIR fitsio.h
+-    ${CFITSIO_INCLUDE_DIRS}
++    ${PC_CFITSIO_INCLUDE_DIRS}
+     ${_obIncDir}
+     ${GNUWIN32_DIR}/include
+   )
+ 
+   find_library(CFITSIO_LIBRARIES NAMES cfitsio libcfitsio
+     PATHS
+-    ${CFITSIO_LIBRARY_DIRS}
++    ${PC_CFITSIO_LIBRARY_DIRS}
+     ${_obLinkDir}
+     ${GNUWIN32_DIR}/lib
+   )
diff --git a/misc/kdeedu4/files/patch-cmake__modules__FindopenBabel2.cmake b/misc/kdeedu4/files/patch-cmake__modules__FindopenBabel2.cmake
new file mode 100644
index 000000000000..546ac033793f
--- /dev/null
+++ b/misc/kdeedu4/files/patch-cmake__modules__FindopenBabel2.cmake
@@ -0,0 +1,68 @@
+diff -u ../cmake/modules/FindOpenBabel2.cmake ../cmake/modules/FindOpenBabel2.cmake
+--- ../cmake/modules/FindOpenBabel2.cmake	2009/01/25 12:06:30	916420
++++ ../cmake/modules/FindOpenBabel2.cmake	2009/01/26 22:11:35	917115
+@@ -4,6 +4,7 @@
+ #  OPENBABEL2_FOUND - system has OpenBabel2
+ #  OPENBABEL2_INCLUDE_DIR - the OpenBabel2 include directory
+ #  OPENBABEL2_LIBRARIES - Link these to use OpenBabel2
++# Copyright (C) 2006, 2009 Pino Toscano, <pino@kde.org>
+ # Copyright (c) 2006, 2007 Carsten Niehaus, <cniehaus@gmx.de>
+ # Copyright (C) 2008 Marcus D. Hanwell <marcus@cryos.org>
+ # Redistribution and use is allowed according to the terms of the BSD license.
+@@ -18,13 +19,11 @@
+ 
+     # Use the newer PkgConfig stuff
+     find_package(PkgConfig REQUIRED)
+-    pkg_check_modules(OPENBABEL2 openbabel-2.0>=2.2.0)
++    pkg_check_modules(PC_OPENBABEL2 openbabel-2.0>=2.2.0)
+ 
+-    # Maintain backwards compatibility with previous version of module
+-    if(OPENBABEL2_FOUND STREQUAL "1")
++    if(PC_OPENBABEL2_FOUND)
+       set(OPENBABEL2_VERSION_MET TRUE)
+-      set(OPENBABEL2_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIRS})
+-    endif(OPENBABEL2_FOUND STREQUAL "1")
++    endif(PC_OPENBABEL2_FOUND)
+ 
+   else(NOT WIN32)
+     set(OPENBABEL2_VERSION_MET TRUE)
+@@ -32,28 +31,19 @@
+ 
+   if(OPENBABEL2_VERSION_MET)
+ 
+-   # find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
+-   #   PATHS
+-   #   ${_obIncDir}
+-   #   ${GNUWIN32_DIR}/include
+-   #   $ENV{OPENBABEL2_INCLUDE_DIR}
+-   # )
+-
+-    if(WIN32)
+-      if(NOT OPENBABEL2_INCLUDE_DIR)
+-        find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
+-          PATHS
+-          ${_obIncDir}
+-          ${GNUWIN32_DIR}/include
+-          $ENV{OPENBABEL2_INCLUDE_DIR}
+-          PATH_SUFFIXES openbabel-2.0
+-        )
+-      endif(NOT OPENBABEL2_INCLUDE_DIR)
+-    endif(WIN32)
++    find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
++      PATHS
++      ${PC_OPENBABEL2_INCLUDEDIR}
++      ${PC_OPENBABEL2_INCLUDE_DIRS}
++      ${GNUWIN32_DIR}/include
++      $ENV{OPENBABEL2_INCLUDE_DIR}
++      PATH_SUFFIXES openbabel-2.0
++    )
+ 
+-    find_library(OPENBABEL2_LIBRARIES NAMES openbabel
++    find_library(OPENBABEL2_LIBRARIES NAMES openbabel openbabel-2
+       PATHS
+-      ${_obLinkDir}
++      ${PC_OPENBABEL2_LIBDIR}
++      ${PC_OPENBABEL2_LIBRARY_DIRS}
+       ${GNUWIN32_DIR}/lib
+       $ENV{OPENBABEL2_LIBRARIES}
+     )
diff --git a/misc/kdeedu4/files/patch-kalzium__src__CMakeLists.txt b/misc/kdeedu4/files/patch-kalzium__src__CMakeLists.txt
new file mode 100644
index 000000000000..b8597576c2cd
--- /dev/null
+++ b/misc/kdeedu4/files/patch-kalzium__src__CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ../kalzium/src/CMakeLists.txt.orig	2008-08-20 19:53:43.000000000 +0000
++++ ../kalzium/src/CMakeLists.txt	2008-12-30 20:34:27.000000000 +0000
+@@ -138,7 +138,7 @@
+       set(kalzium_EXTRA_LIBS ${kalzium_EXTRA_LIBS} ${OCAML_NUMS_LIBRARY})
+    endif (OCAML_NUMS_LIBRARY)
+ 
+-   target_link_libraries(kalzium ${kalzium_EXTRA_LIBS} m dl)
++   target_link_libraries(kalzium ${kalzium_EXTRA_LIBS} m)
+ endif(LIBFACILE_FOUND)	
+ 
+ install(TARGETS kalzium  ${INSTALL_TARGETS_DEFAULT_ARGS} )