Ports: Replace the `gettext` `config.sub` patch with our download

5 files changed, 6 insertions, 48 deletions

diff --git a/Ports/gettext/package.sh b/Ports/gettext/package.sh
index 12738bd1aa..aaec3ea3a5 100755
--- a/Ports/gettext/package.sh
+++ b/Ports/gettext/package.sh
@@ -5,6 +5,8 @@ useconfigure=true
 files="https://ftp.gnu.org/pub/gnu/gettext/gettext-${version}.tar.gz gettext-${version}.tar.gz c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12"
 auth_type=sha256
 depends=("libiconv")
+use_fresh_config_sub=true
+config_sub_paths=("build-aux/config.sub" "libtextstyle/build-aux/config.sub")
 
 install() {
     run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
diff --git a/Ports/gettext/patches/0002-Stub-out-the-getprogname-implementation.patch b/Ports/gettext/patches/0001-Stub-out-the-getprogname-implementation.patch
index 0a7f560100..e0e1362be4 100644
--- a/Ports/gettext/patches/0002-Stub-out-the-getprogname-implementation.patch
+++ b/Ports/gettext/patches/0001-Stub-out-the-getprogname-implementation.patch
@@ -1,7 +1,7 @@
 From 5eb27ed6f09fb3387c23fb6cd4c39204d4592787 Mon Sep 17 00:00:00 2001
 From: Ali Mohammad Pur <ali.mpfard@gmail.com>
 Date: Mon, 16 May 2022 15:44:53 +0430
-Subject: [PATCH 2/3] Stub out the getprogname() implementation
+Subject: [PATCH 1/2] Stub out the getprogname() implementation
 
 ---
  gettext-runtime/gnulib-lib/getprogname.c | 2 ++
diff --git a/Ports/gettext/patches/0001-Teach-config.sub-about-serenity.patch b/Ports/gettext/patches/0001-Teach-config.sub-about-serenity.patch
deleted file mode 100644
index 0554d53ae9..0000000000
--- a/Ports/gettext/patches/0001-Teach-config.sub-about-serenity.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 849a14feac4220857d03ed5b4c35b03e418c6eb8 Mon Sep 17 00:00:00 2001
-From: Ali Mohammad Pur <ali.mpfard@gmail.com>
-Date: Mon, 16 May 2022 15:44:34 +0430
-Subject: [PATCH 1/3] Teach config.sub about serenity
-
----
- build-aux/config.sub              | 2 +-
- libtextstyle/build-aux/config.sub | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build-aux/config.sub b/build-aux/config.sub
-index 3d9a8dc..94c9729 100755
---- a/build-aux/config.sub
-+++ b/build-aux/config.sub
-@@ -1692,7 +1692,7 @@ case $os in
- 	# Now accept the basic system types.
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
--	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
-diff --git a/libtextstyle/build-aux/config.sub b/libtextstyle/build-aux/config.sub
-index 3d9a8dc..94c9729 100755
---- a/libtextstyle/build-aux/config.sub
-+++ b/libtextstyle/build-aux/config.sub
-@@ -1692,7 +1692,7 @@ case $os in
- 	# Now accept the basic system types.
- 	# The portable systems comes first.
- 	# Each alternative MUST end in a * to match a version number.
--	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-+	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* | serenity* \
- 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
- 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
--- 
-2.36.1
-
diff --git a/Ports/gettext/patches/0003-Stub-out-some-wctype-functions.patch b/Ports/gettext/patches/0002-Stub-out-some-wctype-functions.patch
index 74331026e2..085b94dead 100644
--- a/Ports/gettext/patches/0003-Stub-out-some-wctype-functions.patch
+++ b/Ports/gettext/patches/0002-Stub-out-some-wctype-functions.patch
@@ -1,7 +1,7 @@
 From 83aa314598238bfcbd9d55aa96a3fbe937c45a81 Mon Sep 17 00:00:00 2001
 From: Ali Mohammad Pur <ali.mpfard@gmail.com>
 Date: Mon, 16 May 2022 15:45:32 +0430
-Subject: [PATCH 3/3] Stub out some wctype functions
+Subject: [PATCH 2/2] Stub out some wctype functions
 
 ---
  gettext-tools/gnulib-lib/fnmatch.c | 12 ++++++++++++
diff --git a/Ports/gettext/patches/ReadMe.md b/Ports/gettext/patches/ReadMe.md
index 46813fabd1..cb5b371136 100644
--- a/Ports/gettext/patches/ReadMe.md
+++ b/Ports/gettext/patches/ReadMe.md
@@ -1,16 +1,11 @@
 # Patches for gettext on SerenityOS
 
-## `0001-Teach-config.sub-about-serenity.patch`
-
-Teach config.sub about serenity
-
-
-## `0002-Stub-out-the-getprogname-implementation.patch`
+## `0001-Stub-out-the-getprogname-implementation.patch`
 
 Stub out the getprogname() implementation
 
 
-## `0003-Stub-out-some-wctype-functions.patch`
+## `0002-Stub-out-some-wctype-functions.patch`
 
 Stub out some wctype functions