aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-06-30 12:37:25 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-06-30 14:11:00 +0200
commitff68ddb032774c65279372c6d4bfab5d8825977e (patch)
treed6819afdfc94b9f14d23f40b2bc3b99c930fbc0c
parent8e92d5465fc154fed5d06f7e4a64d7dcccded74d (diff)
downloadpatches-ff68ddb032774c65279372c6d4bfab5d8825977e.tar
patches-ff68ddb032774c65279372c6d4bfab5d8825977e.tar.gz
gnu: ungoogled-chromium: Build against ICU 64.
* gnu/packages/icu4c.scm (icu4c-64): New public variable. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change ICU4C to ICU4C-64.
-rw-r--r--gnu/packages/chromium.scm6
-rw-r--r--gnu/packages/icu4c.scm18
2 files changed, 23 insertions, 1 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index e357556956..79828ef589 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -714,7 +714,11 @@ from forcing GEXP-PROMISE."
("glib" ,glib)
("gtk+" ,gtk+)
("harfbuzz" ,harfbuzz)
- ("icu4c" ,icu4c)
+
+ ;; Build against ICU 64 to prevent a localization problem in version 75
+ ;; and later: <https://github.com/Eloston/ungoogled-chromium/issues/778>.
+ ("icu4c" ,icu4c-64)
+
("jsoncpp" ,jsoncpp)
("lcms" ,lcms)
("libevent" ,libevent)
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 6e93d6aed9..512967a305 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,6 +24,7 @@
(define-module (gnu packages icu4c)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages python)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
@@ -81,6 +83,22 @@ C/C++ part.")
(license x11)
(home-page "http://site.icu-project.org/")))
+(define-public icu4c-64
+ (package
+ (inherit icu4c)
+ (version "64.2")
+ (source (origin
+ (inherit (package-source icu4c))
+ (uri (string-append
+ "http://download.icu-project.org/files/icu4c/" version "/icu4c-"
+ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
+ "-src.tgz"))
+ (sha256
+ (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2"))))
+ (native-inputs
+ `(;; For tests.
+ ("python" ,python)))))
+
(define-public java-icu4j
(package
(name "java-icu4j")