diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 05f2e54397..0730205acc 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -17,7 +17,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`carl`](carl/) | Crypto Ancienne Resource Loader | 1.5 | https://github.com/classilla/cryanc | | [`c-ray`](c-ray/) | C-Ray | c094d64 | https://github.com/vkoskiv/c-ray | | [`chester`](chester/) | Chester Gameboy Emulator | | https://github.com/veikkos/chester | -| [`cmake`](cmake/) | CMake | 3.19.4 | https://cmake.org/ | +| [`cmake`](cmake/) | CMake | 3.22.1 | https://cmake.org/ | | [`cmatrix`](cmatrix/) | cmatrix | 3112b12 | https://github.com/abishekvashok/cmatrix | | [`composer`](composer/) | Composer | 2.1.3 | https://getcomposer.org/ | | [`curl`](curl/) | curl | 7.78.0 | https://curl.se/ | diff --git a/Ports/cmake/package.sh b/Ports/cmake/package.sh index a5ecd381e9..d9cff090fa 100755 --- a/Ports/cmake/package.sh +++ b/Ports/cmake/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port=cmake -version=3.19.4 +version=3.22.1 useconfigure=true -files="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz cmake-$version.tar.gz 7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1" +files="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz cmake-$version.tar.gz 0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0" auth_type=sha256 depends=("bash" "make" "sed" "ncurses" "libuv") configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=1" "-GNinja") diff --git a/Ports/cmake/patches/0011-Fixed-your-code-rot-cmake.patch b/Ports/cmake/patches/0011-Fixed-your-code-rot-cmake.patch deleted file mode 100644 index be9787ed1e..0000000000 --- a/Ports/cmake/patches/0011-Fixed-your-code-rot-cmake.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fd44bfe91d4b17c20c8028d60fe73e016879e73b Mon Sep 17 00:00:00 2001 -From: AnotherTest -Date: Fri, 12 Feb 2021 13:59:50 +0330 -Subject: [PATCH 11/11] Fixed your code rot, cmake - ---- - Source/kwsys/ProcessUNIX.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c -index cbf137b..65bf129 100644 ---- a/Source/kwsys/ProcessUNIX.c -+++ b/Source/kwsys/ProcessUNIX.c -@@ -2890,10 +2890,10 @@ static void kwsysProcessesSignalHandler(int signum - /* Re-Install our handler. Repeat call until it is not interrupted. */ - { - struct sigaction newSigAction; -- struct sigaction& oldSigAction; -+ struct sigaction* oldSigAction; - memset(&newSigAction, 0, sizeof(struct sigaction)); -- newSigChldAction.sa_handler = kwsysProcessesSignalHandler; -- newSigChldAction.sa_flags = SA_NOCLDSTOP; -+ newSigAction.sa_handler = kwsysProcessesSignalHandler; -+ newSigAction.sa_flags = SA_NOCLDSTOP; - sigemptyset(&newSigAction.sa_mask); - switch (signum) { - case SIGCHLD: -@@ -2908,7 +2908,7 @@ static void kwsysProcessesSignalHandler(int signum - oldSigAction = &kwsysProcessesOldSigTermAction; - break; - default: -- return 0; -+ return; - } - while ((sigaction(signum, &newSigAction, oldSigAction) < 0) && - (errno == EINTR)) --- -2.30.1 - diff --git a/Ports/cmake/patches/ReadMe.md b/Ports/cmake/patches/ReadMe.md index c072305c00..030d32867c 100644 --- a/Ports/cmake/patches/ReadMe.md +++ b/Ports/cmake/patches/ReadMe.md @@ -20,16 +20,6 @@ We don't support SIGINFO. This patch removes uses of SIGINFO. - [X] Resolves issue(s) with our side of things - [ ] Hack -## `0011-Fixed-your-code-rot-cmake.patch` - -This purely fixes code issues with cmake. very funny patch. - -### Status -- [ ] Local? -- [X] Should be merged to upstream? -- [ ] Resolves issue(s) with our side of things -- [ ] Hack - ## `0012-bin-bash.patch` This patch swaps out `/bin/sh` for `/bin/bash` in two scripts that need it.