From a343d6bab710eefaa714251a81c9a42002302967 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 5 Mar 2020 18:16:43 +0100
Subject: gnu: Remove ld-wrapper-next.

* gnu/packages/ld-wrapper-next.in: Delete file.
* gnu/local.mk (MISC_DISTRO_FILES): Adjust accordingly.
* gnu/packages/chromium.scm (ld-wrapper-next): Remove variable.
(ungoogled-chromium)[native-inputs]: Remove LD-WRAPPER-NEXT.
---
 gnu/packages/chromium.scm | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'gnu/packages/chromium.scm')

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 0b3d19a428..275eb0588b 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -427,18 +427,6 @@ from forcing GEXP-PROMISE."
         `(cons "--enable-custom-modes"
                ,flags))))))
 
-;; Add a custom ld wrapper that supports quoted strings in response files.
-;; To be merged with 'ld-wrapper' in a future rebuild cycle.
-(define-public ld-wrapper-next
-  (let ((orig (car (assoc-ref (%final-inputs) "ld-wrapper"))))
-    (package
-      (inherit orig)
-      (name "ld-wrapper-next")
-      (inputs
-       `(("wrapper" ,(search-path %load-path
-                                  "gnu/packages/ld-wrapper-next.in"))
-         ,@(alist-delete "wrapper" (package-inputs orig)))))))
-
 (define-public ungoogled-chromium
   (package
     (name "ungoogled-chromium")
@@ -766,7 +754,6 @@ from forcing GEXP-PROMISE."
        ("clang" ,clang-9)
        ("gn" ,gn)
        ("gperf" ,gperf)
-       ("ld-wrapper" ,ld-wrapper-next)
        ("ninja" ,ninja)
        ("node" ,node)
        ("pkg-config" ,pkg-config)
-- 
cgit 1.4.1


From 87bb750a7e8dd1f6cd21033b0cd47d77adfd83fe Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 13 Apr 2020 20:30:31 +0200
Subject: gnu: icu4c: Remove redundant icu4c-66.1 variable.

* gnu/packages/icu4c.scm (icu4c-66.1): Remove variable.
* gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change from
ICU4C-66.1 to ICU4C.
---
 gnu/packages/chromium.scm |  2 +-
 gnu/packages/icu4c.scm    | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

(limited to 'gnu/packages/chromium.scm')

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 3625eb7964..d92d463e03 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -786,7 +786,7 @@ from forcing GEXP-PROMISE."
        ("glib" ,glib)
        ("gtk+" ,gtk+)
        ("harfbuzz" ,harfbuzz)
-       ("icu4c" ,icu4c-66.1)
+       ("icu4c" ,icu4c)
        ("jsoncpp" ,jsoncpp)
        ("lcms" ,lcms)
        ("libevent" ,libevent)
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index d8a898263a..cf76c6fe20 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -114,24 +114,6 @@ C/C++ part.")
                  #t)))))))
     (native-inputs '())))
 
-(define-public icu4c-66.1
-  (package
-    (inherit icu4c)
-    (version "66.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/unicode-org/icu/releases/download/release-"
-                    (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
-                    "/icu4c-"
-                    (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
-                    "-src.tgz"))
-              (patch-flags '("-p2"))
-              (patches (search-patches "icu4c-CVE-2020-10531.patch"))
-              (sha256
-               (base32
-                "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj"))))))
-
 (define-public java-icu4j
   (package
     (name "java-icu4j")
-- 
cgit 1.4.1