mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 14:56:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gettext: Update to 0.23.

Browse source 
* gnu/packages/patches/gettext-libunicode-update.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister.
* gnu/packages/gettext.scm (gettext-minimal): Update to 0.23.
[source]: Remove patch.
[arguments]: In phase "patch-tests", skip gnulib test "test-execute.sh".

Change-Id: Ibac01c139e135c3a9c13f9077b4fbc6a7db93207
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-05 08:30:11 +01:00
parent 3373444e99
commit 44e7bfee39
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 8 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1404,7 +1404,6 @@ dist_patch_DATA = \
%D%/packages/patches/gemrb-add-path-suffixes-for-vlc-headers.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-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-9.2-cabal-support-package-path.patch \
%D%/packages/patches/ghc-9-StgCRunAsm-only-when-needed.patch \

19
gnu/packages/gettext.scm
View file

@ -55,15 +55,14 @@ (define-module (gnu packages gettext)
(define-public gettext-minimal
(package
(name "gettext-minimal")
(version "0.21")
(version "0.23")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gettext/gettext-"
version ".tar.gz"))
(sha256
(base32
"04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7"))
(patches (search-patches "gettext-libunicode-update.patch"))))
"19h717qnmg01499gi3494z9l2ss12cp60405ml473p82580dfpcl"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;9 MiB of HTML
@ -89,13 +88,13 @@ (define-public gettext-minimal
(substitute* '("gettext-tools/src/project-id"
"gettext-tools/projects/KDE/trigger"
"gettext-tools/projects/GNOME/trigger")
(("/bin/pwd") "pwd"))
#t))
(("/bin/pwd") "pwd"))))
(add-before 'check 'patch-tests
(lambda* (#:key inputs #:allow-other-keys)
;; This test fails
(substitute* "gettext-tools/tests/xgettext-javascript-6"
(("^#!.*" all) (string-append all "exit 77;\n")))
;;libgettextlib-0.23.so => not found
(substitute* "gettext-tools/gnulib-tests/test-execute.sh"
(("^#!.*" all)
(string-append all "exit 77;\n")))
(let* ((bash (which "sh")))
;; Some of the files we're patching are
;; ISO-8859-1-encoded, so choose it as the default
@ -131,9 +130,7 @@ (define-public gettext-minimal
"gettext-tools/gnulib-tests/Makefile.in"
;; See 'coreutils' for the rationale.
((" test-tls\\$\\(EXEEXT\\) ") " ")))
'())
#t))))
'())))))
#$@(if (%current-target-system)
#~((add-after 'install 'patch-cross-shebangs
(lambda _

99
gnu/packages/patches/gettext-libunicode-update.patch
View file

@ -1,99 +0,0 @@
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