mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 14:47:44 +00:00
Ports: Replace mc
config.sub patch with our own download
`mc` runs `autoconf` on the fly, which unpacks a `config.sub` from its own files. This means that support for `serenity` (and the fact whether the patch successfully applies) depends on the version of `autoconf` that is installed on the host. Instead, just always replace it with a fresh version straight from the GNU server.
This commit is contained in:
parent
283aa43bf9
commit
365caec2e2
5 changed files with 6 additions and 42 deletions
|
@ -15,6 +15,8 @@ configopts=(
|
||||||
"--with-ncurses-includes=$SERENITY_BUILD_DIR/Root/usr/local/include/ncurses"
|
"--with-ncurses-includes=$SERENITY_BUILD_DIR/Root/usr/local/include/ncurses"
|
||||||
"--with-ncurses-libs=$SERENITY_BUILD_DIR/Root/usr/local/lib"
|
"--with-ncurses-libs=$SERENITY_BUILD_DIR/Root/usr/local/lib"
|
||||||
)
|
)
|
||||||
|
use_fresh_config_sub=true
|
||||||
|
config_sub_path=config/config.sub
|
||||||
|
|
||||||
pre_patch() {
|
pre_patch() {
|
||||||
run ./autogen.sh
|
run ./autogen.sh
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
From 34a4ba3c619add44391b7d7a7422babab9993fbb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kenneth Myhra <kennethmyhra@gmail.com>
|
|
||||||
Date: Sat, 25 Dec 2021 19:01:58 +0100
|
|
||||||
Subject: [PATCH 1/3] config/config.sub: Add SerenityOS as portable system
|
|
||||||
|
|
||||||
- [ ] Local?
|
|
||||||
- [X] Should be merged to upstream?
|
|
||||||
- [ ] Resolves issue(s) with our side of things
|
|
||||||
- [ ] Hack
|
|
||||||
---
|
|
||||||
config/config.sub | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/config/config.sub b/config/config.sub
|
|
||||||
index 1d8e98b..85b7fde 100755
|
|
||||||
--- a/config/config.sub
|
|
||||||
+++ b/config/config.sub
|
|
||||||
@@ -1363,7 +1363,7 @@ case $os in
|
|
||||||
# The portable systems comes first.
|
|
||||||
# Each alternative MUST end in a * to match a version number.
|
|
||||||
# -sysv* is not here because it comes later, after sysvr4.
|
|
||||||
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
|
||||||
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* | -serenity* \
|
|
||||||
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
|
|
||||||
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
|
||||||
| -sym* | -kopensolaris* | -plan9* \
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 749c81e5006dea41daf16e99c8a60926236d2373 Mon Sep 17 00:00:00 2001
|
From 749c81e5006dea41daf16e99c8a60926236d2373 Mon Sep 17 00:00:00 2001
|
||||||
From: Kenneth Myhra <kennethmyhra@gmail.com>
|
From: Kenneth Myhra <kennethmyhra@gmail.com>
|
||||||
Date: Sat, 25 Dec 2021 19:15:35 +0100
|
Date: Sat, 25 Dec 2021 19:15:35 +0100
|
||||||
Subject: [PATCH 2/3] filemanager/ext.c: Include strings.h if SerenityOS
|
Subject: [PATCH 1/2] filemanager/ext.c: Include strings.h if SerenityOS
|
||||||
|
|
||||||
- [ ] Local?
|
- [ ] Local?
|
||||||
- [X] Should be merged to upstream?
|
- [X] Should be merged to upstream?
|
|
@ -1,7 +1,7 @@
|
||||||
From 0a5b0b9c2bf5befae8e2e831e75a95f2f0bb26a3 Mon Sep 17 00:00:00 2001
|
From 0a5b0b9c2bf5befae8e2e831e75a95f2f0bb26a3 Mon Sep 17 00:00:00 2001
|
||||||
From: Kenneth Myhra <kennethmyhra@gmail.com>
|
From: Kenneth Myhra <kennethmyhra@gmail.com>
|
||||||
Date: Tue, 11 Jan 2022 19:56:13 +0100
|
Date: Tue, 11 Jan 2022 19:56:13 +0100
|
||||||
Subject: [PATCH 3/3] filemanager/ext.c: Use str_ncasecmp instead of
|
Subject: [PATCH 2/2] filemanager/ext.c: Use str_ncasecmp instead of
|
||||||
strncasecmp if SerenityOS
|
strncasecmp if SerenityOS
|
||||||
|
|
||||||
- [ ] Local?
|
- [ ] Local?
|
|
@ -1,15 +1,6 @@
|
||||||
# Patches for mc on SerenityOS
|
# Patches for mc on SerenityOS
|
||||||
|
|
||||||
## `0001-config-config.sub-Add-SerenityOS-as-portable-system.patch`
|
## `0001-filemanager-ext.c-Include-strings.h-if-SerenityOS.patch`
|
||||||
|
|
||||||
config/config.sub: Add SerenityOS as portable system
|
|
||||||
|
|
||||||
- [ ] Local?
|
|
||||||
- [X] Should be merged to upstream?
|
|
||||||
- [ ] Resolves issue(s) with our side of things
|
|
||||||
- [ ] Hack
|
|
||||||
|
|
||||||
## `0002-filemanager-ext.c-Include-strings.h-if-SerenityOS.patch`
|
|
||||||
|
|
||||||
filemanager/ext.c: Include strings.h if SerenityOS
|
filemanager/ext.c: Include strings.h if SerenityOS
|
||||||
|
|
||||||
|
@ -18,7 +9,7 @@ filemanager/ext.c: Include strings.h if SerenityOS
|
||||||
- [ ] Resolves issue(s) with our side of things
|
- [ ] Resolves issue(s) with our side of things
|
||||||
- [ ] Hack
|
- [ ] Hack
|
||||||
|
|
||||||
## `0003-filemanager-ext.c-Use-str_ncasecmp-instead-of-strnca.patch`
|
## `0002-filemanager-ext.c-Use-str_ncasecmp-instead-of-strnca.patch`
|
||||||
|
|
||||||
filemanager/ext.c: Use str_ncasecmp instead of strncasecmp if SerenityOS
|
filemanager/ext.c: Use str_ncasecmp instead of strncasecmp if SerenityOS
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue