<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e647cb3b1ad34ca3c6a2a9a50168de8605c4525c">https://github.com/macports/macports-ports/commit/e647cb3b1ad34ca3c6a2a9a50168de8605c4525c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e647cb3b1ad xdispatch2: update to 2.1.4, drop now redundant patches
</span>e647cb3b1ad is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e647cb3b1ad34ca3c6a2a9a50168de8605c4525c
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu May 9 08:55:29 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> xdispatch2: update to 2.1.4, drop now redundant patches
</span>---
devel/xdispatch2/Portfile | 39 ++++++++++++----------
.../files/0002-Add-missing-stdexcept-header.patch | 21 ------------
.../{0003-Fix-tests.patch => 0002-Fix-tests.patch} | 0
devel/xdispatch2/files/0004-Tests-no-qt5.patch | 30 -----------------
4 files changed, 21 insertions(+), 69 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xdispatch2/Portfile b/devel/xdispatch2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 11ca62bd871..20798ad17b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xdispatch2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xdispatch2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span> PortGroup codeberg 1.0
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-codeberg.setup emzeat xdispatch2 2.1.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+codeberg.setup emzeat xdispatch2 2.1.4 v
</span> revision 0
categories devel
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,9 +14,11 @@ description Grand Central Dispatch-like C++ threading library
</span> long_description {*}${description}, built around queues, thread pools \
and flexible backends.
homepage https://emzeat.de/xdispatch2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a9932cebcd42c04c3cbd0da8ac3cdd2ba451d01c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 de7085d506630dc680205a46ec94b832ebaca87b942f795abc5d556b0df5a64a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 122979
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 84d03ffa9f18ef854943a19371644707e3b76ee6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ede47fd751ae1bb4d680ff4cf60f210f6a73e5a4f1a73330251415377814a401 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 125886
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.generator Ninja
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +30,6 @@ conflicts_build libunwind
</span> # See: https://github.com/emzeat/xdispatch2/issues/1
patchfiles-append 0001-Avoid-a-need-for-Conan.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/emzeat/xdispatch2/commit/d7805c0750b2ed30b92844c15f8a309d2d67c00c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 0002-Add-missing-stdexcept-header.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s,@PREFIX@,${prefix}," ${worksrcpath}/CMakeLists.txt
reinplace "s,@VERSION@,${version}," ${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +46,7 @@ configure.args-append \
</span> -DBUILD_XDISPATCH2_STATIC=OFF \
-DBUILD_XDISPATCH2_TESTS=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant libdispatch description "Enable libdispatch back-end" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant libdispatch conflicts libdispatch_legacy description "Enable libdispatch back-end" {
</span> configure.args-replace \
-DBUILD_XDISPATCH2_BACKEND_LIBDISPATCH=OFF \
-DBUILD_XDISPATCH2_BACKEND_LIBDISPATCH=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,14 +69,19 @@ platform darwin {
</span> +libdispatch
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# variant libdispatch_legacy description "Enable libdispatch support for legacy systems" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:libdispatch-legacy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -I${prefix}/libexec/dispatch/usr/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${prefix}/libexec/dispatch/usr/lib/libdispatch.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This builds now, but remains untested. Do not make the default one.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant libdispatch_legacy conflicts libdispatch description "Enable libdispatch support for legacy systems" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdispatch-legacy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_XDISPATCH2_BACKEND_LIBDISPATCH=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_XDISPATCH2_BACKEND_LIBDISPATCH=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/libexec/dispatch/usr/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Should be passed via C++ flags:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wl,${prefix}/libexec/dispatch/usr/lib/libdispatch.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant tests description "Enable testing" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,8 +95,7 @@ variant tests description "Enable testing" {
</span> # MUnit_tools.h: error: 'vsprintf' is deprecated: This function is provided
# for compatibility reasons only [-Werror,-Wdeprecated-declarations]
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-Fix-tests.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-Tests-no-qt5.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Fix-tests.patch
</span>
test.run yes
test.cmd ${cmake.build_dir}/bin/xdispatch2_tests
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xdispatch2/files/0002-Add-missing-stdexcept-header.patch b/devel/xdispatch2/files/0002-Add-missing-stdexcept-header.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0c8caf20b38..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xdispatch2/files/0002-Add-missing-stdexcept-header.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From d7805c0750b2ed30b92844c15f8a309d2d67c00c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 3 Apr 2024 20:57:13 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Add missing stdexcept header
</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;'>- include/xdispatch/signals_barrier.h | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git include/xdispatch/signals_barrier.h include/xdispatch/signals_barrier.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 474b546..303f9a9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/xdispatch/signals_barrier.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/xdispatch/signals_barrier.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,6 +27,7 @@
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdexcept>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <tuple>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "xdispatch/signals.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xdispatch2/files/0003-Fix-tests.patch b/devel/xdispatch2/files/0002-Fix-tests.patch
</span>similarity index 100%
rename from devel/xdispatch2/files/0003-Fix-tests.patch
rename to devel/xdispatch2/files/0002-Fix-tests.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xdispatch2/files/0004-Tests-no-qt5.patch b/devel/xdispatch2/files/0004-Tests-no-qt5.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5045cbaa959..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xdispatch2/files/0004-Tests-no-qt5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f403af368fc77d305722dfd4e9e513e06379be36 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 3 Apr 2024 14:40:57 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix tests2
</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;'>- CMakeLists.txt | 9 ++++-----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c53d718..7bcaa3c 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,12 +286,11 @@ mz_auto_format( xdispatch )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(BUILD_XDISPATCH2_TESTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mz_add_executable(xdispatch2_tests tests)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_executable(xdispatch2_test_package test_package/test_package.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_link_libraries(xdispatch2_test_package
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xdispatch xdispatch_dummy_qt5
</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;'>- if( BUILD_XDISPATCH2_BACKEND_QT5 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_executable(xdispatch2_test_package test_package/test_package.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(xdispatch2_test_package
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xdispatch xdispatch_dummy_qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_executable(xdispatch2_test_package_qt5 test_package/test_package_qt5.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(xdispatch2_test_package_qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xdispatch xdispatch_qt5
</span></pre><pre style='margin:0'>
</pre>