<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/83f2f5b758ac159db46e80b5cb917df24ef9dc69">https://github.com/macports/macports-ports/commit/83f2f5b758ac159db46e80b5cb917df24ef9dc69</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 83f2f5b758ac159db46e80b5cb917df24ef9dc69
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Wed Aug 14 12:02:56 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> bctoolbox: fix build for < 10.7
</span>---
devel/bctoolbox/Portfile | 20 +++++++++--------
...ios_utils.hh-add-a-missing-memory-include.patch | 21 ++++++++++++++++++
...port.c-define-AI_NUMERICSERV-if-undefined.patch | 24 +++++++++++++++++++++
...olboxCMakeUtils.cmake-fix-flags-for-Apple.patch | 25 ++++++++++++++++++++++
devel/bctoolbox/files/patch-fix-10.6.diff | 20 +++++++++++++++++
5 files changed, 101 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bctoolbox/Portfile b/devel/bctoolbox/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 38d204ca133..678378483de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bctoolbox/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bctoolbox/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,15 +22,6 @@ checksums rmd160 bbd9a9dd4318820299d5fec1b7819c2483745940 \
</span> sha256 1869d04fadaa20c8f07d6781dfbd65aef01812fd681eb2961f7f0300f699031f \
size 194676
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} requires the AVFoundation framework"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "AVFoundation available from macOS 10.7 and later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS X version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:bcunit
depends_lib port:libiconv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +29,17 @@ depends_lib port:libiconv \
</span>
patchfiles patch-fix-Frameworks-path.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/BelledonneCommunications/bctoolbox/pull/26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-ios_utils.hh-add-a-missing-memory-include.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-port.c-define-AI_NUMERICSERV-if-undefined.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-BcToolboxCMakeUtils.cmake-fix-flags-for-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Nothing in fact links to AVFoundation, it can just be dropped.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-10.6.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard \
2011
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bctoolbox/files/0001-ios_utils.hh-add-a-missing-memory-include.patch b/devel/bctoolbox/files/0001-ios_utils.hh-add-a-missing-memory-include.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d7df62247e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bctoolbox/files/0001-ios_utils.hh-add-a-missing-memory-include.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 78834487b7aa51ffc8ed58d49904410d2a6fe3b3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 11:00:20 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] ios_utils.hh: add a missing <memory> include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/bctoolbox/ios_utils.hh | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git include/bctoolbox/ios_utils.hh include/bctoolbox/ios_utils.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 90e2936..8cf6b80 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/bctoolbox/ios_utils.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/bctoolbox/ios_utils.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma once
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <functional>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace bctoolbox {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bctoolbox/files/0002-port.c-define-AI_NUMERICSERV-if-undefined.patch b/devel/bctoolbox/files/0002-port.c-define-AI_NUMERICSERV-if-undefined.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5f4ee546dba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bctoolbox/files/0002-port.c-define-AI_NUMERICSERV-if-undefined.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d6ed57b7c265a4abc018297e942b653d2a0bf005 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 11:01:54 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] port.c: define AI_NUMERICSERV if undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/utils/port.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/utils/port.c src/utils/port.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 76982ac..823f7f1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/utils/port.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/utils/port.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,6 +62,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MIN(a,b) a<=b ? a : b
</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;'>++#ifndef AI_NUMERICSERV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define AI_NUMERICSERV 0
</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;'>+ static void *bctbx_libc_malloc(size_t sz){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return malloc(sz);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bctoolbox/files/0003-BcToolboxCMakeUtils.cmake-fix-flags-for-Apple.patch b/devel/bctoolbox/files/0003-BcToolboxCMakeUtils.cmake-fix-flags-for-Apple.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dc1051acae8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bctoolbox/files/0003-BcToolboxCMakeUtils.cmake-fix-flags-for-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c588d25761e845c60a1713d6ec4064159a1d1414 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 14 Aug 2024 11:08:10 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] BcToolboxCMakeUtils.cmake: fix flags for Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/BCToolboxCMakeUtils.cmake | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/BCToolboxCMakeUtils.cmake cmake/BCToolboxCMakeUtils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4a3b8c3..0763a31 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/BCToolboxCMakeUtils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/BCToolboxCMakeUtils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND ${CPP_FLAGS} "-Wno-error=pragmas")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND ${CPP_FLAGS} "-Wno-error=unknown-warning-option" "-Qunused-arguments" "-Wno-tautological-compare" "-Wno-unused-function" "-Wno-array-bounds")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND ${CPP_FLAGS} "-Wno-tautological-compare" "-Wno-unused-function" "-Wno-array-bounds")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND ${CPP_FLAGS} "-Wno-discarded-qualifiers")
</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;'>+ if(ENABLE_STRICT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND ${CPP_FLAGS} "-Werror" "-Wextra" "-Wno-unused-parameter" "-Wno-error=unknown-pragmas" "-Wuninitialized" "-Wno-missing-field-initializers"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bctoolbox/files/patch-fix-10.6.diff b/devel/bctoolbox/files/patch-fix-10.6.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5a862a9eeae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bctoolbox/files/patch-fix-10.6.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt 2023-01-16 16:38:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2024-08-14 11:13:46.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,7 +105,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(bctoolbox-static STATIC ${BCTOOLBOX_SOURCE_FILES} ${BCTOOLBOX_HEADER_FILES} ${BCTOOLBOX_PRIVATE_HEADER_FILES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(bctoolbox-static INTERFACE ${CMAKE_THREAD_LIBS_INIT})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(bctoolbox-static INTERFACE "-framework Foundation" "-framework AVFoundation")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(bctoolbox-static INTERFACE "-framework Foundation")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(bctoolbox-static SYSTEM PRIVATE ${ICONV_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(bctoolbox-static INTERFACE ${ICONV_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,7 +149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(bctoolbox PRIVATE "-framework UIKit" "-framework Foundation" "-framework AVFoundation")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(bctoolbox PRIVATE "-framework Foundation" "-framework AVFoundation")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(bctoolbox PRIVATE "-framework Foundation")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(bctoolbox SYSTEM PRIVATE ${ICONV_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(bctoolbox PRIVATE ${ICONV_LIBRARIES})
</span></pre><pre style='margin:0'>
</pre>