From patchwork Thu Jun 8 02:22:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 50761 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C38C027BBEA; Thu, 8 Jun 2023 03:23:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0ABD527BBE2 for ; Thu, 8 Jun 2023 03:23:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q75Im-0000bW-PN; Wed, 07 Jun 2023 22:23:04 -0400 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 1q75Ik-0000ay-Vw for guix-patches@gnu.org; Wed, 07 Jun 2023 22:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q75Ik-000420-Ns for guix-patches@gnu.org; Wed, 07 Jun 2023 22:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q75Ik-0007sJ-BH for guix-patches@gnu.org; Wed, 07 Jun 2023 22:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63952] [PATCH] gnu (hubbub): Fix build Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Jun 2023 02:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63952 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63952@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168619095330221 (code B ref -1); Thu, 08 Jun 2023 02:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Jun 2023 02:22:33 +0000 Received: from localhost ([127.0.0.1]:55249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q75IH-0007rM-31 for submit@debbugs.gnu.org; Wed, 07 Jun 2023 22:22:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:42230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q75IC-0007rB-1a for submit@debbugs.gnu.org; Wed, 07 Jun 2023 22:22:31 -0400 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 1q75IB-0000Xd-PQ for guix-patches@gnu.org; Wed, 07 Jun 2023 22:22:27 -0400 Received: from mail-oi1-x234.google.com ([2607:f8b0:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q75I9-0003vq-Sn for guix-patches@gnu.org; Wed, 07 Jun 2023 22:22:27 -0400 Received: by mail-oi1-x234.google.com with SMTP id 5614622812f47-39aa8256db7so95974b6e.0 for ; Wed, 07 Jun 2023 19:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686190944; x=1688782944; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=SDJS93ZffqpBRC/TlxJ/5sfgsgDu56Ib0iww/cYJxaA=; b=RTvgr5cgiXUusRvpaTtg9Tnu/DUO/0AtT7b+GABjXdoDiSBbwFU363roStVZFFuJ2h Q9mbhLhFLnHTLfOsto5YxGcku9MaqnjBPTZNAGL3jZppG7oYg4yL6+FUnxVyFtZLZJVM n3humyTco1/l42FilpqABbUyrW1N8JKRv3sOEXkU0AcrRnPsENi408j0DLPa7w9ORuOP urCXH+mRBITIzCv8p9FYKT5/sIzk5Zkt0iis6g6OOjzvZGKn+JY343AXxyD7LFoV0w3W oeLqFt2H+g8k/aNLqWyECMtgQGNYk9xHBcOG0MAyNBl1P7aC0N11+vxCwsN5szPhLaYS ipSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686190944; x=1688782944; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SDJS93ZffqpBRC/TlxJ/5sfgsgDu56Ib0iww/cYJxaA=; b=PWG7zXPBd7dKHS50ISGo2PUylb45jNKADbZKup9SAFJmauiQTGOFzzvkpU+e/EXl2H UKa5ahIUTvxy63RL+uvN9bpHC7Vrmy42mCGn2h4dGzOIcq6qpdFV5QfSK3EpcE43BC5V 1AnpZ4PlaznuikuZSDKrC+qN7NzdFW4m+vU1S5SJMEs/8Q5r0UK5OZCU5I8BY1NAz3I1 NuA56/Ti7ld7ZlEmcGFR/zs61j1gQ+GzHM37Jx+mTqlHTya2H4f194wAs0rxTOvknvnA DmtLRoMNVPSmKh48VN+ee/bAwxKxuPSlf0+ajve06Z7MCrP1oTLRF6wFz2+0Nysf55hF 9r3A== X-Gm-Message-State: AC+VfDxh/qNJyyhnr6DVIwoLbhjQigimDE/kVPsY3DYiExT3JCK4zRto oLqbtWXqXTsx3Vrt7IiiLUFHuJMWHqk= X-Google-Smtp-Source: ACHHUZ7/zGGZvhWVbWXRJhMztbecz46yzJTLbrM/zQO3qDwdfsZDDlj/IcQ6W+nsdubgf7vjzESHfw== X-Received: by 2002:a05:6808:911:b0:398:59be:99a2 with SMTP id w17-20020a056808091100b0039859be99a2mr7032744oih.32.1686190943898; Wed, 07 Jun 2023 19:22:23 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id b16-20020a17090a551000b0024e026444b6sm3877152pji.2.2023.06.07.19.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 19:22:23 -0700 (PDT) From: Andy Tai Date: Wed, 7 Jun 2023 19:22:20 -0700 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::234; envelope-from=lichengtai@gmail.com; helo=mail-oi1-x234.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Fix for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63526 * gnu/packages/web.scm (hubbub): [source](patches): Add patch to fix build. * gnu/packages/patches/hubbub-prevent-Werror-maybe-uninitialized-build-failure-wit.patch: New file * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 2 + ...aybe-uninitialized-build-failure-wit.patch | 40 +++++++++++++++++++ gnu/packages/web.scm | 4 +- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/hubbub-prevent-Werror-maybe-uninitialized-build-failure-wit.patch base-commit: e8f9fb3e03ea8fee0e13f13706a6b16414f74a7b diff --git a/gnu/local.mk b/gnu/local.mk index 254037a3af..099e653707 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -58,6 +58,7 @@ # Copyright © 2022 jgart # Copyright © 2023 Zheng Junjie <873216071@qq.com> # Copyright © 2023 Ivana Drazovic +# Copyright © 2023 Andy Tai # # This file is part of GNU Guix. # @@ -1353,6 +1354,7 @@ dist_patch_DATA = \ %D%/packages/patches/http-parser-CVE-2020-8287.patch \ %D%/packages/patches/htslib-for-stringtie.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ + %D%/packages/patches/hubbub-prevent-Werror-maybe-uninitialized-build-failure-wit.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ %D%/packages/patches/hurd-add-without-rump-configure-option.patch \ %D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch \ diff --git a/gnu/packages/patches/hubbub-prevent-Werror-maybe-uninitialized-build-failure-wit.patch b/gnu/packages/patches/hubbub-prevent-Werror-maybe-uninitialized-build-failure-wit.patch new file mode 100644 index 0000000000..6f289a770e --- /dev/null +++ b/gnu/packages/patches/hubbub-prevent-Werror-maybe-uninitialized-build-failure-wit.patch @@ -0,0 +1,40 @@ +From 69d81a8a4d4c223aad67cde0fdf64d64351b9802 Mon Sep 17 00:00:00 2001 +From: Andy Tai +Date: Sat, 27 May 2023 00:01:34 -0700 +Subject: [PATCH] prevent -Werror=maybe-uninitialized build failure with gcc 11 + when building tests tokeniser2 and tokeniser3 + +--- + test/tokeniser2.c | 2 +- + test/tokeniser3.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/tokeniser2.c b/test/tokeniser2.c +index c8ab9c0..4caae38 100644 +--- a/test/tokeniser2.c ++++ b/test/tokeniser2.c +@@ -438,7 +438,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) + /* Expected token only contained part of the data + * Calculate how much is left, then try again with + * the next expected token */ +- hubbub_token t; ++ hubbub_token t = { 0 }; + + t.type = HUBBUB_TOKEN_CHARACTER; + t.data.character.ptr += len; +diff --git a/test/tokeniser3.c b/test/tokeniser3.c +index e33d018..b3be901 100644 +--- a/test/tokeniser3.c ++++ b/test/tokeniser3.c +@@ -447,7 +447,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) + /* Expected token only contained part of the data + * Calculate how much is left, then try again with + * the next expected token */ +- hubbub_token t; ++ hubbub_token t = { 0 }; + + t.type = HUBBUB_TOKEN_CHARACTER; + t.data.character.ptr += len; +-- +2.40.1 + diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3af4aa0b8d..387ceac058 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5242,7 +5242,9 @@ (define-public hubbub (sha256 (base32 "1dimfyblmym98qa1b80c5jslv2zk8r44xbdrgrsrw1n9wr9y4yly")) - (patches (search-patches "hubbub-sort-entities.patch")))) + (patches (search-patches + "hubbub-sort-entities.patch" + "hubbub-prevent-Werror-maybe-uninitialized-build-failure-wit.patch")))) (build-system gnu-build-system) (native-inputs (list netsurf-buildsystem