rpms/rosegarden4/F-7 rosegarden-1.6.0-fix-cmake-optflags.patch, NONE, 1.1

[Callum Lerwick (seg)]

Author: seg

Update of /cvs/extras/rpms/rosegarden4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8234

Added Files:
	rosegarden-1.6.0-fix-cmake-optflags.patch 
Log Message:
* Wed Dec 12 2007 Callum Lerwick <seg at haxxed.com> - 1.6.0-1
- New upstream version.
- Patch cmakelists to use our optflags. (bz330631)


rosegarden-1.6.0-fix-cmake-optflags.patch:

--- NEW FILE rosegarden-1.6.0-fix-cmake-optflags.patch ---
diff -ur rosegarden-1.6.0/CMakeLists.txt rosegarden-1.6.0.patched/CMakeLists.txt
--- rosegarden-1.6.0/CMakeLists.txt	2007-12-06 10:15:05.000000000 -0600
+++ rosegarden-1.6.0.patched/CMakeLists.txt	2007-12-12 13:31:26.000000000 -0600
@@ -63,6 +63,8 @@
     ADD_DEFINITIONS(-DNO_SOUND)
 ENDIF(NOT WANT_SOUND)
 
+SET(CMAKE_CXX_FLAGS_BACKUP ${CMAKE_CXX_FLAGS})
+
 # Check for KDE3
 FIND_PACKAGE(KDE3 REQUIRED QUIET)
 IF(QT_FOUND)
@@ -82,7 +84,7 @@
 ENDIF(KDE3_FOUND)
 
 # Clear the flags set by FindKDE3 
-SET(CMAKE_CXX_FLAGS "")
+SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_BACKUP})
 MARK_AS_ADVANCED(KDE3_BUILD_TESTS
                  KDE3_ENABLE_FINAL
 		 KDE3_DCOPIDL_EXECUTABLE
@@ -274,9 +276,9 @@
 ENDIF(PTHREAD_HAS_MUTEX_RECURSIVE)
 # End of PTHREAD_MUTEX_RECURSIVE Test
 
-SET(CMAKE_CXX_FLAGS_RELEASE         "-O2 -w -fexceptions -DNDEBUG")
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO  "-O2 -g -Wall -fexceptions -DDEBUG")
-SET(CMAKE_CXX_FLAGS_DEBUG           "-O0 -g3 -Wall -fexceptions -DDEBUG")
+SET(CMAKE_CXX_FLAGS_RELEASE         "-fexceptions -DNDEBUG")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO  "-fexceptions -DDEBUG")
+SET(CMAKE_CXX_FLAGS_DEBUG           "-fexceptions -DDEBUG")
 
 MESSAGE(STATUS "Rosegarden ${VERSION} will be built for install into ${CMAKE_INSTALL_PREFIX}")