rpms/plee-the-bear/devel plee-the-bear-0.4.1-boost.patch,1.1,1.2

Lubomir Rintel lkundrak at fedoraproject.org
Thu Feb 18 07:55:46 UTC 2010


Author: lkundrak

Update of /cvs/pkgs/rpms/plee-the-bear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29856

Modified Files:
	plee-the-bear-0.4.1-boost.patch 
Log Message:
Fix the build

plee-the-bear-0.4.1-boost.patch:
 bear-engine/core/src/engine/CMakeLists.txt          |    1 +
 bear-factory/CMakeLists.txt                         |    2 +-
 bear-factory/animation-editor/src/bf/CMakeLists.txt |    1 +
 bear-factory/bear-editor/src/bf/CMakeLists.txt      |    1 +
 bear-factory/level-editor/src/bf/CMakeLists.txt     |    1 +
 bear-factory/model-editor/src/bf/CMakeLists.txt     |    1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

Index: plee-the-bear-0.4.1-boost.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plee-the-bear/devel/plee-the-bear-0.4.1-boost.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- plee-the-bear-0.4.1-boost.patch	17 Feb 2010 22:06:12 -0000	1.1
+++ plee-the-bear-0.4.1-boost.patch	18 Feb 2010 07:55:46 -0000	1.2
@@ -1,10 +1,65 @@
-diff -up plee-the-bear-0.4.1/CMakeFiles/CMakeCXXCompiler.cmake.orig plee-the-bear-0.4.1/CMakeFiles/CMakeCXXCompiler.cmake
---- plee-the-bear-0.4.1/CMakeFiles/CMakeCXXCompiler.cmake.orig	2010-02-17 22:48:21.007497037 +0100
-+++ plee-the-bear-0.4.1/CMakeFiles/CMakeCXXCompiler.cmake	2010-02-17 22:48:50.201489435 +0100
-@@ -38,5 +38,5 @@ ENDIF(CMAKE_CXX_COMPILER_ABI)
- 
- SET(CMAKE_CXX_HAS_ISYSROOT "")
- 
--SET(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;c")
-+SET(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;c;boost_system-mt")
- SET(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/i686-redhat-linux/4.4.3;/usr/lib")
+diff -urp plee-the-bear-0.4.1/bear-engine/core/src/engine/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-engine/core/src/engine/CMakeLists.txt
+--- plee-the-bear-0.4.1/bear-engine/core/src/engine/CMakeLists.txt	2009-07-30 12:54:26.000000000 +0200
++++ plee-the-bear-0.4.1.fixed/bear-engine/core/src/engine/CMakeLists.txt	2010-02-17 23:28:41.005494996 +0100
+@@ -82,4 +82,5 @@ TARGET_LINK_LIBRARIES(
+   ${CLAW_DYNAMIC_LIBRARY_LIBRARIES}
+   ${CLAW_GRAPHIC_LIBRARIES}
+   ${Boost_FILESYSTEM_LIBRARY}
++  ${Boost_SYSTEM_LIBRARY}
+ )
+diff -urp plee-the-bear-0.4.1/bear-factory/animation-editor/src/bf/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-factory/animation-editor/src/bf/CMakeLists.txt
+--- plee-the-bear-0.4.1/bear-factory/animation-editor/src/bf/CMakeLists.txt	2009-07-10 23:59:24.000000000 +0200
++++ plee-the-bear-0.4.1.fixed/bear-factory/animation-editor/src/bf/CMakeLists.txt	2010-02-17 23:28:57.879653006 +0100
+@@ -26,6 +26,7 @@ TARGET_LINK_LIBRARIES(
+   ${CLAW_CONFIGURATION_FILE_LIBRARIES}
+   ${CLAW_LOGGER_LIBRARIES}
+   ${Boost_FILESYSTEM_LIBRARY}
++  ${Boost_SYSTEM_LIBRARY}
+   )
+ 
+ INSTALL(
+diff -urp plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-factory/bear-editor/src/bf/CMakeLists.txt
+--- plee-the-bear-0.4.1/bear-factory/bear-editor/src/bf/CMakeLists.txt	2009-09-02 23:14:42.000000000 +0200
++++ plee-the-bear-0.4.1.fixed/bear-factory/bear-editor/src/bf/CMakeLists.txt	2010-02-17 23:28:51.792622452 +0100
+@@ -87,6 +87,7 @@ TARGET_LINK_LIBRARIES(
+   ${CLAW_LOGGER_LIBRARIES}
+   ${CLAW_CONFIGURATION_FILE_LIBRARIES}
+   ${Boost_FILESYSTEM_LIBRARY}
++  ${Boost_SYSTEM_LIBRARY}
+   )
+ 
+ INSTALL(
+diff -urp plee-the-bear-0.4.1/bear-factory/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-factory/CMakeLists.txt
+--- plee-the-bear-0.4.1/bear-factory/CMakeLists.txt	2009-09-02 23:14:42.000000000 +0200
++++ plee-the-bear-0.4.1.fixed/bear-factory/CMakeLists.txt	2010-02-18 08:36:28.637517349 +0100
+@@ -68,7 +68,7 @@ INCLUDE_DIRECTORIES(
+   ${Boost_INCLUDE_DIR}
+   )
+ 
+-FIND_PACKAGE( Boost 1.33 REQUIRED COMPONENTS filesystem )
++FIND_PACKAGE( Boost 1.33 REQUIRED COMPONENTS filesystem system )
+ 
+ IF( NOT Boost_FOUND )
+   MESSAGE( FATAL_ERROR 
+diff -urp plee-the-bear-0.4.1/bear-factory/level-editor/src/bf/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-factory/level-editor/src/bf/CMakeLists.txt
+--- plee-the-bear-0.4.1/bear-factory/level-editor/src/bf/CMakeLists.txt	2009-07-10 23:59:24.000000000 +0200
++++ plee-the-bear-0.4.1.fixed/bear-factory/level-editor/src/bf/CMakeLists.txt	2010-02-17 23:28:47.473614863 +0100
+@@ -76,6 +76,7 @@ TARGET_LINK_LIBRARIES(
+   ${CLAW_CONFIGURATION_FILE_LIBRARIES}
+   ${CLAW_LOGGER_LIBRARIES}
+   ${Boost_FILESYSTEM_LIBRARY}
++  ${Boost_SYSTEM_LIBRARY}
+   )
+ 
+ INSTALL(
+diff -urp plee-the-bear-0.4.1/bear-factory/model-editor/src/bf/CMakeLists.txt plee-the-bear-0.4.1.fixed/bear-factory/model-editor/src/bf/CMakeLists.txt
+--- plee-the-bear-0.4.1/bear-factory/model-editor/src/bf/CMakeLists.txt	2009-08-12 11:38:29.000000000 +0200
++++ plee-the-bear-0.4.1.fixed/bear-factory/model-editor/src/bf/CMakeLists.txt	2010-02-17 23:28:49.674494003 +0100
+@@ -73,6 +73,7 @@ TARGET_LINK_LIBRARIES(
+   ${CLAW_CONFIGURATION_FILE_LIBRARIES}
+   ${CLAW_LOGGER_LIBRARIES}
+   ${Boost_FILESYSTEM_LIBRARY}
++  ${Boost_SYSTEM_LIBRARY}
+   )
+ 
+ INSTALL(



More information about the scm-commits mailing list