beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Ports/cmake: Update cmake to version 3.23.0 and remove upstreamed patch

Browse source 
The check for HAVE_SIZEOF_SSIZE_T and not HAVE_SSIZE_T has been upstreamed in 99acfe41f5.
This commit is contained in:
EWouters 2022-03-31 02:11:31 +02:00 committed by Brian Gianforcaro
parent 7be57c322e
commit e6d28a9dd4
Notes: sideshowbarker 2024-07-17 16:23:14 +09:00 
Author: https://github.com/EWouters
Commit: https://github.com/SerenityOS/serenity/commit/e6d28a9dd4
Pull-request: https://github.com/SerenityOS/serenity/pull/13371
10 changed files with 10 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -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/ |

4
Ports/cmake/package.sh
View file

@ -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")

43
Ports/cmake/patches/0001-cmnghttp2-check-for-HAVE_SIZEOF_SSIZE_T-and-not-HAVE.patch
View file

@ -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

0
Ports/cmake/patches/0002-kwsys-Don-t-use-siginfo.patch → Ports/cmake/patches/0001-kwsys-Don-t-use-siginfo.patch
View file

0
Ports/cmake/patches/0003-bin-bash.patch → Ports/cmake/patches/0002-bin-bash.patch
View file

0
Ports/cmake/patches/0004-Platform-SerenityOS.patch → Ports/cmake/patches/0003-Platform-SerenityOS.patch
View file

0
Ports/cmake/patches/0005-cmcurl-Include-unistd.patch → Ports/cmake/patches/0004-cmcurl-Include-unistd.patch
View file

0
Ports/cmake/patches/0006-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch → Ports/cmake/patches/0005-cmcurl-Use-struct-stat-and-include-sys-stat.h.patch
View file

0
Ports/cmake/patches/0007-CMake-Disable-tests.patch → Ports/cmake/patches/0006-CMake-Disable-tests.patch
View file

33
Ports/cmake/patches/ReadMe.md
View file

@ -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