xdispatch2: update to 2.1.4, drop now redundant patches

devel/xdispatch2/Portfile

@@ -5,7 +5,7 @@ PortGroup           cmake 1.1
 PortGroup           codeberg 1.0
 PortGroup           conflicts_build 1.0
 
-codeberg.setup      emzeat xdispatch2 2.1.3 v
+codeberg.setup      emzeat xdispatch2 2.1.4 v
 revision            0
 categories          devel
 license             Apache-2
@@ -14,9 +14,11 @@ description         Grand Central Dispatch-like C++ threading library
 long_description    {*}${description}, built around queues, thread pools \
                     and flexible backends.
 homepage            https://emzeat.de/xdispatch2
-checksums           rmd160  a9932cebcd42c04c3cbd0da8ac3cdd2ba451d01c \
-                    sha256  de7085d506630dc680205a46ec94b832ebaca87b942f795abc5d556b0df5a64a \
-                    size    122979
+checksums           rmd160  84d03ffa9f18ef854943a19371644707e3b76ee6 \
+                    sha256  ede47fd751ae1bb4d680ff4cf60f210f6a73e5a4f1a73330251415377814a401 \
+                    size    125886
+
+cmake.generator     Ninja
 
 compiler.cxx_standard   2011
 
@@ -28,9 +30,6 @@ conflicts_build     libunwind
 # See: https://github.com/emzeat/xdispatch2/issues/1
 patchfiles-append   0001-Avoid-a-need-for-Conan.patch
 
-# https://github.com/emzeat/xdispatch2/commit/d7805c0750b2ed30b92844c15f8a309d2d67c00c
-patchfiles-append   0002-Add-missing-stdexcept-header.patch
-
 post-patch {
     reinplace "s,@PREFIX@,${prefix}," ${worksrcpath}/CMakeLists.txt
     reinplace "s,@VERSION@,${version}," ${worksrcpath}/CMakeLists.txt
@@ -47,7 +46,7 @@ configure.args-append \
                     -DBUILD_XDISPATCH2_STATIC=OFF \
                     -DBUILD_XDISPATCH2_TESTS=OFF
 
-variant libdispatch description "Enable libdispatch back-end" {
+variant libdispatch conflicts libdispatch_legacy description "Enable libdispatch back-end" {
     configure.args-replace \
                     -DBUILD_XDISPATCH2_BACKEND_LIBDISPATCH=OFF \
                     -DBUILD_XDISPATCH2_BACKEND_LIBDISPATCH=ON
@@ -70,14 +69,19 @@ platform darwin {
                     +libdispatch
     }
 
-#     variant libdispatch_legacy description "Enable libdispatch support for legacy systems" {
-#         depends_lib-append \
-#                     port:libdispatch-legacy
-#         configure.cppflags-append \
-#                     -I${prefix}/libexec/dispatch/usr/include
-#         configure.ldflags-append \
-#                     ${prefix}/libexec/dispatch/usr/lib/libdispatch.a
-#     }
+    # This builds now, but remains untested. Do not make the default one.
+    variant libdispatch_legacy conflicts libdispatch description "Enable libdispatch support for legacy systems" {
+        depends_lib-append \
+                    port:libdispatch-legacy
+        configure.args-replace \
+                    -DBUILD_XDISPATCH2_BACKEND_LIBDISPATCH=OFF \
+                    -DBUILD_XDISPATCH2_BACKEND_LIBDISPATCH=ON
+        configure.cppflags-append \
+                    -I${prefix}/libexec/dispatch/usr/include
+        # Should be passed via C++ flags:
+        configure.cxxflags-append \
+                    -Wl,${prefix}/libexec/dispatch/usr/lib/libdispatch.a
+    }
 }
 
 variant tests description "Enable testing" {
@@ -91,8 +95,7 @@ variant tests description "Enable testing" {
     # MUnit_tools.h: error: 'vsprintf' is deprecated: This function is provided
     # for compatibility reasons only [-Werror,-Wdeprecated-declarations]
     patchfiles-append \
-                    0003-Fix-tests.patch \
-                    0004-Tests-no-qt5.patch
+                    0002-Fix-tests.patch
 
     test.run        yes
     test.cmd        ${cmake.build_dir}/bin/xdispatch2_tests