pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
openbabel: fix build with cmake 4
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Tue Aug 12 08:47:52 2025 +0200
Changeset: bec599baa926c7e38d2651dca54c4fec7cba78e3
Modified Files:
openbabel/distinfo
openbabel/patches/patch-CMakeLists.txt
Added Files:
openbabel/patches/patch-doc_examples_static__executable_CMakeLists.txt
openbabel/patches/patch-scripts_CMakeLists.txt
openbabel/patches/patch-test_CMakeLists.txt
Log Message:
openbabel: fix build with cmake 4
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bec599baa926c7e38d2651dca54c4fec7cba78e3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
openbabel/distinfo | 5 +++-
openbabel/patches/patch-CMakeLists.txt | 31 +++++++++++++++++++---
...-doc_examples_static__executable_CMakeLists.txt | 15 +++++++++++
openbabel/patches/patch-scripts_CMakeLists.txt | 12 +++++++++
openbabel/patches/patch-test_CMakeLists.txt | 14 ++++++++++
5 files changed, 72 insertions(+), 5 deletions(-)
diffs:
diff --git a/openbabel/distinfo b/openbabel/distinfo
index 218a229dbb..f3d4d8d522 100644
--- a/openbabel/distinfo
+++ b/openbabel/distinfo
@@ -3,5 +3,8 @@ $NetBSD: distinfo,v 1.15 2025/01/31 15:49:47 wiz Exp $
BLAKE2s (openbabel-3.1.2-889c350feb179b43aa43985799910149d4eaa2bc.tar.gz) = 850a95cf66818ba949d04a5099d91f822b3e3a0eb2674978e190415827ac83c1
SHA512 (openbabel-3.1.2-889c350feb179b43aa43985799910149d4eaa2bc.tar.gz) = 44340c3d08b22783cf6a702c192480869b73fef21104641feaf5cbcd51f693fd17bb05ad31a3520f330aa57733d6f4be707b3c1243b3010d6ceccca8974e732f
Size (openbabel-3.1.2-889c350feb179b43aa43985799910149d4eaa2bc.tar.gz) = 36864825 bytes
-SHA1 (patch-CMakeLists.txt) = 90aa6fd4d2bcaa2a12f6be3c70fe2747dc32e2bf
+SHA1 (patch-CMakeLists.txt) = ca891ea9fbe94fc1329038daa5e799b723b7451f
+SHA1 (patch-doc_examples_static__executable_CMakeLists.txt) = bb856e98c870e91d8e7047eaf3654c5951dc27f4
+SHA1 (patch-scripts_CMakeLists.txt) = 0ceae9b607a985492a001f21d706482ae48c936a
+SHA1 (patch-test_CMakeLists.txt) = f9d7a528c5476dd2f53346b2ab820211c6bdc385
SHA1 (patch-tools_CMakeLists.txt) = bcdaea1a9cd19b5c25e85d87b619433a1cec0ad0
diff --git a/openbabel/patches/patch-CMakeLists.txt b/openbabel/patches/patch-CMakeLists.txt
index 3246516526..30f7c95f60 100644
--- a/openbabel/patches/patch-CMakeLists.txt
+++ b/openbabel/patches/patch-CMakeLists.txt
@@ -1,10 +1,33 @@
$NetBSD$
+First two chunks:
+https://github.com/openbabel/openbabel/pull/2784
+
+rest:
Remove obsolete variable and bump minor version.
---- CMakeLists.txt.orig 2025-08-06 11:05:10.343344410 +0000
+--- CMakeLists.txt.orig 2024-12-21 00:24:53.000000000 +0000
+++ CMakeLists.txt
-@@ -24,7 +24,7 @@ include (CheckCXXCompilerFlag)
+@@ -1,6 +1,6 @@
+-# Please ensure that any changes remain compliant with 3.1.
++# Please ensure that any changes remain compliant with 3.10.
+ if(NOT EMBED_OPENBABEL)
+- cmake_minimum_required(VERSION 3.1)
++ cmake_minimum_required(VERSION 3.10)
+ endif()
+
+ project(openbabel)
+@@ -10,9 +10,6 @@ set (CMAKE_CXX_STANDARD 11)
+
+ if(COMMAND cmake_policy)
+ cmake_policy(SET CMP0003 NEW)
+- if(POLICY CMP0042)
+- cmake_policy(SET CMP0042 OLD)
+- endif()
+ endif()
+
+ include (CheckCXXCompilerFlag)
+@@ -24,7 +21,7 @@ include (CheckCXXCompilerFlag)
# had too many 1.100.1 releases. :-)
set(BABEL_MAJ_VER 3)
set(BABEL_MIN_VER 1)
@@ -13,7 +36,7 @@ Remove obsolete variable and bump minor version.
# This should be phased out in preference for just using the target name
set(BABEL_LIBRARY openbabel)
-@@ -317,7 +317,7 @@ endif()
+@@ -317,7 +314,7 @@ endif()
find_package(Boost COMPONENTS program_options iostreams)
if(Boost_FOUND)
@@ -22,7 +45,7 @@ Remove obsolete variable and bump minor version.
endif()
# Intel C++ Compiler
-@@ -438,7 +438,7 @@ endif()
+@@ -438,7 +435,7 @@ endif()
find_package(Boost COMPONENTS filesystem iostreams unit_test_framework)
if(Boost_FOUND)
diff --git a/openbabel/patches/patch-doc_examples_static__executable_CMakeLists.txt b/openbabel/patches/patch-doc_examples_static__executable_CMakeLists.txt
new file mode 100644
index 0000000000..c4c8397326
--- /dev/null
+++ b/openbabel/patches/patch-doc_examples_static__executable_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://github.com/openbabel/openbabel/pull/2784
+
+--- doc/examples/static_executable/CMakeLists.txt.orig 2024-12-21 00:24:53.000000000 +0000
++++ doc/examples/static_executable/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ #
+
+ # This line is required for cmake backwards compatibility.
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.10)
+
+ # Name of your project
+ project(myproject)
diff --git a/openbabel/patches/patch-scripts_CMakeLists.txt b/openbabel/patches/patch-scripts_CMakeLists.txt
new file mode 100644
index 0000000000..f228976acb
--- /dev/null
+++ b/openbabel/patches/patch-scripts_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD$
+
+https://github.com/openbabel/openbabel/pull/2784
+
+--- scripts/CMakeLists.txt.orig 2024-12-21 00:24:53.000000000 +0000
++++ scripts/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6.0)
++cmake_minimum_required(VERSION 3.10.0)
+ # Library versioning (used in Mac Python bindings)x
+ set(SOVERSION 4)
+
diff --git a/openbabel/patches/patch-test_CMakeLists.txt b/openbabel/patches/patch-test_CMakeLists.txt
new file mode 100644
index 0000000000..ba7eec8700
--- /dev/null
+++ b/openbabel/patches/patch-test_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD$
+
+https://github.com/openbabel/openbabel/pull/2784
+
+--- test/CMakeLists.txt.orig 2024-12-21 00:24:53.000000000 +0000
++++ test/CMakeLists.txt
+@@ -152,6 +152,7 @@ endif()
+
+ add_executable(test_runner ${srclist} obtest.cpp)
+ target_link_libraries(test_runner ${libs})
++set_target_properties(test_runner PROPERTIES ENABLE_EXPORTS TRUE)
+
+ if(NOT BUILD_SHARED AND NOT BUILD_MIXED)
+ set_target_properties(test_runner PROPERTIES LINK_SEARCH_END_STATIC TRUE)
Home |
Main Index |
Thread Index |
Old Index