From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id QD8MCyHb82PoSwEAbAwnHQ (envelope-from ) for ; Mon, 20 Feb 2023 21:42:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UPsICyHb82P3FwEAauVa8A (envelope-from ) for ; Mon, 20 Feb 2023 21:42:09 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 755613159F for ; Mon, 20 Feb 2023 21:42:08 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUCyh-0005oS-PP; Mon, 20 Feb 2023 15:41:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pUCyf-0005mp-C4 for guix-devel@gnu.org; Mon, 20 Feb 2023 15:41:37 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pUCyc-0002Ih-3v for guix-devel@gnu.org; Mon, 20 Feb 2023 15:41:37 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A686E1E23; Mon, 20 Feb 2023 21:41:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5FmPlu0WOU5Y; Mon, 20 Feb 2023 21:41:27 +0100 (CET) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id C2E761E22; Mon, 20 Feb 2023 21:41:26 +0100 (CET) Date: Mon, 20 Feb 2023 21:41:23 +0100 From: Andreas Enge To: guix-devel@gnu.org Subject: Re: Ungoogled-chromium in core-updates Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="YbTF7S2DnmPnoGWU" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Received-SPF: permerror client-ip=2a0c:e300::1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=0.01, URI_HEX=0.1 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676925729; a=rsa-sha256; cv=none; b=LmNmDXK/vsC4FtY1Rore80m4/pUhyFRA2lXI/6+egTy9Qe3ZwL/jRmbXPhsGNKrhBXwDb5 Yzula6pnxM10RfeV/8ylwbPZDdb8M/lIINrPB8ozlV64Oh9zV8f+lrkDdnBgmMkex8Rlat lqg3IungMNVrlM6imrB7q16ROCfLXaDJ9HcIdiSn9r8OqqkS5G8D9ABvT81wnwYN7ppm9D bqfUaMl1fKCWvFfnEbr4DQXRw3q7K3ZyjM3azQ7oPPSaYIgoOjnm/lufQVwFBLUGvWl+B5 KzG4OEz4OY065vgp+eXSJ9mq7Zglg/0XLLRd2B/eKZkRKBUj8Dp3tX8C6DSElg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676925729; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=2nnliKLQA2nGD9a8A5Oz96WUuA1hNnroai7Mvy39MzM=; b=rfXsDDoCex5D+cqn078zO2lJ4L7VaccOoI9fpf6k6uaJJEi6/MCVLhZGxZyr9V1JlQs+KM 1HBk6nQTi8Tx0opgwsGNyitbH8v7Mo60sKpFTqEoSkvUdg9Ib/P6GKG53NQ8+HQsJt8t+R BkoYFOVOKMFvov0PJb8uUpK+FgSHeLezvYzcNngyvVV+uT8TCvEKbCYL2qBNWVwbYz3fTR FCbmDErqqifZ7wSpb0Lo7W/ltj+MMUeomo4C91eq7SeNlYTVmgZi+6d66Mz7h02J1FTZxg nWOxxDj+DAiDjK9I7TzxWG7nu4or68pP2FBKav2QWWg+C0U4YlSo46qySZFsPw== X-Spam-Score: -0.95 X-Migadu-Queue-Id: 755613159F Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.95 X-TUID: aeQkIk8eyJCk --YbTF7S2DnmPnoGWU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The attached patch makes some progress; actually it simply moves to a later Debian patchset. third_party/pdfium now compiles with it, but the build fails later on with the attached error message. So I have not yet pushed the patch, since it does not solve the problem; or would it be okay to push partial progress? The problem looks precisely like the bug here: https://bugs.gentoo.org/786597 which is supposed to be fixed upstream a long time ago. But their patch https://786597.bugs.gentoo.org/attachment.cgi?id=3D732880 still applies... It is also in the Debian patches as fixes/clang-and-gcc11.patch. Something to try another day! Andreas [18303/52515] CXX obj/sql/sql/cursor.o FAILED: obj/sql/sql/cursor.o=20 clang++ -MMD -MF obj/sql/sql/cursor.o.d -DIS_SQL_IMPL -DUSE_UDEV -DUSE_AURA= =3D1 -DUSE_GLIB=3D1 -DUSE_OZONE=3D1 -DOFFICIAL_BUILD -D__STDC_CONSTANT_MACR= OS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=3D2 -D_FILE_OFFSET_BITS=3D64 -D= _LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D_GNU_SOURCE -D= NDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=3D0 -DGLIB_VERSION_MAX_ALL= OWED=3DGLIB_VERSION_2_40 -DGLIB_VERSION_MIN_REQUIRED=3DGLIB_VERSION_2_40 -D= SQLITE_OMIT_ANALYZE -DSQLITE_OMIT_AUTOINIT -DSQLITE_OMIT_AUTOMATIC_INDEX -D= SQLITE_OMIT_AUTORESET -DSQLITE_OMIT_COMPILEOPTION_DIAGS -DSQLITE_OMIT_COMPL= ETE -DSQLITE_OMIT_EXPLAIN -DSQLITE_OMIT_GET_TABLE -DSQLITE_OMIT_INTROSPECTI= ON_PRAGMAS -DSQLITE_DEFAULT_LOOKASIDE=3D0,0 -DSQLITE_OMIT_LOOKASIDE -DSQLIT= E_OMIT_TCL_VARIABLE -DSQLITE_OMIT_REINDEX -DSQLITE_OMIT_TRACE -DSQLITE_OMIT= _UPSERT -DSQLITE_OMIT_WINDOWFUNC -DSQLITE_ENABLE_FTS3 -DSQLITE_DISABLE_FTS3= _UNICODE -DSQLITE_DISABLE_FTS4_DEFERRED -DSQLITE_ENABLE_ICU -DSQLITE_SECURE= _DELETE -DSQLITE_THREADSAFE=3D1 -DSQLITE_MAX_WORKER_THREADS=3D0 -DSQLITE_MA= X_MMAP_SIZE=3D268435456 -DSQLITE_DEFAULT_FILE_PERMISSIONS=3D0600 -DSQLITE_D= EFAULT_LOCKING_MODE=3D1 -DSQLITE_DEFAULT_MEMSTATUS=3D1 -DSQLITE_DEFAULT_PAG= E_SIZE=3D4096 -DSQLITE_DEFAULT_PCACHE_INITSZ=3D0 -DSQLITE_LIKE_DOESNT_MATCH= _BLOBS -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OM= IT_SHARED_CACHE -DSQLITE_USE_ALLOCA -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_JS= ON -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_BATCH_A= TOMIC_WRITE -DSQLITE_TEMP_STORE=3D3 -DSQLITE_ENABLE_LOCKING_STYLE=3D0 -I../= =2E. -Igen -I../../third_party/perfetto/include -Igen/third_party/perfetto/= build_config -Igen/third_party/perfetto -Igen/shim_headers/zlib_shim -Igen/= shim_headers/libevent_shim -Igen/shim_headers/icui18n_shim -Igen/shim_heade= rs/icuuc_shim -I../../third_party/abseil-cpp -I../../third_party/boringssl/= src/include -I../../third_party/protobuf/src -Igen/protoc_out -Wall -Wextra= -Wimplicit-fallthrough -Wextra-semi -Wunreachable-code-aggressive -Wthread= -safety -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -W= loop-analysis -Wno-unneeded-internal-declaration -Wenum-compare-conditional= -Wno-ignored-pragma-optimize -Wno-deprecated-builtins -Wno-bitfield-consta= nt-conversion -Wshadow -fno-delete-null-pointer-checks -fno-ident -fno-stri= ct-aliasing --param=3Dssp-buffer-size=3D4 -fstack-protector -fno-unwind-tab= les -fno-asynchronous-unwind-tables -fPIC -pthread -fcolor-diagnostics -fme= rge-all-constants -fcrash-diagnostics-dir=3D../../tools/clang/crashreports = -mllvm -instcombine-lower-dbg-declare=3D0 -ffp-contract=3Doff -flto=3Dthin = -fsplit-lto-unit -fwhole-program-vtables -m64 -msse3 -ffile-compilation-dir= =3D. -no-canonical-prefixes -ftrivial-auto-var-init=3Dpattern -O2 -fdata-se= ctions -ffunction-sections -fno-unique-section-names -fno-omit-frame-pointe= r -gdwarf-4 -g2 -gdwarf-aranges -ggnu-pubnames -Xclang -fuse-ctor-homing -f= sanitize=3Dcfi-vcall -fsanitize-ignorelist=3D../../tools/cfi/ignores.txt -f= sanitize=3Dcfi-icall -fvisibility=3Dhidden -Wheader-hygiene -Wstring-conver= sion -Wtautological-overlap-compare -I/gnu/store/jppi8qal1yrw6q6fn4kv04swwb= 70s50c-glib-2.72.3/include/glib-2.0 -I/gnu/store/jppi8qal1yrw6q6fn4kv04swwb= 70s50c-glib-2.72.3/lib/glib-2.0/include -DPROTOBUF_ALLOW_DEPRECATED=3D1 -st= d=3Dc++20 -Wno-trigraphs -gsimple-template-names -fno-exceptions -fno-rtti = -fvisibility-inlines-hidden -c ../../sql/recover_module/cursor.cc -o obj/sq= l/sql/cursor.o In file included from ../../sql/recover_module/cursor.cc:5: =2E./../sql/recover_module/cursor.h:66:5: error: static assertion failed du= e to requirement 'std::is_standard_layout::val= ue': needed for the reinterpret_cast below static_assert(std::is_standard_layout::value, ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. [18304/52515] CXX obj/sql/sql/module.o FAILED: obj/sql/sql/module.o=20 clang++ -MMD -MF obj/sql/sql/module.o.d -DIS_SQL_IMPL -DUSE_UDEV -DUSE_AURA= =3D1 -DUSE_GLIB=3D1 -DUSE_OZONE=3D1 -DOFFICIAL_BUILD -D__STDC_CONSTANT_MACR= OS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=3D2 -D_FILE_OFFSET_BITS=3D64 -D= _LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D_GNU_SOURCE -D= NDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=3D0 -DGLIB_VERSION_MAX_ALL= OWED=3DGLIB_VERSION_2_40 -DGLIB_VERSION_MIN_REQUIRED=3DGLIB_VERSION_2_40 -D= SQLITE_OMIT_ANALYZE -DSQLITE_OMIT_AUTOINIT -DSQLITE_OMIT_AUTOMATIC_INDEX -D= SQLITE_OMIT_AUTORESET -DSQLITE_OMIT_COMPILEOPTION_DIAGS -DSQLITE_OMIT_COMPL= ETE -DSQLITE_OMIT_EXPLAIN -DSQLITE_OMIT_GET_TABLE -DSQLITE_OMIT_INTROSPECTI= ON_PRAGMAS -DSQLITE_DEFAULT_LOOKASIDE=3D0,0 -DSQLITE_OMIT_LOOKASIDE -DSQLIT= E_OMIT_TCL_VARIABLE -DSQLITE_OMIT_REINDEX -DSQLITE_OMIT_TRACE -DSQLITE_OMIT= _UPSERT -DSQLITE_OMIT_WINDOWFUNC -DSQLITE_ENABLE_FTS3 -DSQLITE_DISABLE_FTS3= _UNICODE -DSQLITE_DISABLE_FTS4_DEFERRED -DSQLITE_ENABLE_ICU -DSQLITE_SECURE= _DELETE -DSQLITE_THREADSAFE=3D1 -DSQLITE_MAX_WORKER_THREADS=3D0 -DSQLITE_MA= X_MMAP_SIZE=3D268435456 -DSQLITE_DEFAULT_FILE_PERMISSIONS=3D0600 -DSQLITE_D= EFAULT_LOCKING_MODE=3D1 -DSQLITE_DEFAULT_MEMSTATUS=3D1 -DSQLITE_DEFAULT_PAG= E_SIZE=3D4096 -DSQLITE_DEFAULT_PCACHE_INITSZ=3D0 -DSQLITE_LIKE_DOESNT_MATCH= _BLOBS -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OM= IT_SHARED_CACHE -DSQLITE_USE_ALLOCA -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_JS= ON -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_BATCH_A= TOMIC_WRITE -DSQLITE_TEMP_STORE=3D3 -DSQLITE_ENABLE_LOCKING_STYLE=3D0 -I../= =2E. -Igen -I../../third_party/perfetto/include -Igen/third_party/perfetto/= build_config -Igen/third_party/perfetto -Igen/shim_headers/zlib_shim -Igen/= shim_headers/libevent_shim -Igen/shim_headers/icui18n_shim -Igen/shim_heade= rs/icuuc_shim -I../../third_party/abseil-cpp -I../../third_party/boringssl/= src/include -I../../third_party/protobuf/src -Igen/protoc_out -Wall -Wextra= -Wimplicit-fallthrough -Wextra-semi -Wunreachable-code-aggressive -Wthread= -safety -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -W= loop-analysis -Wno-unneeded-internal-declaration -Wenum-compare-conditional= -Wno-ignored-pragma-optimize -Wno-deprecated-builtins -Wno-bitfield-consta= nt-conversion -Wshadow -fno-delete-null-pointer-checks -fno-ident -fno-stri= ct-aliasing --param=3Dssp-buffer-size=3D4 -fstack-protector -fno-unwind-tab= les -fno-asynchronous-unwind-tables -fPIC -pthread -fcolor-diagnostics -fme= rge-all-constants -fcrash-diagnostics-dir=3D../../tools/clang/crashreports = -mllvm -instcombine-lower-dbg-declare=3D0 -ffp-contract=3Doff -flto=3Dthin = -fsplit-lto-unit -fwhole-program-vtables -m64 -msse3 -ffile-compilation-dir= =3D. -no-canonical-prefixes -ftrivial-auto-var-init=3Dpattern -O2 -fdata-se= ctions -ffunction-sections -fno-unique-section-names -fno-omit-frame-pointe= r -gdwarf-4 -g2 -gdwarf-aranges -ggnu-pubnames -Xclang -fuse-ctor-homing -f= sanitize=3Dcfi-vcall -fsanitize-ignorelist=3D../../tools/cfi/ignores.txt -f= sanitize=3Dcfi-icall -fvisibility=3Dhidden -Wheader-hygiene -Wstring-conver= sion -Wtautological-overlap-compare -I/gnu/store/jppi8qal1yrw6q6fn4kv04swwb= 70s50c-glib-2.72.3/include/glib-2.0 -I/gnu/store/jppi8qal1yrw6q6fn4kv04swwb= 70s50c-glib-2.72.3/lib/glib-2.0/include -DPROTOBUF_ALLOW_DEPRECATED=3D1 -st= d=3Dc++20 -Wno-trigraphs -gsimple-template-names -fno-exceptions -fno-rtti = -fvisibility-inlines-hidden -c ../../sql/recover_module/module.cc -o obj/sq= l/sql/module.o In file included from ../../sql/recover_module/module.cc:18: =2E./../sql/recover_module/cursor.h:66:5: error: static assertion failed du= e to requirement 'std::is_standard_layout::val= ue': needed for the reinterpret_cast below static_assert(std::is_standard_layout::value, ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. [18305/52515] CXX obj/sql/sql/pager.o [18306/52515] CXX obj/sql/sql/parsing.o ninja: build stopped: subcommand failed. error: in phase 'build': uncaught exception: %exception #<&invoke-error program: "ninja" arguments: ("-C" "out/Release" = "-j" "4" "chrome" "chromedriver") exit-status: 1 term-signal: #f stop-signa= l: #f>=20 phase `build' failed after 6785.3 seconds command "ninja" "-C" "out/Release" "-j" "4" "chrome" "chromedriver" failed = with status 1 builder for `/gnu/store/mainrdainjqmcym7vy771bdl2vqc7gml-ungoogled-chromium= -109.0.5414.119-1.drv' failed with exit code 1 build of /gnu/store/mainrdainjqmcym7vy771bdl2vqc7gml-ungoogled-chromium-109= =2E0.5414.119-1.drv failed View build log at '/var/log/guix/drvs/ma/inrdainjqmcym7vy771bdl2vqc7gml-ung= oogled-chromium-109.0.5414.119-1.drv.gz'. --YbTF7S2DnmPnoGWU Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="0001-gnu-ungoogled-chromium-Fix-openjpeg-include-path.patch" Content-Transfer-Encoding: 8bit >From 8203c9d425d5e154d33103cf789a03ff3d4de366 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 20 Feb 2023 21:17:48 +0100 Subject: [PATCH] gnu: ungoogled-chromium: Fix openjpeg include path. * gnu/packages/chromium.scm (%debian-revision): Move to a later release for Debian patches. (%ungoogled-origin): Update hash accordingly. --- gnu/packages/chromium.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index e321ae3fe6..de6b7222a8 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019-2023 Marius Bakke ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2023 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -318,7 +319,9 @@ (define %blacklisted-files (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 %debian-revision "debian/103.0.5060.53-1") + ;; This is the first release supporting openjpeg@2.5 in openjpeg.patch; + ;; it still includes jsoncpp.patch, which also appears to be needed. (define %arch-revision "a0b214b3bdfbc7ee3d9004a70494a2b9e3da2c80") (define %ungoogled-origin @@ -342,7 +345,7 @@ (define %debian-origin ((_ version) version)))) (sha256 (base32 - "1ln6r1qzlr7dsgvcbssvvc34my4mpkwv9hmvlb2dhjncs7isp65j")))) + "0bmbp1y0cykcbjhvsk330d11f7qnwmapcwxv76vdbl8cjfb6h60w")))) (define (origin-file origin file) (computed-file -- 2.39.1 --YbTF7S2DnmPnoGWU--