diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index a6f9fec0f..59c90f869 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -31,7 +31,6 @@ #:use-module (gnu packages compression) #:use-module (gnu packages cups) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) @@ -52,7 +51,6 @@ #:use-module (gnu packages ninja) #:use-module (gnu packages node) #:use-module (gnu packages pciutils) - #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) @@ -63,7 +61,6 @@ #:use-module (gnu packages speech) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) - #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) @@ -150,19 +147,6 @@ %debian-revision "1qf2y7jmaya43k9rbsxjjpkp5manzmbkhjj5hvfyqcdylhy30swj")) -;; Some files were missing in the Chromium 66 release tarball. -;; See . -(define %chromium-add-blink-tools.patch - (origin - (method url-fetch) - (uri (string-append "https://bazaar.launchpad.net/~chromium-team" - "/chromium-browser/bionic-stable/download/head:" - "/addmissingblinktools-20180416203514-02f50sz15c2mn6ei-1" - "/add-missing-blink-tools.patch")) - (sha256 - (base32 - "1im2l1g6g9mangpfphbkg6zxyglbfwbkm5jxv122yxqgm6vxzz6s")))) - ;; Fix an assignment bug when using Clang and libstdc++. (define %chromium-clang-assignment.patch (gentoo-patch "chromium-clang-r4.patch" @@ -342,7 +326,7 @@ includes Clang, the Guix ld wrapper, glibc, a C++ library, and Binutils.") (define-public chromium (package (name "chromium") - (version "66.0.3359.117") + (version "66.0.3359.139") (synopsis "Graphical web browser") (source (origin (method url-fetch) @@ -351,14 +335,12 @@ includes Clang, the Guix ld wrapper, glibc, a C++ library, and Binutils.") version ".tar.xz")) (sha256 (base32 - "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp")) + "1ck4wbi28702p1lfs4sz894ysbgm7fj79wrqj8srsy65z2ssaxdy")) (patches (list %chromium-gn-libcxx.patch %chromium-disable-api-keys-warning.patch %chromium-system-nspr.patch %chromium-system-libevent.patch - %chromium-add-blink-tools.patch - %chromium-clang-assignment.patch %chromium-ffmpeg.patch @@ -385,14 +367,13 @@ includes Clang, the Guix ld wrapper, glibc, a C++ library, and Binutils.") "base/third_party/dmg_fp" "base/third_party/dynamic_annotations" "base/third_party/icu" - "base/third_party/libevent" - "base/third_party/nspr" "base/third_party/superfasthash" - "base/third_party/symbolize" ;glog + "base/third_party/symbolize" "base/third_party/xdg_mime" "base/third_party/xdg_user_dirs" "chrome/third_party/mozilla_security_manager" - "courgette/third_party" + "courgette/third_party/bsdiff" + "courgette/third_party/divsufsort" "net/third_party/mozilla_security_manager" "net/third_party/nss" "third_party/adobe/flash/flapper_version.h" @@ -439,7 +420,6 @@ includes Clang, the Guix ld wrapper, glibc, a C++ library, and Binutils.") (string-append "third_party/google_input_tools/third_party" "/closure_library/third_party/closure") "third_party/googletest" - "third_party/harfbuzz-ng" "third_party/hunspell" "third_party/iccjpeg" "third_party/inspector_protocol" @@ -472,7 +452,11 @@ includes Clang, the Guix ld wrapper, glibc, a C++ library, and Binutils.") "third_party/ots" ;; TODO: Build as extension. "third_party/pdfium" - "third_party/pdfium/third_party" + "third_party/pdfium/third_party/agg23" + "third_party/pdfium/third_party/base" + "third_party/pdfium/third_party/bigint" + "third_party/pdfium/third_party/libopenjpeg20" + "third_party/pdfium/third_party/skia_shared" (string-append "third_party/pdfium/third_party/freetype" "/include/pstables.h") "third_party/ply" @@ -488,7 +472,8 @@ includes Clang, the Guix ld wrapper, glibc, a C++ library, and Binutils.") "third_party/speech-dispatcher" "third_party/sqlite" "third_party/swiftshader" - "third_party/swiftshader/third_party" + "third_party/swiftshader/third_party/llvm-subzero" + "third_party/swiftshader/third_party/subzero" "third_party/s2cellid" "third_party/usb_ids" "third_party/usrsctp" @@ -864,7 +849,6 @@ includes Clang, the Guix ld wrapper, glibc, a C++ library, and Binutils.") (native-inputs `(("bison" ,bison) ("clang-toolchain" ,chromium-clang-toolchain) - ("git" ,git) ;last_commit_position.py ("gperf" ,gperf) ("ninja" ,ninja) ("node" ,node) @@ -889,7 +873,6 @@ includes Clang, the Guix ld wrapper, glibc, a C++ library, and Binutils.") ("freetype" ,freetype) ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) - ("gtk+-2" ,gtk+-2) ("gtk+" ,gtk+) ("harfbuzz" ,harfbuzz) ("icu4c" ,icu4c) @@ -899,6 +882,7 @@ includes Clang, the Guix ld wrapper, glibc, a C++ library, and Binutils.") ("libffi" ,libffi) ("libjpeg-turbo" ,libjpeg-turbo) ("libpng" ,libpng) + ;;("libsecret" ,libsecret) ("libusb" ,libusb) ("libvpx" ,libvpx+experimental) ("libwebp" ,libwebp) @@ -931,7 +915,7 @@ includes Clang, the Guix ld wrapper, glibc, a C++ library, and Binutils.") ("re2" ,re2) ("snappy" ,snappy) ("speech-dispatcher" ,speech-dispatcher) - ("sqlite" ,sqlite) + ;;("sqlite" ,sqlite) ("udev" ,eudev) ("valgrind" ,valgrind))) (home-page "https://www.chromium.org/")