diff options
| author | Ali Mohammad Pur <ali.mpfard@gmail.com> | 2022-05-16 19:21:44 +0430 |
|---|---|---|
| committer | Ali Mohammad Pur <Ali.mpfard@gmail.com> | 2022-05-19 20:17:10 +0430 |
| commit | 4007f69976d9876362c0100f9ddf898698334286 (patch) | |
| tree | e162b3082697a3a14b0afcce3c7579f83fd1b336 | |
| parent | 0293439d285abd992d44d58b0c3473dc6e26ea0c (diff) | |
| download | serenity-4007f69976d9876362c0100f9ddf898698334286.zip | |
Ports: Update libicu's patches to use git patches
| -rw-r--r-- | Ports/libicu/patches/0001-Set-host-to-serenity-in-configure.patch | 25 | ||||
| -rw-r--r-- | Ports/libicu/patches/0002-Add-a-serenity-specific-makefile.patch (renamed from Ports/libicu/patches/icu.patch) | 33 | ||||
| -rw-r--r-- | Ports/libicu/patches/ReadMe.md | 12 |
3 files changed, 55 insertions, 15 deletions
diff --git a/Ports/libicu/patches/0001-Set-host-to-serenity-in-configure.patch b/Ports/libicu/patches/0001-Set-host-to-serenity-in-configure.patch new file mode 100644 index 0000000000..2a9f0cc087 --- /dev/null +++ b/Ports/libicu/patches/0001-Set-host-to-serenity-in-configure.patch @@ -0,0 +1,25 @@ +From 8ab9c30e87cc95f6ad201eaa396c0ea2c62f9a41 Mon Sep 17 00:00:00 2001 +From: Gunnar Beutner <gbeutner@serenityos.org> +Date: Mon, 16 May 2022 18:03:31 +0430 +Subject: [PATCH 1/2] Set host to serenity in configure + +--- + configure | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure b/configure +index a2ff7e4..8283dc9 100755 +--- a/configure ++++ b/configure +@@ -5274,6 +5274,8 @@ x86_64-*-cygwin) + else + icu_cv_host_frag=mh-cygwin-msvc + fi ;; ++*-serenity*) ++ icu_cv_host_frag=mh-serenity ;; + *-*-mingw*) + if test "$GCC" = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-- +2.36.1 + diff --git a/Ports/libicu/patches/icu.patch b/Ports/libicu/patches/0002-Add-a-serenity-specific-makefile.patch index 2375972ac9..418a410ac6 100644 --- a/Ports/libicu/patches/icu.patch +++ b/Ports/libicu/patches/0002-Add-a-serenity-specific-makefile.patch @@ -1,6 +1,18 @@ -diff -ur source/config/mh-serenity source.serenity/config/mh-serenity ---- source/config/mh-serenity 1970-01-01 01:00:00.000000000 +0100 -+++ source.serenity/config/mh-serenity 2021-04-11 09:20:23.857575570 +0200 +From 6ff2bd5db3af8d810810f9cd46897f9ab148fb0b Mon Sep 17 00:00:00 2001 +From: Ali Mohammad Pur <mpfard@serenityos.org> +Date: Mon, 16 May 2022 18:03:31 +0430 +Subject: [PATCH 2/2] Add a serenity-specific makefile + +--- + config/mh-serenity | 87 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 87 insertions(+) + create mode 100644 config/mh-serenity + +diff --git a/config/mh-serenity b/config/mh-serenity +new file mode 100644 +index 0000000..53d6780 +--- /dev/null ++++ b/config/mh-serenity @@ -0,0 +1,87 @@ +## -*-makefile-*- +## Copyright (C) 2016 and later: Unicode, Inc. and others. @@ -89,15 +101,6 @@ diff -ur source/config/mh-serenity source.serenity/config/mh-serenity + +## End Linux-specific setup + -diff -ur source/configure source.serenity/configure ---- source/configure 2021-04-08 02:10:27.000000000 +0200 -+++ source.serenity/configure 2021-04-11 09:24:04.971314734 +0200 -@@ -5274,6 +5274,8 @@ - else - icu_cv_host_frag=mh-cygwin-msvc - fi ;; -+*-serenity*) -+ icu_cv_host_frag=mh-serenity ;; - *-*-mingw*) - if test "$GCC" = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-- +2.36.1 + diff --git a/Ports/libicu/patches/ReadMe.md b/Ports/libicu/patches/ReadMe.md new file mode 100644 index 0000000000..e88cb76c38 --- /dev/null +++ b/Ports/libicu/patches/ReadMe.md @@ -0,0 +1,12 @@ +# Patches for libicu on SerenityOS + +## `0001-Set-host-to-serenity-in-configure.patch` + +Set host to serenity in configure + + +## `0002-Add-a-serenity-specific-makefile.patch` + +Add a serenity-specific makefile + + |