diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-07-27 16:36:27 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-30 09:16:53 +0100 |
commit | 0b3ba1e2d9d0c6437de6ff094ae39d11e75d21da (patch) | |
tree | 67853eef5c46e37e7d56276cdfc00102ff66d3f0 /meta | |
parent | a2f1791f8d0118f44cf752341c4793d656a54a94 (diff) | |
download | poky-0b3ba1e2d9d0c6437de6ff094ae39d11e75d21da.tar.gz |
procps: address failure with gettext 0.22
(From OE-Core rev: 046458f00108385eeae9f71f7350dc1693f64081)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch | 37 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps_4.0.3.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch b/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch new file mode 100644 index 0000000000..805517900d --- /dev/null +++ b/meta/recipes-extended/procps/procps/0001-po-fr.po-address-failures-with-gettext-0.22.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 1d685477c254e5b10a81e32c87786e0f001b70f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 24 Jul 2023 18:06:51 +0200 | ||
4 | Subject: [PATCH] po/fr.po: address failures with gettext 0.22 | ||
5 | |||
6 | Specifically: | ||
7 | | fr.1po:3027: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 4, the argument size specifier is invalid. | ||
8 | | fr.1po:3820: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the directive number 1, the argument size specifier is invalid. | ||
9 | |||
10 | Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/199] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | --- | ||
13 | po/fr.po | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/po/fr.po b/po/fr.po | ||
17 | index 715c2b69..700834e1 100644 | ||
18 | --- a/po/fr.po | ||
19 | +++ b/po/fr.po | ||
20 | @@ -3800,7 +3800,7 @@ msgid "" | ||
21 | "Type 'q' or <Esc> to continue " | ||
22 | msgstr "" | ||
23 | "Aide pour les commandes interactives~2 - %s\n" | ||
24 | -"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2. ~1Système~6: ~1Délai ~3%.1lf " | ||
25 | +"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2. ~1Système~6: ~1Délai ~3%.1f " | ||
26 | "secs~2; ~1Mode sûr ~3%s~2.\n" | ||
27 | "\n" | ||
28 | " Z~5,~1B~5,E,e Global: «~1Z~2» couleurs; «~1B~2» gras; «~1E~2»/«~1e~2» " | ||
29 | @@ -4723,7 +4723,7 @@ msgstr " -v, --version affiche les informations de version et sort\n" | ||
30 | #: src/watch.c:486 | ||
31 | #, c-format | ||
32 | msgid "Every %.1fs: " | ||
33 | -msgstr "Toutes les %.1lfs: " | ||
34 | +msgstr "Toutes les %.1fs: " | ||
35 | |||
36 | #: src/watch.c:487 | ||
37 | #, c-format | ||
diff --git a/meta/recipes-extended/procps/procps_4.0.3.bb b/meta/recipes-extended/procps/procps_4.0.3.bb index dc0e957bda..71efb80207 100644 --- a/meta/recipes-extended/procps/procps_4.0.3.bb +++ b/meta/recipes-extended/procps/procps_4.0.3.bb | |||
@@ -15,6 +15,7 @@ inherit autotools gettext pkgconfig update-alternatives | |||
15 | SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ | 15 | SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ |
16 | file://sysctl.conf \ | 16 | file://sysctl.conf \ |
17 | file://0001-src-w.c-use-utmp.h-only.patch \ | 17 | file://0001-src-w.c-use-utmp.h-only.patch \ |
18 | file://0001-po-fr.po-address-failures-with-gettext-0.22.patch \ | ||
18 | " | 19 | " |
19 | SRCREV = "806eb270f217ff7e1e745c7bda2b002b5be74be4" | 20 | SRCREV = "806eb270f217ff7e1e745c7bda2b002b5be74be4" |
20 | 21 | ||