/[gentoo-x86]/sci-chemistry/molsketch/files/molsketch-0.2.0-openbabel-231.patch
Gentoo

Contents of /sci-chemistry/molsketch/files/molsketch-0.2.0-openbabel-231.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (hide annotations) (download)
Sun Jun 24 08:13:25 2012 UTC (2 years, 2 months ago) by jlec
Branch: MAIN
CVS Tags: HEAD
sci-chemistry/molsketch: Backport changes in order to fix some unknown build failure, #351232

(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)

1 jlec 1.1 CMakeLists.txt | 12 ++++++------
2     libmolsketch/src/stereocenteritem.cpp | 2 +-
3     2 files changed, 7 insertions(+), 7 deletions(-)
4    
5     diff --git a/CMakeLists.txt b/CMakeLists.txt
6     index a4b5d29..f472b40 100644
7     --- a/CMakeLists.txt
8     +++ b/CMakeLists.txt
9     @@ -12,10 +12,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
10     # compiler issues are fixed and more warnings are issued. #
11     ###########################################################
12     if (CMAKE_COMPILER_IS_GNUCXX)
13     - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align")
14     - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wchar-subscripts")
15     - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security")
16     - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -fno-common")
17     +# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align")
18     +# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wchar-subscripts")
19     +# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security")
20     +# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -fno-common")
21     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align")
22     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security")
23     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-check-new -fno-common")
24     @@ -32,7 +32,7 @@ set(CPACK_SOURCE_IGNORE_FILES "/build;/.git")
25     include(CPack)
26    
27     # Unit testing, mainly useful for developers and so defaults to off
28     -option(ENABLE_TESTS "Enable unit testing" ON)
29     +option(ENABLE_TESTS "Enable unit testing" OFF)
30     if(ENABLE_TESTS)
31     set(QT_USE_QTTEST TRUE)
32     enable_testing()
33     @@ -48,7 +48,7 @@ configure_file("${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
34     add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
35    
36     # Enabling debugging symbols
37     -set(CMAKE_BUILD_TYPE Debug)
38     +# set(CMAKE_BUILD_TYPE Debug)
39    
40     # Enabling shared libraries
41     set(BUILD_SHARED_LIBS OFF)
42     diff --git a/libmolsketch/src/stereocenteritem.cpp b/libmolsketch/src/stereocenteritem.cpp
43     index 44a8015..20f2a4a 100644
44     --- a/libmolsketch/src/stereocenteritem.cpp
45     +++ b/libmolsketch/src/stereocenteritem.cpp
46     @@ -63,7 +63,7 @@ namespace Molsketch {
47     graphsym.GetSymmetry(symmetry_classes);
48    
49     //std::vector<unsigned long> atomIds = FindTetrahedralAtoms(obmol, symmetry_classes);
50     - std::vector<OpenBabel::StereogenicUnit> units = FindStereogenicUnits(obmol, symmetry_classes);
51     + OpenBabel::OBStereoUnitSet units = FindStereogenicUnits(obmol, symmetry_classes);
52    
53     for (unsigned int i = 0; i < units.size(); ++i) {
54     if (units.at(i).type == OpenBabel::OBStereo::Tetrahedral) {

  ViewVC Help
Powered by ViewVC 1.1.20