diff --git a/programming/library/libdispatch/actions.py b/programming/library/libdispatch/actions.py index beec91eeb3..c7ac4ae3bb 100644 --- a/programming/library/libdispatch/actions.py +++ b/programming/library/libdispatch/actions.py @@ -6,17 +6,16 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import cmaketools +from pisi.actionsapi import mesontools from pisi.actionsapi import pisitools -from pisi.actionsapi import get -j = "-DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RELEASE \ - -DCMAKE_THREAD_LIBS_INIT='-lpthread' \ - -DCMAKE_HAVE_THREADS_LIBRARY=ON \ - -DCMAKE_USE_PTHREADS_INIT=ON \ - -DBUILD_TESTING=OFF \ - -B_build -LA \ - " +j = ''.join([ + ' -DCMAKE_INSTALL_PREFIX=/usr', + ' -DCMAKE_BUILD_TYPE=Release', + ' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON', + ' -DBUILD_TESTING=OFF', + ' -Bbuild -G Ninja -L ' + ]) def setup(): shelltools.export("CC", "clang") @@ -24,12 +23,9 @@ def setup(): cmaketools.configure(j) def build(): - shelltools.cd("_build") - cmaketools.make() + mesontools.build() def install(): - shelltools.cd("_build") - cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) - - pisitools.dodoc("../CONTRIBUTING.md", "../INSTALL.md", "../README.md", "../TESTING.md") + mesontools.install() + pisitools.dodoc("LICENSE") diff --git a/programming/library/libdispatch/files/avoid-libkqueue.patch b/programming/library/libdispatch/files/avoid-libkqueue.patch deleted file mode 100644 index dc482798f7..0000000000 --- a/programming/library/libdispatch/files/avoid-libkqueue.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/dispatch_test.c.orig -+++ tests/dispatch_test.c -@@ -30,7 +30,7 @@ - #include - #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) - #include --#if __has_include() -+#if __has_include() && !defined(__linux__) - #define HAS_SYS_EVENT_H 1 - #include - #else diff --git a/programming/library/libdispatch/files/remove-werror.patch b/programming/library/libdispatch/files/remove-werror.patch deleted file mode 100644 index 1c182360e6..0000000000 --- a/programming/library/libdispatch/files/remove-werror.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cmake/modules/DispatchCompilerWarnings.cmake.orig 2020-05-12 13:13:59.619689872 +0300 -+++ cmake/modules/DispatchCompilerWarnings.cmake 2020-05-12 13:13:35.216171428 +0300 -@@ -2,7 +2,6 @@ - if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") - # TODO: someone needs to provide the msvc equivalent warning flags - else() -- add_compile_options($<$,$>:-Werror>) - add_compile_options($<$,$>:-Wall>) - add_compile_options($<$,$>:-Wextra>) - diff --git a/programming/library/libdispatch/pspec.xml b/programming/library/libdispatch/pspec.xml index 3c3659a6bb..5711f4c775 100644 --- a/programming/library/libdispatch/pspec.xml +++ b/programming/library/libdispatch/pspec.xml @@ -3,7 +3,7 @@ libdispatch - https://apple.github.io/swift-corelibs-libdispatch/ + https://swiftlang.github.io/swift-corelibs-libdispatch/ Pisilinux Community admin@pisilinux.org @@ -12,17 +12,17 @@ library Grand Central Dispatch. Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware. - - https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags/swift-5.5-RELEASE.tar.gz + + https://github.com/swiftlang/swift-corelibs-libdispatch/archive/refs/tags/swift-6.1-RELEASE.tar.gz cmake + ninja llvm-clang llvm-clang-devel - avoid-libkqueue.patch - remove-werror.patch + @@ -33,8 +33,7 @@ /usr/lib - /usr/share/man - /usr/share/doc + /usr/share @@ -49,6 +48,13 @@ + + 2025-04-05 + 6.1 + Version bump. + fury + uglyside@yandex.ru + 2022-11-25 5.5