diff mbox series

[2/2] procps: Add patch to fix errors that prevent build with gettext-0.22

Message ID 20230731161551.3448505-2-adolf.belka@ipfire.org
State Staged
Commit 63fb1beb8148f6142236e4418bf0c38ddc809060
Headers
Series [1/2] gettext: Update to version 0.22 |

Commit Message

Adolf Belka July 31, 2023, 4:15 p.m. UTC 
  - Gettext earlier than 0.21 would still build when it found errors in language files etc.
   With gettext-0.22 if it finds any errors it now stops.
- There were two lines in the french po file in procps that had erros in them. procps have
   raised a commit to fix those. The patch included here carries out that commit.
- Update of rootfile not required.
- This patch will not be needed when the next update of procps occurs.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 lfs/procps                                    |  1 +
 ...ess_build_failures_with_gettext_0.22.patch | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch
diff mbox series

Patch

diff --git a/lfs/procps b/lfs/procps
index a8f1c2c82..7aa41909a 100644
--- a/lfs/procps
+++ b/lfs/procps
@@ -70,6 +70,7 @@  $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch
 	cd $(DIR_APP) && ./autogen.sh
 	cd $(DIR_APP) && ./configure \
 				--prefix=/usr \
diff --git a/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch b/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch
new file mode 100644
index 000000000..6552151f2
--- /dev/null
+++ b/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch
@@ -0,0 +1,20 @@ 
+--- procps-v4.0.3/po/fr.po.orig	2023-02-15 21:26:15.000000000 +0100
++++ procps-v4.0.3/po/fr.po	2023-07-28 19:45:59.065599580 +0200
+@@ -3800,7 +3800,7 @@
+ "Type 'q' or <Esc> to continue "
+ msgstr ""
+ "Aide pour les commandes interactives~2 - %s\n"
+-"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2.  ~1Système~6: ~1Délai ~3%.1lf "
++"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2.  ~1Système~6: ~1Délai ~3%.1f "
+ "secs~2; ~1Mode sûr ~3%s~2.\n"
+ "\n"
+ "  Z~5,~1B~5,E,e   Global: «~1Z~2» couleurs; «~1B~2» gras; «~1E~2»/«~1e~2» "
+@@ -4723,7 +4723,7 @@
+ #: src/watch.c:486
+ #, c-format
+ msgid "Every %.1fs: "
+-msgstr "Toutes les %.1lfs: "
++msgstr "Toutes les %.1fs: "
+ 
+ #: src/watch.c:487
+ #, c-format