File boson-cmake_adjust.patch of Package boson

Overview Repositories Revisions Requests Users Attributes Meta

File boson-cmake_adjust.patch of Package boson

--- cmake/modules/boson/BosonMacros.cmake
+++ cmake/modules/boson/BosonMacros.cmake
@@ -59,8 +59,9 @@
         ARGS ${_header} -o ${_moc}
         DEPENDS ${_header}
      )
+     SET_SOURCE_FILES_PROPERTIES(${_current_FILE} PROPERTIES SKIP_AUTOMOC true)
      SET_SOURCE_FILES_PROPERTIES(${_src} PROPERTIES SKIP_AUTOMOC true)
-
+     ADD_FILE_DEPENDENCIES(${_src} ${_moc})
 
      SET(${_sources} ${${_sources}} ${_src})
 
--- cmake/modules/boson/FindBosonPythonLibs.cmake
+++ cmake/modules/boson/FindBosonPythonLibs.cmake
@@ -44,7 +44,7 @@
 
 	FIND_LIBRARY(PYTHON_LIBRARY
 		NAMES "python${_python_version}"
-		PATH_SUFFIXES "python${_python_version}/config"
+#		PATH_SUFFIXES "python${_python_version}/config"
 	)
 
 	_GET_PYTHON_CONFIG_VARIABLE("INCLUDEPY")
@@ -72,6 +72,6 @@
 
 	# PYTHON_LIBRARY is used for the cache entry only
 	# PYTHON_LIBRARIES is meant to be public
-	set(PYTHON_LIBRARIES "${PYTHON_LIBRARY} ${_python_dependency_libs}")
+	set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${_python_dependency_libs})
 ENDIF (NOT PYTHON_LIBRARY)
 
--- code/CMakeLists.txt
+++ code/CMakeLists.txt
@@ -28,9 +28,11 @@
 include(BosonMacros)
 
 # AB: TODO: include in official cmake files?
-set(KDE3_XDG_APPS_DIR /share/applications)
+set(KDE3_XDG_APPS_DIR /share/applications/kde)
 set(KDE3_DATA_INSTALL_DIR /share/apps)
-set(KDE3_LIB_INSTALL_DIR /lib)
+EXEC_PROGRAM("kde-config" ARGS "--libsuffix" OUTPUT_VARIABLE LIB_SUFFIX)
+STRING(REGEX REPLACE "\n" "" LIB_SUFFIX "${LIB_SUFFIX}")
+set(KDE3_LIB_INSTALL_DIR /lib${LIB_SUFFIX})
 set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/kde3)
 
 # AB: we need this for bodebug. TODO: we should probably use
--- code/boson/gameengine/script/CMakeLists.txt
+++ code/boson/gameengine/script/CMakeLists.txt
@@ -18,5 +18,5 @@
 kde3_automoc(${script_SRCS})
 
 boson_add_library(bosonscript STATIC ${script_SRCS})
-boson_target_link_libraries(bosonscript ${PYTHON_LIBRARIES})
+boson_target_link_libraries(bosonscript ${PYTHON_LIBRARIES} util)
 
--- code/boson/gameengine/script/pythonscript.cpp
+++ code/boson/gameengine/script/pythonscript.cpp
@@ -688,7 +688,7 @@
   //  variables or submodules dict if possible.
   PyObject* key;
   PyObject* value;
-  int pos = 0;
+  ssize_t pos = 0;
   while(PyDict_Next(moduledict, &pos, &key, &value))
   {
     // Check if value is any of the known types
@@ -774,7 +774,7 @@
   boDebug(700) << k_funcinfo << "Loading and merging " << PyDict_Size(submodules) << " submodules" << endl;
   PyObject* key;
   PyObject* value;
-  int pos = 0;
+  ssize_t pos = 0;
   while(PyDict_Next(submodules, &pos, &key, &value))
   {
     // Check if current module already has module with this name
--- data/CMakeLists.txt
+++ data/CMakeLists.txt
@@ -18,7 +18,7 @@
 
 
 # AB: TODO: include in official cmake files?
-set(KDE3_XDG_APPS_DIR /share/applications)
+set(KDE3_XDG_APPS_DIR /share/applications/kde)
 set(KDE3_DATA_INSTALL_DIR /share/apps)
 set(KDE3_LIB_INSTALL_DIR /lib)
 set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/kde3)

Places

File boson-cmake_adjust.patch of Package boson

Places