<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c3badd11788e19036bf694391419599003ae774a">https://github.com/macports/macports-ports/commit/c3badd11788e19036bf694391419599003ae774a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c3badd11788e19036bf694391419599003ae774a
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sun Dec 8 00:34:31 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    openbabel2: fix C++ standard, fix opportunistic usage of wxWidgets
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/71480
</span>---
 science/openbabel2/Portfile                        | 11 ++++++--
 .../files/patch-fix-wxWidgets-search.diff          | 32 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openbabel2/Portfile b/science/openbabel2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 232abe179b8..3cf62e84b96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openbabel2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openbabel2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ github.setup        openbabel openbabel 2-4-1 openbabel-
</span> name                openbabel2
 conflicts           openbabel
 version             [string map {- .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 categories          science devel chemistry
 license             GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,13 +31,20 @@ checksums           rmd160  0587a3d3dd24c485ff9a680ff83145f052b504f4 \
</span> 
 depends_build-append \
                     path:share/pkgconfig/eigen3.pc:eigen3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:bin/pkg-config:pkgconfig
</span> 
 depends_lib-append  path:lib/pkgconfig/cairo.pc:cairo \
                     port:libiconv \
                     port:libxml2 \
                     port:zlib
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Build behaves incoherently, ignoring -DBUILD_GUI=OFF.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/71480
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-fix-wxWidgets-search.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# eigen3-devel needs C++14 though.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard   2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
                     -DBUILD_GUI=OFF \
                     -DBUILD_TESTING=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openbabel2/files/patch-fix-wxWidgets-search.diff b/science/openbabel2/files/patch-fix-wxWidgets-search.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..777d809e9fb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openbabel2/files/patch-fix-wxWidgets-search.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2016-10-10 23:56:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-12-08 00:28:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -178,15 +178,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# wxWidgets instructions based on http://wiki.wxwidgets.org/CMake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#find_package(wxWidgets COMPONENTS base core REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(wxWidgets COMPONENTS base core adv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(wxWidgets_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  include(${wxWidgets_USE_FILE})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  add_definitions(-DHAVE_WXWIDGETS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  include_directories(${wxWidgets_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Ensure that CharacterSet="0" in the project files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   add_definitions(-D_SBCS) # Single-Byte Character Set (requires CMake 2.8.8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -494,6 +485,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(BUILD_GUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   message(STATUS "Attempting to build the GUI")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  # wxWidgets instructions based on http://wiki.wxwidgets.org/CMake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  find_package(wxWidgets COMPONENTS base core adv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  if(wxWidgets_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    include(${wxWidgets_USE_FILE})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    add_definitions(-DHAVE_WXWIDGETS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    include_directories(${wxWidgets_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if(wxWidgets_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     message(STATUS "   wxWidgets found => GUI will be built")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     add_subdirectory(src/GUI)
</span></pre><pre style='margin:0'>

</pre>