From a065c6e0fd0612ebdd27b4701117a5940f53efe6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 28 Sep 2022 01:58:00 +0200 Subject: gnu: ungoogled-chromium: Update to 106.0.5249.61-1. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for M106. (%chromium-version): Set to 106.0.5249.61. (%arch-revision): New variable. (%ungoogled-origin): Update hash. (%chromium-gcc-patchset): Update to chromium-106-patchset-3. (%gcc-patches): Adjust accordingly. (arch-patch): New procedure. (%ungoogled-chromium-unroll-ffmpeg.patch): Remove variable. (%reverse-patches): New variable. (ungoogled-chromium-snippet): Apply %REVERSE-PATCHES instead of just the one. (ungoogled-chromium): Update hash. [arguments]: Adjust compiler flags and header inclusions. --- gnu/packages/chromium.scm | 62 ++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 27 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 77c51a00c6..f730d69da5 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -100,6 +100,7 @@ (define %preserved-third-party-files "third_party/angle/src/third_party/volk" ;Expat "third_party/apple_apsl" ;APSL2.0 "third_party/axe-core" ;MPL2.0 + "third_party/bidimapper" ;ASL2.0 "third_party/blink" ;BSD-3, LGPL2+ "third_party/boringssl" ;OpenSSL/ISC (Google additions are ISC) "third_party/boringssl/src/third_party/fiat" ;Expat @@ -173,6 +174,7 @@ (define %preserved-third-party-files "third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+ "third_party/iccjpeg" ;IJG "third_party/inspector_protocol" ;BSD-3 + "third_party/ipcz" ;BSD-3 "third_party/jinja2" ;BSD-3 "third_party/jstemplate" ;ASL2.0 "third_party/khronos" ;Expat, SGI @@ -317,9 +319,10 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "105.0.5195.125") +(define %chromium-version "106.0.5249.61") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") +(define %arch-revision "6afedb08139b97089ce8ef720ece5cd14c83948c") (define %ungoogled-origin (origin @@ -329,7 +332,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "0k16wma9lj9q34xgz377nasnfzcw7wi73l91r41yilvgb3l2fgw8")))) + "0mz3f4f2q72zl6m9vxxx084z0a1kfmsqf7fcir5bka85ap2klpjl")))) (define %debian-origin (origin @@ -345,7 +348,7 @@ (define %debian-origin "1ln6r1qzlr7dsgvcbssvvc34my4mpkwv9hmvlb2dhjncs7isp65j")))) (define %chromium-gcc-patchset - (let ((commit "chromium-105-patchset-1")) + (let ((commit "chromium-106-patchset-3")) (origin (method git-fetch) (uri (git-reference @@ -355,7 +358,7 @@ (define %chromium-gcc-patchset (string-drop commit 9))) (sha256 (base32 - "08c3pbdqjdqi7rmyqkkh6q429611ikakf4gkzwg1gr07vyknwkfa"))))) + "109garl1z19zgn3sgg1y2339aa229kfpmlb238cp6kbd7gv8j43x"))))) (define (origin-file origin file) (computed-file @@ -377,23 +380,27 @@ (define (gcc-patch name) (define %gcc-patches (map gcc-patch - '("chromium-105-AdjustMaskLayerGeometry-ceilf.patch" - "chromium-105-Bitmap-include.patch" - "chromium-105-browser_finder-include.patch" - "chromium-105-raw_ptr-noexcept.patch" - "chromium-105-Trap-raw_ptr.patch"))) - -;; Take a patch from Arch that reverts a change which requires an unreleased -;; version of ffmpeg. -(define %ungoogled-chromium-unroll-ffmpeg.patch + '("chromium-106-AutofillPopupControllerImpl-namespace.patch" + "chromium-106-LinuxInputMethodContext-include.patch" + "chromium-106-ReverseBeaconTimeoutSorter-constexpr.patch"))) + +(define (arch-patch revision name hash) (origin (method url-fetch) - (uri "https://raw.githubusercontent.com/archlinux/svntogit-packages\ -/f3225f99b900e11ac900725992ea883142d7309c/trunk/roll-src-third_party-ffmpeg.patch") - (file-name "ungoogled-chromium-unroll-ffmpeg.patch") - (sha256 - (base32 - "0i7crn6fcwq09kd6a4smqnffaldyv61lmv2p0drcnpfrwalmkprh")))) + (uri (string-append "https://raw.githubusercontent.com/archlinux" + "/svntogit-packages/" revision "/trunk/" name)) + (sha256 (base32 hash)))) + +(define %reverse-patches + (list + ;; These patches revert changes that require an unreleased ffmpeg. + (arch-patch %arch-revision "REVERT-roll-src-third_party-ffmpeg-m102.patch" + "0i7crn6fcwq09kd6a4smqnffaldyv61lmv2p0drcnpfrwalmkprh") + (arch-patch %arch-revision "REVERT-roll-src-third_party-ffmpeg-m106.patch" + "0li10cvxnppmmmsc7w77b1s7z02s5bzd39zsal9x768708fx64jc") + ;; Fix crash when using Global Media Controls. + (arch-patch %arch-revision "REVERT-enable-GlobalMediaControlsCastStartStop.patch" + "1ilsw421lylkjnq3lvc607bdx7cvwlish8qzgwx9s84l4hzv37vp"))) (define %guix-patches (list (local-file @@ -436,8 +443,11 @@ (define ungoogled-chromium-snippet (append '#+%debian-patches '#+%guix-patches '#+%gcc-patches)) - (invoke "patch" "-Rp1" "--force" "--input" "--no-backup-if-mismatch" - "--input" #$%ungoogled-chromium-unroll-ffmpeg.patch) + ;; These patches are "reversed", i.e. their changes should be undone. + (for-each (lambda (patch) + (invoke "patch" "-Rp1" "-F3" "--force" "--input" + patch "--no-backup-if-mismatch")) + '#+%reverse-patches) (with-directory-excursion #+%ungoogled-origin (format #t "Ungooglifying...~%") @@ -506,7 +516,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "0rhay46fnfffqcpk6c856hj414508fmhda600lz5whcacr25q6r0")) + "15qljfg8w124yp65srp1rz3ywrlqhzqzkhimn1h9xz0jkf9cnypj")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -624,10 +634,10 @@ (define-public ungoogled-chromium ;; This include path is added by Debians openjpeg patch. (("/usr/include/openjpeg-2.4") openjpeg)) - ;; Remove contrib/ prefix from minizip header inclusions. + ;; Adjust minizip header inclusions. (substitute* (find-files "third_party/tflite_support\ /src/tensorflow_lite_support/metadata/cc") - (("contrib/minizip/") + (("third_party/zlib/minizip/") "minizip/")) (substitute* @@ -762,11 +772,9 @@ (define-public ungoogled-chromium ;; Disable compiler flags that require Clang 15. (substitute* "build/config/compiler/BUILD.gn" - (("\"-no-opaque-pointers\",") - "") (("\"-Wno-unqualified-std-cast-call\"") "") - (("\"-Wno-deprecated-non-prototype\"") + (("\"-Wno-deprecated-builtins\",") "")) ;; TODO: pre-compile instead. Avoids a race condition. -- cgit v1.2.3 From 78176e3a8196fc8e3841b67a5d60915af9b97bc3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Oct 2022 17:46:34 +0200 Subject: gnu: ungoogled-chromium: Update to 106.0.5249.91-1. * gnu/packages/chromium.scm (%chromium-version): Set to 106.0.5249.91. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index f730d69da5..0559f60c5f 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -319,7 +319,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "106.0.5249.61") +(define %chromium-version "106.0.5249.91") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "6afedb08139b97089ce8ef720ece5cd14c83948c") @@ -332,7 +332,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "0mz3f4f2q72zl6m9vxxx084z0a1kfmsqf7fcir5bka85ap2klpjl")))) + "1cih72ay2gr9xjwwa8iw0wmpmfs4xm4200c4z04v7vi9sxadxnrd")))) (define %debian-origin (origin @@ -516,7 +516,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "15qljfg8w124yp65srp1rz3ywrlqhzqzkhimn1h9xz0jkf9cnypj")) + "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From 2d2afb4cf300797b44184c00ff4ddebea47a00af Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Oct 2022 10:46:15 +0200 Subject: gnu: ungoogled-chromium: Update to 106.0.5249.103-1. * gnu/packages/chromium.scm (%chromium-version): Set to 106.0.5249.103. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 0559f60c5f..c847e4cac2 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -319,7 +319,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "106.0.5249.91") +(define %chromium-version "106.0.5249.103") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "6afedb08139b97089ce8ef720ece5cd14c83948c") @@ -332,7 +332,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "1cih72ay2gr9xjwwa8iw0wmpmfs4xm4200c4z04v7vi9sxadxnrd")))) + "00acfq9hsdjqqlxddr9lr45l4372mpqxj717qpf78z8iyrccjm23")))) (define %debian-origin (origin @@ -516,7 +516,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p")) + "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From b3fbd25fecae948d6328b7561e0c4af6a42838e5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Oct 2022 22:25:12 +0200 Subject: gnu: ungoogled-chromium: Update to 106.0.5249.119-1. * gnu/packages/chromium.scm (%chromium-version): Set to 106.0.5249.119. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index c847e4cac2..17719fd844 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -319,7 +319,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "106.0.5249.103") +(define %chromium-version "106.0.5249.119") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "6afedb08139b97089ce8ef720ece5cd14c83948c") @@ -332,7 +332,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "00acfq9hsdjqqlxddr9lr45l4372mpqxj717qpf78z8iyrccjm23")))) + "0mgyakq0g3v24b1qn76zblhjf9zzbiv1fq95w7w42nv3fvxfrxr2")))) (define %debian-origin (origin @@ -516,7 +516,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2")) + "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From d9686315bd372034ddec95b0c9847dbb59911123 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 26 Oct 2022 21:27:26 +0200 Subject: gnu: ungoogled-chromium: Update to 107.0.5304.68-1. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for M107. (%chromium-version): Set to 107.0.5304.68. (%ungoogled-origin): Update hash. (%chromium-gcc-patchset, gcc-patch): Remove. (%gcc-patches): Empty list. (ungoogled-chromium)[source]: Update hash. [arguments]: Add clang_base_path and use_system_libwayland_server to #:configure-flags. Adjust substitutions. [inputs]: Add QTBASE-5. --- gnu/packages/chromium.scm | 47 ++++++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 29 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 17719fd844..7351fb208f 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -61,6 +61,7 @@ (define-module (gnu packages chromium) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages regex) #:use-module (gnu packages serialization) #:use-module (gnu packages speech) @@ -136,7 +137,6 @@ (define %preserved-third-party-files ;; TODO: can likely be unbundled when Vulkan is updated. "third_party/dawn/third_party/khronos" ;ASL2.0 "third_party/dawn/third_party/gn/webgpu-cts" ;BSD-3 - "third_party/depot_tools/owners.py" ;BSD-3 "third_party/devtools-frontend" ;BSD-3 "third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat "third_party/devtools-frontend/src/front_end/third_party\ @@ -216,7 +216,7 @@ (define %preserved-third-party-files "third_party/nasm" ;BSD-2 "third_party/nearby" ;ASL2.0 "third_party/node" ;Expat - "third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2" ;BSD-2 + "third_party/omnibox_proto" ;BSD-3 "third_party/one_euro_filter" ;BSD-3 "third_party/openscreen" ;BSD-3 "third_party/openscreen/src/third_party/tinycbor" ;Expat @@ -247,8 +247,6 @@ (define %preserved-third-party-files "third_party/securemessage" ;ASL2.0 "third_party/shell-encryption" ;ASL2.0 "third_party/skia" ;BSD-3 - "third_party/skia/include/third_party/skcms" ;BSD-3 - "third_party/skia/third_party/skcms" ;BSD-3 "third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat "third_party/smhasher" ;Expat, public domain @@ -319,7 +317,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "106.0.5249.119") +(define %chromium-version "107.0.5304.68") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "6afedb08139b97089ce8ef720ece5cd14c83948c") @@ -332,7 +330,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "0mgyakq0g3v24b1qn76zblhjf9zzbiv1fq95w7w42nv3fvxfrxr2")))) + "0rjdi2lr71xjjf4x27183ys87fc95m85yp5x3kk6i39ppksvsj6b")))) (define %debian-origin (origin @@ -347,19 +345,6 @@ (define %debian-origin (base32 "1ln6r1qzlr7dsgvcbssvvc34my4mpkwv9hmvlb2dhjncs7isp65j")))) -(define %chromium-gcc-patchset - (let ((commit "chromium-106-patchset-3")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stha09/chromium-patches") - (commit commit))) - (file-name (git-file-name "chromium-gcc-patches" - (string-drop commit 9))) - (sha256 - (base32 - "109garl1z19zgn3sgg1y2339aa229kfpmlb238cp6kbd7gv8j43x"))))) - (define (origin-file origin file) (computed-file (basename file) @@ -375,14 +360,8 @@ (define %debian-patches "system/zlib.patch" "system/openjpeg.patch"))) -(define (gcc-patch name) - (origin-file %chromium-gcc-patchset name)) - (define %gcc-patches - (map gcc-patch - '("chromium-106-AutofillPopupControllerImpl-namespace.patch" - "chromium-106-LinuxInputMethodContext-include.patch" - "chromium-106-ReverseBeaconTimeoutSorter-constexpr.patch"))) + '()) (define (arch-patch revision name hash) (origin @@ -516,7 +495,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g")) + "0k5qrmby1k2gw3lj96x3qag20kka61my578pv0zyrqqj5sdz3i5a")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -569,6 +548,11 @@ (define-public ungoogled-chromium "custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" "host_toolchain=\"//build/toolchain/linux/unbundle:default\"" + (string-append "clang_base_path=\"" + (dirname (dirname (search-input-file %build-inputs + "/bin/clang"))) + "\"") + ;; Prefer system libraries. "use_system_freetype=true" "use_system_harfbuzz=true" @@ -577,6 +561,7 @@ (define-public ungoogled-chromium "use_system_libjpeg=true" "use_system_libopenjpeg2=true" "use_system_libpng=true" + "use_system_libwayland_server=true" "use_system_wayland_scanner=true" (string-append "system_wayland_scanner_path=\"" (search-input-file %build-inputs @@ -637,7 +622,10 @@ (define-public ungoogled-chromium ;; Adjust minizip header inclusions. (substitute* (find-files "third_party/tflite_support\ /src/tensorflow_lite_support/metadata/cc") - (("third_party/zlib/minizip/") + (("#include \"contrib/minizip/ioapi\\.h\"") + ;; This one can be removed for M108 or so. + "#include \"minizip/ioapi.h\"") + (("third_party/zlib/contrib/minizip/") "minizip/")) (substitute* @@ -695,7 +683,7 @@ (define-public ungoogled-chromium "gpu/config/gpu_util.cc") (("third_party/vulkan_headers/include/") "")) - (substitute* "third_party/skia/include/gpu/vk/GrVkVulkan.h" + (substitute* "third_party/skia/include/private/gpu/vk/SkiaVulkan.h" (("include/third_party/vulkan/") ""))))) (add-after 'patch-stuff 'add-absolute-references (lambda* (#:key inputs #:allow-other-keys) @@ -965,6 +953,7 @@ (define-public ungoogled-chromium pciutils pipewire-0.3 pulseaudio + qtbase-5 re2 snappy speech-dispatcher -- cgit v1.2.3 From c552a7e7372f256196a7a982fed8fba6e81c11d4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 3 Nov 2022 15:51:41 +0100 Subject: gnu: ungoogled-chromium: Update to 107.0.5304.87-1. * gnu/packages/chromium.scm (%chromium-version): Set to 107.0.5304.87. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 7351fb208f..867e760803 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -317,7 +317,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "107.0.5304.68") +(define %chromium-version "107.0.5304.87") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "6afedb08139b97089ce8ef720ece5cd14c83948c") @@ -330,7 +330,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "0rjdi2lr71xjjf4x27183ys87fc95m85yp5x3kk6i39ppksvsj6b")))) + "12liz2nm6qc1bmcadjmxpj29y962lyyph7gjfin3rq1m4yg8f8s4")))) (define %debian-origin (origin @@ -495,7 +495,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "0k5qrmby1k2gw3lj96x3qag20kka61my578pv0zyrqqj5sdz3i5a")) + "0n9wr5v7zcdmbqs7mmnyydjvzw0glh5l3skpj7i1nap2hv0h03kc")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From 9d3cd3c79dd922dcde74e478cc5995836ecd4edb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 11 Nov 2022 01:02:00 +0100 Subject: gnu: ungoogled-chromium: Update to 107.0.5304.110-1. * gnu/packages/chromium.scm (%chromium-version): Set to 107.0.5304.110. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 867e760803..8bfda2ebc5 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -317,7 +317,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "107.0.5304.87") +(define %chromium-version "107.0.5304.110") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "6afedb08139b97089ce8ef720ece5cd14c83948c") @@ -330,7 +330,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "12liz2nm6qc1bmcadjmxpj29y962lyyph7gjfin3rq1m4yg8f8s4")))) + "14z9qi9i9l7kjx7gf74lzs63bpxqyd3wbqqpsvzvqgr2v0cgqahx")))) (define %debian-origin (origin @@ -495,7 +495,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "0n9wr5v7zcdmbqs7mmnyydjvzw0glh5l3skpj7i1nap2hv0h03kc")) + "1k7yjsb4i7m8i5mk018v7z25r4x1ypyprz4hnyrn7vk2983lhdfk")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From d69b90e9aae215a4cccdd1c133de0238e0847ad6 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 17 Nov 2022 08:17:21 +0400 Subject: gnu: ungoogled-chromium-wayland: Use PipeWire by default. * gnu/packages/chromium.scm (ungoogled-chromium/wayland)[arguments]<#:builder>: Add --enable-features=WebRTCPipeWireCapture to wrapping executable. --- gnu/packages/chromium.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 8bfda2ebc5..4556768dc7 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -1028,7 +1028,8 @@ (define-public ungoogled-chromium/wayland (call-with-output-file exe (lambda (port) (format port "#!~a -exec ~a --enable-features=UseOzonePlatform --ozone-platform=wayland $@" +exec ~a --enable-features=UseOzonePlatform --ozone-platform=wayland \ +--enable-features=WebRTCPipeWireCapturer $@" (string-append bash "/bin/bash") (string-append chromium "/bin/chromium")))) (chmod exe #o555) -- cgit v1.2.3 From 28074f1e09771efe0cbf58610555dc227135d22b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 17 Nov 2022 07:23:04 +0100 Subject: gnu: ungoogled-chromium: Build with Clang 15. * gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Remove obsolete compiler flags. [native-inputs]: Change from CLANG-14 and LLD-AS-LD-WRAPPER to CLANG-15 and LLD-AS-LD-WRAPPER-15. --- gnu/packages/chromium.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 4556768dc7..e3deed573a 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -758,13 +758,6 @@ (define-public ungoogled-chromium (setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm") (setenv "CC" "clang") (setenv "CXX" "clang++") - ;; Disable compiler flags that require Clang 15. - (substitute* "build/config/compiler/BUILD.gn" - (("\"-Wno-unqualified-std-cast-call\"") - "") - (("\"-Wno-deprecated-builtins\",") - "")) - ;; TODO: pre-compile instead. Avoids a race condition. (setenv "PYTHONDONTWRITEBYTECODE" "1") @@ -888,10 +881,10 @@ (define-public ungoogled-chromium '("24" "48" "64" "128" "256"))))))))) (native-inputs (list bison - clang-14 + clang-15 gn gperf - lld-as-ld-wrapper + lld-as-ld-wrapper-15 ninja node-lts pkg-config -- cgit v1.2.3 From ec10258c34c454295411be7dacf44d4ec5b9c152 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 26 Nov 2022 16:11:32 +0100 Subject: gnu: ungoogled-chromium: Update to 107.0.5304.121-1. * gnu/packages/chromium.scm (%chromium-version): Set to 107.0.5304.121. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index e3deed573a..e0a9f5fbad 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -317,7 +317,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "107.0.5304.110") +(define %chromium-version "107.0.5304.121") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "6afedb08139b97089ce8ef720ece5cd14c83948c") @@ -330,7 +330,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "14z9qi9i9l7kjx7gf74lzs63bpxqyd3wbqqpsvzvqgr2v0cgqahx")))) + "1ns664y7qx0ry8hg8r704z64jmx8j6rpxn2lkliv0xjfwlrbbfx3")))) (define %debian-origin (origin @@ -495,7 +495,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "1k7yjsb4i7m8i5mk018v7z25r4x1ypyprz4hnyrn7vk2983lhdfk")) + "12z0fhgxcsdkf6shnsg9maj3v901226cjcy8y2x8m88maw2apc0j")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From 503fb0dcb4cab921b5e280f119725850e65abbc9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Sep 2022 18:00:27 +0200 Subject: gnu: ungoogled-chromium: Generalize OpenJPEG substitution. * gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Don't hard code openjpeg version. --- gnu/packages/chromium.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index e0a9f5fbad..37b74833e1 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -613,11 +613,12 @@ (define-public ungoogled-chromium #~(modify-phases %standard-phases (add-after 'unpack 'patch-stuff (lambda* (#:key inputs #:allow-other-keys) - (let ((openjpeg (search-input-directory - inputs "include/openjpeg-2.4"))) + (let* ((libopenjp2 (search-input-file inputs "lib/libopenjp2.so")) + (openjpeg (dirname (dirname libopenjp2)))) (substitute* "third_party/pdfium/BUILD.gn" ;; This include path is added by Debians openjpeg patch. - (("/usr/include/openjpeg-2.4") openjpeg)) + (("/usr/include/openjpeg-") + (string-append openjpeg "/include/openjpeg-"))) ;; Adjust minizip header inclusions. (substitute* (find-files "third_party/tflite_support\ -- cgit v1.2.3 From 2775bb95c7e4ecfaf81af579e8003dddedab6960 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 30 Nov 2022 17:55:11 +0100 Subject: gnu: ungoogled-chromium: Update to 108.0.5359.71-1. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for M108. (%chromium-version): Set to 108.0.5359.71-1. (%arch-revision): Bump to newer commit. (%ungoogled-origin): Update hash. (%gcc-patches): Remove. (%reverse-patches): Remove one patch. (%arch-patches): New variable. (%patches): New variable. (ungoogled-chromium-snippet): Apply %PATCHES instead of individual variables. (ungoogled-chromium)[source]: Update hash. [arguments]: Adjust configure flag. [inputs]: Change from HARFBUZZ-3 to HARFBUZZ-5. --- gnu/packages/chromium.scm | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 37b74833e1..3d1ba7c5c3 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -183,11 +183,11 @@ (define %preserved-third-party-files "third_party/libaddressinput" ;ASL2.0 "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0" "third_party/libaom/source/libaom/third_party/fastfeat" ;BSD-3 + "third_party/libaom/source/libaom/third_party/SVT-AV1" ;BSD-3 "third_party/libaom/source/libaom/third_party/vector" ;Expat "third_party/libaom/source/libaom/third_party/x86inc" ;ISC "third_party/libjxl" ;ASL2.0 "third_party/libgav1" ;ASL2.0 - "third_party/libgifcodec" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3, BSD-2 "third_party/libjingle_xmpp" ;BSD-3 "third_party/libphonenumber" ;ASL2.0 "third_party/libsecret" ;LGPL2.1+ @@ -273,7 +273,7 @@ (define %preserved-third-party-files "third_party/utf" ;Expat "third_party/vulkan-deps" ;ASL2.0, BSD-3, Expat "third_party/vulkan_memory_allocator" ;Expat - "third_party/wayland/protocol" ;Expat + "third_party/wayland/src/protocol" ;Expat "third_party/wayland/stubs" ;BSD-3, Expat "third_party/wayland/wayland_scanner_wrapper.py" ;BSD-3 "third_party/wayland-protocols" ;Expat @@ -317,20 +317,22 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "107.0.5304.121") +(define %chromium-version "108.0.5359.71") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") -(define %arch-revision "6afedb08139b97089ce8ef720ece5cd14c83948c") +(define %arch-revision "4de5019014aeb77187a517c5ca6db8723d622a40") (define %ungoogled-origin (origin (method git-fetch) (uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium") - (commit %ungoogled-revision))) + ;; XXX: Use a raw commit because it has not been + ;; tagged yet. + (commit "352a8844b01a05a786ba76da599d106487f1533f"))) (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "1ns664y7qx0ry8hg8r704z64jmx8j6rpxn2lkliv0xjfwlrbbfx3")))) + "1309rz06s7fw9p7h5968nk23rbsyfhqm5znqrw6nh24qdbg6z3zx")))) (define %debian-origin (origin @@ -360,9 +362,6 @@ (define %debian-patches "system/zlib.patch" "system/openjpeg.patch"))) -(define %gcc-patches - '()) - (define (arch-patch revision name hash) (origin (method url-fetch) @@ -376,10 +375,12 @@ (define %reverse-patches (arch-patch %arch-revision "REVERT-roll-src-third_party-ffmpeg-m102.patch" "0i7crn6fcwq09kd6a4smqnffaldyv61lmv2p0drcnpfrwalmkprh") (arch-patch %arch-revision "REVERT-roll-src-third_party-ffmpeg-m106.patch" - "0li10cvxnppmmmsc7w77b1s7z02s5bzd39zsal9x768708fx64jc") - ;; Fix crash when using Global Media Controls. - (arch-patch %arch-revision "REVERT-enable-GlobalMediaControlsCastStartStop.patch" - "1ilsw421lylkjnq3lvc607bdx7cvwlish8qzgwx9s84l4hzv37vp"))) + "0li10cvxnppmmmsc7w77b1s7z02s5bzd39zsal9x768708fx64jc"))) + +(define %arch-patches + (list + (arch-patch %arch-revision "disable-GlobalMediaControlsCastStartStop.patch" + "00m361ka38d60zpbss7qnfw80vcwnip2pjcz3wf46wd2sqi1nfvz"))) (define %guix-patches (list (local-file @@ -398,6 +399,9 @@ (define %guix-patches (assume-valid-file-name (search-patch "ungoogled-chromium-system-nspr.patch"))))) +(define %patches + (append %debian-patches %arch-patches %guix-patches)) + ;; This is a source 'snippet' that does the following: ;; *) Applies various patches for unbundling purposes and libstdc++ compatibility. ;; *) Runs the ungoogled patch-, domain substitution-, and scrubbing scripts. @@ -419,8 +423,7 @@ (define ungoogled-chromium-snippet (for-each (lambda (patch) (invoke "patch" "-p1" "--force" "--input" patch "--no-backup-if-mismatch")) - (append '#+%debian-patches '#+%guix-patches - '#+%gcc-patches)) + '#+%patches) ;; These patches are "reversed", i.e. their changes should be undone. (for-each (lambda (patch) @@ -495,7 +498,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "12z0fhgxcsdkf6shnsg9maj3v901226cjcy8y2x8m88maw2apc0j")) + "0pgzf6xrd71is1dld1arhq366vjp8p54x75zyx6y7vcjqj0a0v6b")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -561,7 +564,7 @@ (define-public ungoogled-chromium "use_system_libjpeg=true" "use_system_libopenjpeg2=true" "use_system_libpng=true" - "use_system_libwayland_server=true" + "use_system_libwayland=true" "use_system_wayland_scanner=true" (string-append "system_wayland_scanner_path=\"" (search-input-file %build-inputs @@ -911,7 +914,7 @@ (define-public ungoogled-chromium gdk-pixbuf glib gtk+ - harfbuzz-3 + harfbuzz-5 icu4c-71 jsoncpp lcms -- cgit v1.2.3 From 365b0b55334ab61e73f368f142af7aa1c3a3d28a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 2 Dec 2022 19:10:51 +0100 Subject: gnu: ungoogled-chromium: Use git tag in ungoogled origin. * gnu/packages/chromium.scm (%ungoogled-origin)[uri]: Use %UNGOOGLED-REVISION instead of commit identifier. --- gnu/packages/chromium.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 3d1ba7c5c3..837a2a7593 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -326,9 +326,7 @@ (define %ungoogled-origin (origin (method git-fetch) (uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium") - ;; XXX: Use a raw commit because it has not been - ;; tagged yet. - (commit "352a8844b01a05a786ba76da599d106487f1533f"))) + (commit %ungoogled-revision))) (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 -- cgit v1.2.3 From c3713d53e0bdf1186e08880b9e0ae6dd85f55fc4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 3 Dec 2022 13:31:40 +0100 Subject: gnu: ungoogled-chromium: Update to 108.0.5359.94-1. * gnu/packages/chromium.scm (%chromium-version): Set to 108.0.5359.94. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 837a2a7593..7ef5104006 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -317,7 +317,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "108.0.5359.71") +(define %chromium-version "108.0.5359.94") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "4de5019014aeb77187a517c5ca6db8723d622a40") @@ -330,7 +330,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "1309rz06s7fw9p7h5968nk23rbsyfhqm5znqrw6nh24qdbg6z3zx")))) + "0hlrcp34cf6m8c7100m8xr99s02ch0vmkgwl9pqkrinaghh29kgn")))) (define %debian-origin (origin @@ -496,7 +496,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "0pgzf6xrd71is1dld1arhq366vjp8p54x75zyx6y7vcjqj0a0v6b")) + "1zmndi4q9x8fyixwl1mp5qyf883x9xafq7ipzf9vk9d8h62521q6")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From 8536cf7bdd938ec5489670b590b3fc5d801d4f04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 8 Dec 2022 11:38:21 +0100 Subject: gnu: ungoogled-chromium: Update to 108.0.5359.98-1. * gnu/packages/chromium.scm (%chromium-version): Set to 108.0.5359.98. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 7ef5104006..cdc07da005 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -317,7 +317,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "108.0.5359.94") +(define %chromium-version "108.0.5359.98") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "4de5019014aeb77187a517c5ca6db8723d622a40") @@ -330,7 +330,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "0hlrcp34cf6m8c7100m8xr99s02ch0vmkgwl9pqkrinaghh29kgn")))) + "16rc15qsndrsj52p56ma3hg94jslkfy2f91ryr3qss73r2rkjf8j")))) (define %debian-origin (origin @@ -496,7 +496,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "1zmndi4q9x8fyixwl1mp5qyf883x9xafq7ipzf9vk9d8h62521q6")) + "07jnhd5y7k4zp2ipz052isw7llagxn8l8rbz8x3jkjz3f5wi7dk0")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From 4d162d70a5203d3dd9827c0fee3f4a5e563dfd85 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 8 Dec 2022 11:39:26 +0100 Subject: gnu: ungoogled-chromium: Remove obsolete workaround. * gnu/packages/chromium.scm (ungoogled-chromium)[version]: Remove conditional. --- gnu/packages/chromium.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index cdc07da005..983a754215 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -482,12 +482,7 @@ (define opus+custom (define-public ungoogled-chromium (package (name "ungoogled-chromium") - (version (if (string-prefix? %chromium-version %ungoogled-revision) - %ungoogled-revision - ;; ungoogled-chromium version tags always have a "-1" suffix, - ;; so we can hijack "-0" in cases where the Chromium source - ;; is newer than the latest available tag. - (string-append %chromium-version "-0"))) + (version %ungoogled-revision) (synopsis "Graphical web browser") (source (origin (method url-fetch) -- cgit v1.2.3 From 999783b92d549dfd53a305ad744fcc0048fa2479 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2022 16:41:57 +0100 Subject: gnu: ungoogled-chromium: Build with ffmpeg@4. This is a follow-up to commit 79564bf9977ebba0b31d8dc291eb039142f51f68. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change from FFMPEG to FFFMPEG-4. --- gnu/packages/chromium.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 983a754215..299a4edcbe 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -899,7 +899,7 @@ (define-public ungoogled-chromium dbus expat flac - ffmpeg + ffmpeg-4 fontconfig fp16 freetype -- cgit v1.2.3 From 95692ffa8bcb1fec56039b6a4e5a2a368e7dfdbe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 16 Dec 2022 17:41:58 +0100 Subject: gnu: ungoogled-chromium: Update to 108.0.5359.124-1. * gnu/packages/chromium.scm (%chromium-version): Set to 108.0.5359.124. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 299a4edcbe..ed6dd9dfd1 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -317,7 +317,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "108.0.5359.98") +(define %chromium-version "108.0.5359.124") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "4de5019014aeb77187a517c5ca6db8723d622a40") @@ -330,7 +330,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "16rc15qsndrsj52p56ma3hg94jslkfy2f91ryr3qss73r2rkjf8j")))) + "18sz2ksawyb08h4kbxzkf1zhxs832z8mwvndm43nykz01wxk20bp")))) (define %debian-origin (origin @@ -491,7 +491,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "07jnhd5y7k4zp2ipz052isw7llagxn8l8rbz8x3jkjz3f5wi7dk0")) + "0x9ac6m4xdccjdrk2bmq4y7bhfpgf2dv0q7lsbbsa50vlv1gm3fl")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From 590700ce00177a826872c867066eeba6eb7c4641 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 8 Jan 2023 10:30:37 +0100 Subject: gnu: pipewire: Switch default to 0.3. * gnu/packages/linux.scm (pipewire): Switch to pipewire 0.3. (pipewire-0.3): Remove variable. (wireplumber): Replace all pipewire-0.3 by pipewire. * gnu/packages/audio.scm (qpwgraph): Ditto. * gnu/packages/chromium.scm (ungoogled-chromium): Ditto. * gnu/packages/freedesktop.scm (weston, xdg-desktop-portal, xdg-desktop-portal-wlr): Ditto. * gnu/packages/gnome.scm (mutter): Ditto. * gnu/packages/kde-systemtools.scm (krfb): Ditto. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Ditto. * gnu/packages/video.scm (obs): Ditto. Signed-off-by: Mathieu Othacehe --- gnu/packages/audio.scm | 2 +- gnu/packages/chromium.scm | 2 +- gnu/packages/freedesktop.scm | 6 +-- gnu/packages/gnome.scm | 4 +- gnu/packages/kde-systemtools.scm | 2 +- gnu/packages/linux.scm | 79 ++++++++++++++-------------------------- gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 8 files changed, 38 insertions(+), 61 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 49e33402eb..0cefc61ca2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -6017,7 +6017,7 @@ (define-public qpwgraph (arguments (list #:tests? #f)) ;; no tests (inputs (list alsa-lib libxkbcommon - pipewire-0.3 + pipewire qtbase qtsvg)) (native-inputs (list pkg-config)) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index ed6dd9dfd1..799c2422ac 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -941,7 +941,7 @@ (define-public ungoogled-chromium opus+custom pango pciutils - pipewire-0.3 + pipewire pulseaudio qtbase-5 re2 diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d63fe8f7ca..130a7adec4 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1372,7 +1372,7 @@ (define-public weston mtdev linux-pam pango - pipewire-0.3 + pipewire wayland-protocols-next xorg-server-xwayland)) (propagated-inputs @@ -2693,7 +2693,7 @@ (define-public xdg-desktop-portal ("libportal" ,libportal) ("dbus" ,dbus) ("geoclue" ,geoclue) - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("fuse" ,fuse-3))) (arguments `(#:configure-flags @@ -2866,7 +2866,7 @@ (define-public xdg-desktop-portal-wlr grim iniparser libinih - pipewire-0.3 + pipewire slurp wayland wayland-protocols)) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b5273b5c06..09b8056cc9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8118,7 +8118,7 @@ (define-public mutter ;; theme to please libxcursor. adwaita-icon-theme libxcursor ;for XCURSOR_PATH - pipewire-0.3 + pipewire python python-dbus python-dbusmock @@ -8160,7 +8160,7 @@ (define-public mutter libxkbfile libxrandr libxtst - pipewire-0.3 + pipewire startup-notification sysprof upower diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 96ed5cb777..455798ab8c 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -270,7 +270,7 @@ (define-public krfb libxcb libxtst breeze-icons ;; default icon set - pipewire-0.3 + pipewire plasma-wayland-protocols qtbase-5 qtwayland-5 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5c8d886fbd..8d20f105cb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2017 nee ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2018, 2020 Brendan Tildesley +;;; Copyright © 2018, 2020, 2022 Brendan Tildesley ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu @@ -9078,7 +9078,7 @@ (define-public inputattach (define-public pipewire (package (name "pipewire") - (version "0.2.7") + (version "0.3.56") (source (origin (method git-fetch) (uri (git-reference @@ -9087,23 +9087,34 @@ (define-public pipewire (file-name (git-file-name name version)) (sha256 (base32 - "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc")) - (patches (search-patches "pipewire-0.2.7-fno-common.patch")))) + "066g4ri2k8pdflclvr2919f6x98gmqrqyj1xyiingw2nn2pwgcf1")))) (build-system meson-build-system) (arguments - '(#:configure-flags '("-Dsystemd=false"))) + (list + #:configure-flags + #~(list (string-append "-Dudevrulesdir=" #$output "/lib/udev/rules.d") + "-Dsystemd=disabled" + "-Dsession-managers=[]" + "-Dman=enabled"))) (native-inputs - (list pkg-config)) - (inputs - (list alsa-lib - dbus - eudev - ffmpeg-4 - gstreamer - gst-plugins-base - libva - sbc - sdl2)) + (list pkg-config + python-docutils)) + (inputs (list alsa-lib + avahi + bluez + dbus + eudev + ffmpeg + gst-plugins-base + gstreamer + jack-2 + ldacbt + libva + pulseaudio + sbc + sdl2 + vulkan-headers + vulkan-loader)) (home-page "https://pipewire.org/") (synopsis "Server and user space API to deal with multimedia pipelines") (description @@ -9117,40 +9128,6 @@ (define-public pipewire of Linux application development.") (license license:lgpl2.0+))) -(define-public pipewire-0.3 - (package - (inherit pipewire) - (name "pipewire") - (version "0.3.56") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/PipeWire/pipewire") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "066g4ri2k8pdflclvr2919f6x98gmqrqyj1xyiingw2nn2pwgcf1")))) - (arguments - (list - #:configure-flags - #~(list (string-append "-Dudevrulesdir=" #$output "/lib/udev/rules.d") - "-Dsystemd=disabled" - "-Dsession-managers=[]" - "-Dman=enabled"))) - (native-inputs - (modify-inputs (package-native-inputs pipewire) - (prepend python-docutils))) - (inputs (modify-inputs (package-inputs pipewire) - (replace "ffmpeg" ffmpeg) - (prepend avahi - bluez - jack-2 - ldacbt - pulseaudio - vulkan-loader - vulkan-headers))))) - (define-public wireplumber (package (name "wireplumber") @@ -9172,7 +9149,7 @@ (define-public wireplumber (native-inputs (list `(,glib "bin") pkg-config)) - (inputs (list dbus elogind glib lua pipewire-0.3)) + (inputs (list dbus elogind glib lua pipewire)) (home-page "https://gitlab.freedesktop.org/pipewire/wireplumber") (synopsis "Session / policy manager implementation for PipeWire") (description "WirePlumber is a modular session / policy manager for diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 14e0602d93..ad9ca74a6c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -338,7 +338,7 @@ (define-public webrtc-for-telegram-desktop openh264 openssl opus - pipewire-0.3 + pipewire protobuf)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e934379ff4..fc430b9196 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3457,7 +3457,7 @@ (define-public obs mbedtls-apache mesa pciutils - pipewire-0.3 + pipewire pulseaudio python qtbase-5 -- cgit v1.2.3 From 8d813a7eba5c47f29e5f5571483db96b7acde286 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 10 Jan 2023 04:05:21 +0100 Subject: gnu: ungoogled-chromium: Update to 109.0.5414.74-1. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for M109. (%chromium-version): Set to 109.0.5414.74. (%arch-revision): Bump to latest. (%arch-patches): Add one patch. (%ungoogled-origin): Update hash. (ungoogled-chromium)[source]: Likewise. [arguments]: Disable H264 for WebRTC. Delete one directory. Remove obsolete substitution. [native-inputs]: Add PYTHON-PYYAML. --- gnu/packages/chromium.scm | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 799c2422ac..2c1d86f0f6 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2020, 2021, 2022 Marius Bakke +;;; Copyright © 2019-2023 Marius Bakke ;;; Copyright © 2019 Alex Griffin ;;; ;;; This file is part of GNU Guix. @@ -27,7 +27,6 @@ (define-module (gnu packages chromium) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages) - #:use-module (gnu packages assembly) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -56,7 +55,6 @@ (define-module (gnu packages chromium) #:use-module (gnu packages nss) #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-web) @@ -70,10 +68,8 @@ (define-module (gnu packages chromium) #:use-module (gnu packages video) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) - #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) - #:use-module (ice-9 match) - #:use-module (srfi srfi-1)) + #:use-module (ice-9 match)) (define %preserved-third-party-files '("base/third_party/cityhash" ;Expat @@ -152,6 +148,8 @@ (define %preserved-third-party-files "third_party/devtools-frontend/src/front_end/third_party/lodash-isequal" ;Expat "third_party/devtools-frontend/src/front_end/third_party/marked" ;Expat, BSD-3 "third_party/devtools-frontend/src/front_end/third_party/puppeteer" ;ASL2.0 + "third_party/devtools-frontend/src/front_end/third_party/puppeteer\ +/package/lib/esm/third_party/mitt" ;Expat "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0 "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0 "third_party/devtools-frontend/src/third_party/typescript" ;ASL2.0 @@ -245,6 +243,7 @@ (define %preserved-third-party-files "third_party/ruy" ;ASL2.0 "third_party/s2cellid" ;ASL2.0 "third_party/securemessage" ;ASL2.0 + "third_party/selenium-atoms" ;ASL2.0 "third_party/shell-encryption" ;ASL2.0 "third_party/skia" ;BSD-3 "third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat @@ -317,10 +316,10 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "108.0.5359.124") +(define %chromium-version "109.0.5414.74") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") -(define %arch-revision "4de5019014aeb77187a517c5ca6db8723d622a40") +(define %arch-revision "a0b214b3bdfbc7ee3d9004a70494a2b9e3da2c80") (define %ungoogled-origin (origin @@ -330,7 +329,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "18sz2ksawyb08h4kbxzkf1zhxs832z8mwvndm43nykz01wxk20bp")))) + "0l07f9221g7q9rmi3drlia40m7dsac26smgh7nnyhfncahzjsc2y")))) (define %debian-origin (origin @@ -378,7 +377,9 @@ (define %reverse-patches (define %arch-patches (list (arch-patch %arch-revision "disable-GlobalMediaControlsCastStartStop.patch" - "00m361ka38d60zpbss7qnfw80vcwnip2pjcz3wf46wd2sqi1nfvz"))) + "00m361ka38d60zpbss7qnfw80vcwnip2pjcz3wf46wd2sqi1nfvz") + (arch-patch %arch-revision "fix-the-way-to-handle-codecs-in-the-system-icu.patch" + "1qy7ldw7lnfbg0dl49m7myrflw0ps80adaisq5dqjndhn0rcbmd5"))) (define %guix-patches (list (local-file @@ -491,7 +492,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "0x9ac6m4xdccjdrk2bmq4y7bhfpgf2dv0q7lsbbsa50vlv1gm3fl")) + "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -589,7 +590,7 @@ (define-public ungoogled-chromium "ffmpeg_branding=\"Chrome\"" ;; WebRTC stuff. - "rtc_use_h264=true" + "rtc_use_h264=false" ;XXX needs bundled openh264 "rtc_use_pipewire=true" "rtc_link_pipewire=true" ;; Don't use bundled sources. @@ -619,9 +620,6 @@ (define-public ungoogled-chromium ;; Adjust minizip header inclusions. (substitute* (find-files "third_party/tflite_support\ /src/tensorflow_lite_support/metadata/cc") - (("#include \"contrib/minizip/ioapi\\.h\"") - ;; This one can be removed for M108 or so. - "#include \"minizip/ioapi.h\"") (("third_party/zlib/contrib/minizip/") "minizip/")) @@ -670,6 +668,11 @@ (define-public ungoogled-chromium (("include \"third_party/lcms/include/lcms2\\.h\"") "include \"lcms2.h\"")) + ;; The unbundling script leaves behind an empty pyyaml directory + ;; which prevents the code that tries to use it from falling + ;; back to the pyyaml provided by Guix. + (rmdir "third_party/pyyaml") + (substitute* "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h" (("include \"third_party/curl") @@ -888,6 +891,7 @@ (define-public ungoogled-chromium which python-beautifulsoup4 python-html5lib + python-pyyaml python-wrapper wayland)) (inputs -- cgit v1.2.3 From c6ec9c7af9814f84f293f62235eab9d0649751a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Jan 2023 08:10:19 +0100 Subject: gnu: ungoogled-chromium: Update to 109.0.5414.119-1. * gnu/packages/chromium.scm (%chromium-version): Set to 109.0.5414.119. (%ungoogled-origin): Update hash. (ungoogled-chromium)[source]: Likewise. [arguments]: Use delete-file-recursively instead of rmdir for compatibility with downstream versions. Remove unused binding. --- gnu/packages/chromium.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages/chromium.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 2c1d86f0f6..94e22d8c21 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -316,7 +316,7 @@ (define %blacklisted-files ;; run the Blink performance tests, just remove everything to save ~70MiB. '("third_party/blink/perf_tests")) -(define %chromium-version "109.0.5414.74") +(define %chromium-version "109.0.5414.119") (define %ungoogled-revision (string-append %chromium-version "-1")) (define %debian-revision "debian/102.0.5005.61-1") (define %arch-revision "a0b214b3bdfbc7ee3d9004a70494a2b9e3da2c80") @@ -329,7 +329,7 @@ (define %ungoogled-origin (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision)) (sha256 (base32 - "0l07f9221g7q9rmi3drlia40m7dsac26smgh7nnyhfncahzjsc2y")))) + "1nb0099gwkhxv3zc184jyvpl5jrrq194pv6yq95nbc27vw6zz7qv")))) (define %debian-origin (origin @@ -492,7 +492,7 @@ (define-public ungoogled-chromium %chromium-version ".tar.xz")) (sha256 (base32 - "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd")) + "0bdyb14v12izxkldq27jx532p0bid3wdwfpd1mwm7jqswxgfzkfb")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -671,7 +671,7 @@ (define-public ungoogled-chromium ;; The unbundling script leaves behind an empty pyyaml directory ;; which prevents the code that tries to use it from falling ;; back to the pyyaml provided by Guix. - (rmdir "third_party/pyyaml") + (delete-file-recursively "third_party/pyyaml") (substitute* "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h" @@ -750,9 +750,7 @@ (define-public ungoogled-chromium (string-append mesa-lib "/libGLESv2.so.2")))))) (add-before 'configure 'prepare-build-environment (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((c++ (search-input-directory (or native-inputs inputs) - "include/c++")) - (node (search-input-file (or native-inputs inputs) + (let ((node (search-input-file (or native-inputs inputs) "/bin/node"))) ;; Define the GN toolchain. (setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm") -- cgit v1.2.3