gnu: gettext-minimal: Fix build with new libunistring.
* gnu/packages/gettext.scm (gettext-minimal)[source]: Add patch. * gnu/packages/patches/gettext-libunicode-update.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it.
This commit is contained in:
Efraim Flashner
parent
a81ac55a68
commit
039f364bb8
@ -10,7 +10,7 @@
|
||||
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
|
||||
# Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
|
||||
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
|
||||
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
# Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
|
||||
@ -1137,6 +1137,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/geeqie-clutter.patch \
|
||||
%D%/packages/patches/genimage-mke2fs-test.patch \
|
||||
%D%/packages/patches/geoclue-config.patch \
|
||||
%D%/packages/patches/gettext-libunicode-update.patch \
|
||||
%D%/packages/patches/ghc-4.patch \
|
||||
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
|
||||
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2019, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
@ -60,7 +60,8 @@
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7"))))
|
||||
"04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7"))
|
||||
(patches (search-patches "gettext-libunicode-update.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ;9 MiB of HTML
|
||||
|
||||
99
gnu/packages/patches/gettext-libunicode-update.patch
Normal file
99
gnu/packages/patches/gettext-libunicode-update.patch
Normal file
@ -0,0 +1,99 @@
|
||||
https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=56dc658db752c2894861ee574866d507f12a17f8
|
||||
Due to the encoding it needs to be retrieved from a git clone.
|
||||
|
||||
commit 56dc658db752c2894861ee574866d507f12a17f8
|
||||
Author: Bruno Haible <bruno@clisp.org>
|
||||
Date: Sun Jan 2 15:43:41 2022 +0100
|
||||
|
||||
Update after gnulib changed.
|
||||
|
||||
* gettext-tools/tests/msgcat-17: Update test for changed libunistring line
|
||||
breaking behaviour.
|
||||
* gettext-tools/tests/msgfilter-sr-latin-1: Likewise.
|
||||
* gettext-tools/tests/msgmerge-11: Likewise.
|
||||
* gettext-tools/tests/xgettext-python-1: Likewise.
|
||||
|
||||
diff --git a/gettext-tools/tests/msgcat-17 b/gettext-tools/tests/msgcat-17
|
||||
index 8fecc4039..c4aa220b9 100755
|
||||
--- a/gettext-tools/tests/msgcat-17
|
||||
+++ b/gettext-tools/tests/msgcat-17
|
||||
@@ -39,9 +39,9 @@ msgstr ""
|
||||
#, c-format
|
||||
msgid "write error of a big result on a too small disk% s% s"
|
||||
msgstr ""
|
||||
-"Fehler beim Schreiben eines großen Ergebnisses auf eine zu kleine Platte% s"
|
||||
-"% smit der jederzeitigen Möglichkeit eines Fehlers in jedem Moment und an "
|
||||
-"jeder Stelle"
|
||||
+"Fehler beim Schreiben eines großen Ergebnisses auf eine zu kleine "
|
||||
+"Platte% s% smit der jederzeitigen Möglichkeit eines Fehlers in jedem Moment "
|
||||
+"und an jeder Stelle"
|
||||
EOF
|
||||
|
||||
: ${DIFF=diff}
|
||||
diff --git a/gettext-tools/tests/msgfilter-sr-latin-1 b/gettext-tools/tests/msgfilter-sr-latin-1
|
||||
index c1cc97875..29e68c04f 100755
|
||||
--- a/gettext-tools/tests/msgfilter-sr-latin-1
|
||||
+++ b/gettext-tools/tests/msgfilter-sr-latin-1
|
||||
@@ -20,8 +20,8 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=CP1251\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n"
|
||||
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && "
|
||||
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
|
||||
#: ../gettext-tools/lib/closeout.c:64
|
||||
msgid "write error"
|
||||
@@ -332,8 +332,8 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n"
|
||||
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && "
|
||||
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||
|
||||
#: ../gettext-tools/lib/closeout.c:64
|
||||
msgid "write error"
|
||||
diff --git a/gettext-tools/tests/msgmerge-11 b/gettext-tools/tests/msgmerge-11
|
||||
index ed49db95a..888855940 100755
|
||||
--- a/gettext-tools/tests/msgmerge-11
|
||||
+++ b/gettext-tools/tests/msgmerge-11
|
||||
@@ -19,8 +19,8 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=ISO-8859-1\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
|
||||
-"%100==4 ? 2 : 3);\n"
|
||||
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
|
||||
+"n%100==4 ? 2 : 3);\n"
|
||||
|
||||
#:foobar.c:29
|
||||
#, c-format
|
||||
@@ -72,8 +72,8 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=ISO-8859-1\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
|
||||
-"%100==4 ? 2 : 3);\n"
|
||||
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
|
||||
+"n%100==4 ? 2 : 3);\n"
|
||||
|
||||
#: foobar.c:32
|
||||
#, fuzzy, c-format
|
||||
diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1
|
||||
index 4901c71e3..9695abda4 100755
|
||||
--- a/gettext-tools/tests/xgettext-python-1
|
||||
+++ b/gettext-tools/tests/xgettext-python-1
|
||||
@@ -61,8 +61,8 @@ msgstr ""
|
||||
#. interpret_ansic = false, interpret_unicode = false
|
||||
msgid ""
|
||||
"abc\\\n"
|
||||
-"\\\\def\\'ghi\\\"jkl\\a\\b\\f\\n\\r\\t\\v x\\040x\\x7ey"
|
||||
-"\\u0142\\U00010123\\N{LATIN SMALL LETTER Z}"
|
||||
+"\\\\def\\'ghi\\\"jkl\\a\\b\\f\\n\\r\\t\\v "
|
||||
+"x\\040x\\x7ey\\u0142\\U00010123\\N{LATIN SMALL LETTER Z}"
|
||||
msgstr ""
|
||||
|
||||
#. interpret_ansic = true, interpret_unicode = true
|
||||
Loading…
Reference in New Issue
Block a user