amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make-glibc-locales: Adjust patch for glibc 2.29.

Browse source 
The patch for glibc 2.28 and earlier replaces the same content, but the context
in the patch is different enough to fail to merge.

* gnu/packages/base.scm (make-glibc-locales)[source]: Add patch.
* gnu/packages/patches/glibc-locales.patch: Adjust for glibc 2.29 and move old
file...
* gnu/packages/patches/glibc-locales-2.28.patch: ...here.
* gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
Kei Kebreau 2019-07-04 06:49:29 -04:00
parent ca3757e1c2
commit d4137d84ac
No known key found for this signature in database
GPG key ID: E6A5EE3C19467A0D
4 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/base.scm
View file

@ -999,7 +999,14 @@ with the Linux kernel.")
(inherit glibc)
(name "glibc-locales")
(source (origin (inherit (package-source glibc))
(patches (cons (search-patch "glibc-locales.patch")
;; The patch for glibc 2.28 and earlier replaces the same
;; content, but the context in the patch is different
;; enough to fail to merge.
(patches (cons (search-patch
(if (version>=? (package-version glibc)
"2.29")
"glibc-locales.patch"
"glibc-locales-2.28.patch"))
(origin-patches (package-source glibc))))))
(synopsis "All the locales supported by the GNU C Library")
(description