summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Ports/AvailablePorts.md2
-rwxr-xr-xPorts/cmake/package.sh4
-rw-r--r--Ports/cmake/patches/0001-cmnghttp2-check-for-HAVE_SIZEOF_SSIZE_T-and-not-HAVE.patch43
-rw-r--r--Ports/cmake/patches/0001-kwsys-Don-t-use-siginfo.patch (renamed from Ports/cmake/patches/0002-kwsys-Don-t-use-siginfo.patch)0
-rw-r--r--Ports/cmake/patches/0002-bin-bash.patch (renamed from Ports/cmake/patches/0003-bin-bash.patch)0
-rw-r--r--Ports/cmake/patches/0003-Platform-SerenityOS.patch (renamed from Ports/cmake/patches/0004-Platform-SerenityOS.patch)0
-rw-r--r--Ports/cmake/patches/0004-cmcurl-Include-unistd.patch (renamed from Ports/cmake/patches/0005-cmcurl-Include-unistd.patch)0
-rw-r--r--Ports/cmake/patches/0005-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch (renamed from Ports/cmake/patches/0006-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch)0
-rw-r--r--Ports/cmake/patches/0006-CMake-Disable-tests.patch (renamed from Ports/cmake/patches/0007-CMake-Disable-tests.patch)0
-rw-r--r--Ports/cmake/patches/ReadMe.md33
10 files changed, 10 insertions, 72 deletions
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index feb6619d1c..922b0369be 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -22,7 +22,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
| [`c-ray`](c-ray/) | C-Ray | c094d64 | https://github.com/vkoskiv/c-ray |
| [`chester`](chester/) | Chester Gameboy Emulator | | https://github.com/veikkos/chester |
| [`citron`](citron/) | Citron Programming Language | 0.0.9.3 | https://github.com/alimpfard/citron |
-| [`cmake`](cmake/) | CMake | 3.22.1 | https://cmake.org/ |
+| [`cmake`](cmake/) | CMake | 3.23.0 | https://cmake.org/ |
| [`cmatrix`](cmatrix/) | cmatrix | 3112b12 | https://github.com/abishekvashok/cmatrix |
| [`composer`](composer/) | Composer | 2.1.3 | https://getcomposer.org/ |
| [`cfunge`](cfunge/) | cfunge | 2bc4fb2 | https://github.com/VorpalBlade/cfunge/ |
diff --git a/Ports/cmake/package.sh b/Ports/cmake/package.sh
index f9e0dba575..0b845601e1 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.22.1
+version=3.23.0
useconfigure=true
-files="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz cmake-$version.tar.gz 0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0"
+files="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz cmake-$version.tar.gz 5ab0a12f702f44013be7e19534cd9094d65cc9fe7b2cd0f8c9e5318e0fe4ac82"
auth_type=sha256
depends=("bash" "make" "sed" "ncurses" "libuv" "openssl")
configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=1" "-DCMAKE_USE_OPENSSL=ON" "-GNinja")
diff --git a/Ports/cmake/patches/0001-cmnghttp2-check-for-HAVE_SIZEOF_SSIZE_T-and-not-HAVE.patch b/Ports/cmake/patches/0001-cmnghttp2-check-for-HAVE_SIZEOF_SSIZE_T-and-not-HAVE.patch
deleted file mode 100644
index 2e8b4c5bb2..0000000000
--- a/Ports/cmake/patches/0001-cmnghttp2-check-for-HAVE_SIZEOF_SSIZE_T-and-not-HAVE.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b0ae5bb3a030450d9102a67b3695738a65531606 Mon Sep 17 00:00:00 2001
-From: Ali Mohammad Pur <ali.mpfard@gmail.com>
-Date: Fri, 24 Dec 2021 05:13:08 +0330
-Subject: [PATCH 1/7] cmnghttp2: check for HAVE_SIZEOF_SSIZE_T and not
- HAVE_SSIZE_T
-
-The `check_size_type(ssize_t SIZEOF_SSIZE_T` call in cmcurl (referenced
-by the comment above, which also references some other variables that
-no longer seem to be used) defines HAVE_SIZEOF_SSIZE_T and not
-HAVE_SSIZE_T.
-The HAVE_SSIZE_T variable *does* get defined, but via the
-`CHECK_SIZE_TYPE(ssize_t SSIZE_T)` call in cmlibarchive, which gets
-configured *after* cmnghttp2, and so the first configure leads to an
-invalid cmnghttp2/config.h file.
-
-- [ ] Local?
-- [X] Should be merged to upstream?
-- [ ] Resolves issues(s) with our side of things
-- [ ] Hack
----
- Utilities/cmnghttp2/CMakeLists.txt | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Utilities/cmnghttp2/CMakeLists.txt b/Utilities/cmnghttp2/CMakeLists.txt
-index 3bc2778e..7e8bf99b 100644
---- a/Utilities/cmnghttp2/CMakeLists.txt
-+++ b/Utilities/cmnghttp2/CMakeLists.txt
-@@ -7,10 +7,8 @@ elseif(CMAKE_C_COMPILER_ID STREQUAL "PathScale")
- endif()
-
- # Re-use some check result cache entries from cmcurl:
--# * HAVE_ARPA_INET_H
--# * HAVE_NETINET_IN_H
--# * HAVE_SSIZE_T
--if(NOT HAVE_SSIZE_T)
-+# * HAVE_SIZEOF_SSIZE_T
-+if(NOT HAVE_SIZEOF_SSIZE_T)
- set(ssize_t KWIML_INT_intptr_t)
- endif()
- configure_file(cmakeconfig.h.in config.h)
---
-2.34.1
-
diff --git a/Ports/cmake/patches/0002-kwsys-Don-t-use-siginfo.patch b/Ports/cmake/patches/0001-kwsys-Don-t-use-siginfo.patch
index 8efd34f63d..8efd34f63d 100644
--- a/Ports/cmake/patches/0002-kwsys-Don-t-use-siginfo.patch
+++ b/Ports/cmake/patches/0001-kwsys-Don-t-use-siginfo.patch
diff --git a/Ports/cmake/patches/0003-bin-bash.patch b/Ports/cmake/patches/0002-bin-bash.patch
index ab78f08842..ab78f08842 100644
--- a/Ports/cmake/patches/0003-bin-bash.patch
+++ b/Ports/cmake/patches/0002-bin-bash.patch
diff --git a/Ports/cmake/patches/0004-Platform-SerenityOS.patch b/Ports/cmake/patches/0003-Platform-SerenityOS.patch
index e1d03a57d6..e1d03a57d6 100644
--- a/Ports/cmake/patches/0004-Platform-SerenityOS.patch
+++ b/Ports/cmake/patches/0003-Platform-SerenityOS.patch
diff --git a/Ports/cmake/patches/0005-cmcurl-Include-unistd.patch b/Ports/cmake/patches/0004-cmcurl-Include-unistd.patch
index cc4bad1b96..cc4bad1b96 100644
--- a/Ports/cmake/patches/0005-cmcurl-Include-unistd.patch
+++ b/Ports/cmake/patches/0004-cmcurl-Include-unistd.patch
diff --git a/Ports/cmake/patches/0006-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch b/Ports/cmake/patches/0005-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch
index c4324e3a1a..c4324e3a1a 100644
--- a/Ports/cmake/patches/0006-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch
+++ b/Ports/cmake/patches/0005-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch
diff --git a/Ports/cmake/patches/0007-CMake-Disable-tests.patch b/Ports/cmake/patches/0006-CMake-Disable-tests.patch
index 5de26813e2..5de26813e2 100644
--- a/Ports/cmake/patches/0007-CMake-Disable-tests.patch
+++ b/Ports/cmake/patches/0006-CMake-Disable-tests.patch
diff --git a/Ports/cmake/patches/ReadMe.md b/Ports/cmake/patches/ReadMe.md
index 8b2b218a5c..bd25ea1c6d 100644
--- a/Ports/cmake/patches/ReadMe.md
+++ b/Ports/cmake/patches/ReadMe.md
@@ -1,24 +1,6 @@
# Patches for cmake on SerenityOS
-## `0001-cmnghttp2-check-for-HAVE_SIZEOF_SSIZE_T-and-not-HAVE.patch`
-
-cmnghttp2: check for HAVE_SIZEOF_SSIZE_T and not HAVE_SSIZE_T
-
-The `check_size_type(ssize_t SIZEOF_SSIZE_T` call in cmcurl (referenced
-by the comment above, which also references some other variables that
-no longer seem to be used) defines HAVE_SIZEOF_SSIZE_T and not
-HAVE_SSIZE_T.
-The HAVE_SSIZE_T variable *does* get defined, but via the
-`CHECK_SIZE_TYPE(ssize_t SSIZE_T)` call in cmlibarchive, which gets
-configured *after* cmnghttp2, and so the first configure leads to an
-invalid cmnghttp2/config.h file.
-
-- [ ] Local?
-- [X] Should be merged to upstream?
-- [ ] Resolves issues(s) with our side of things
-- [ ] Hack
-
-## `0002-kwsys-Don-t-use-siginfo.patch`
+## `0001-kwsys-Don-t-use-siginfo.patch`
kwsys: Don't use siginfo
@@ -29,7 +11,7 @@ We don't support SIGINFO. This patch removes uses of SIGINFO.
- [X] Resolves issue(s) with our side of things
- [ ] Hack
-## `0003-bin-bash.patch`
+## `0002-bin-bash.patch`
/bin/bash
@@ -40,7 +22,7 @@ This patch swaps out /bin/sh for /bin/bash in two scripts that need it.
- [ ] Resolves issue(s) with our side of things
- [ ] Hack
-## `0004-Platform-SerenityOS.patch`
+## `0003-Platform-SerenityOS.patch`
Platform/SerenityOS
@@ -51,7 +33,7 @@ This patch adds the SerenityOS platform config file to CMake.
- [ ] Resolves issue(s) with our side of things
- [ ] Hack
-## `0005-cmcurl-Include-unistd.patch`
+## `0004-cmcurl-Include-unistd.patch`
cmcurl: Include unistd
@@ -62,18 +44,18 @@ Everyone gets this wrong. most platforms are very lax with these includes, but w
- [ ] Resolves issue(s) with our side of things
- [ ] Hack
-## `0006-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch`
+## `0005-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch`
cmcurl: Use struct stat and include sys/stat.h
-For unknown reasons, curl_setup_once.h does not include sys/stat.h. this patch includes sys/stat.h.
+For unknown reasons, curl_setup_once.h does not include sys/stat.h. This patch includes sys/stat.h.
- [ ] Local?
- [ ] Should be merged to upstream?
- [X] Resolves issue(s) with our side of things
- [X] Hack
-## `0007-CMake-Disable-tests.patch`
+## `0006-CMake-Disable-tests.patch`
CMake: Disable tests
@@ -83,4 +65,3 @@ We don't care about building tests for now, and it makes the compilation much fa
- [ ] Should be merged to upstream?
- [ ] Resolves issue(s) with our side of things
- [ ] Hack
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-11 14:52:59 +0000