From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CXY+KbVJNGHEQAAAgWs5BA (envelope-from ) for ; Sun, 05 Sep 2021 06:38:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8vRdJLVJNGFlZAAAB5/wlQ (envelope-from ) for ; Sun, 05 Sep 2021 04:38:13 +0000 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 DF3ED174BC for ; Sun, 5 Sep 2021 06:38:12 +0200 (CEST) Received: from localhost ([::1]:50492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMjv1-0004PT-Vb for larch@yhetil.org; Sun, 05 Sep 2021 00:38:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMjus-0004PD-IE for guix-patches@gnu.org; Sun, 05 Sep 2021 00:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMjus-0000ov-8N for guix-patches@gnu.org; Sun, 05 Sep 2021 00:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMjus-0005xb-5X for guix-patches@gnu.org; Sun, 05 Sep 2021 00:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50392] [PATCH core-updates-frozen] gnu: libappindicator: Fix build for GCC 10. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Sep 2021 04:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50392@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163081663022853 (code B ref -1); Sun, 05 Sep 2021 04:38:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Sep 2021 04:37:10 +0000 Received: from localhost ([127.0.0.1]:48955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMjtx-0005wT-T3 for submit@debbugs.gnu.org; Sun, 05 Sep 2021 00:37:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:53900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMjtv-0005wL-NQ for submit@debbugs.gnu.org; Sun, 05 Sep 2021 00:37:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMjtv-0004Kz-Fw for guix-patches@gnu.org; Sun, 05 Sep 2021 00:37:03 -0400 Received: from out0.migadu.com ([2001:41d0:2:267::]:12649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMjtr-0008L5-JG for guix-patches@gnu.org; Sun, 05 Sep 2021 00:37:03 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1630816615; h=from:from: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; bh=t9GiEDs8W5NUydcK2N6PnWk8/6zRIgzUQqcueWlyMIw=; b=DGea65uJDuAfS1zvekf7oat2EC1RMoqrLHNGv2LRT9/3rm+emEsU+t4anf9j2rIWjS5Rw/ kC+jrcT4s2mb03CtLfTq0nA7mEAygNMlMZxU4RHogoXvBMyHTHJa7r2NgXHKfyLYfn5rw9 kCzSxI/pKHbJN69Z8XPKAvLy3xTUgVk= From: Sarah Morgensen Date: Sat, 4 Sep 2021 21:36:53 -0700 Message-Id: <8c337fd0c6a03ad07942a4aa1388e859c9b43af1.1630815574.git.iskarian@mgsn.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=iskarian@mgsn.dev; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630816693; 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:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=t9GiEDs8W5NUydcK2N6PnWk8/6zRIgzUQqcueWlyMIw=; b=XVGWi+IhbWwH4YDovROANJBqOGKI4bWAw4kqUQ7Wt7jGoxZNlIVxeQAbIS6zqnjUHB3+q4 Vx3jN48W2Sf1dV381RfGqsN3RfDS/0mQIXLXsET0wN4nbGnpy7z63gf1Zh9OsBqsbTm/BA mb1pTFGSI21fai5D/U+CkONODjInBso+HBntpv8lFjPzrt12UdvCVDsW7KGMv8+anjTobT akQjtvVnA9ZY5+Ut+opih88SCcPmQxoznKkzmzZktYphMfa8S60V7t232aVLz4wMf/bTdj dKy4J61lJo6e4kbxOfw6/zHof0BrcN4E2Rpodge3orBCNk8tFS4LAhdKAVv9TA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630816693; a=rsa-sha256; cv=none; b=Voxxbl13YpNTQrnCE2E44cYjA5Oipd06lDL9KCzqnSZyvY4EAUpt07yaloFTTzHHTE81E5 0cvnaVXduQsAMpIcPewSKSrUU90AF2xUlqMXRfgVvycSZWasLVzQOp2LL2ZBVe+8Wy4Eto Hlm/0oXwpvRGNDu/ynfj7V5iG1eETEj45GlQZxT7RcaAu/g8YCICl4Wmr6F3JijiQJfEUg EBpLSvwuAuoro3NYAZ+9RHaaX+WkhwPaPYhE7clGEaUxb8VOq5Pm4n5KnNu5kdXKo2Vpk7 Yq2EcBVyK9zmfm4wa1zZ5ngx3I0PmD3dAJNswJ1hCxE0C5+F8makiPnn8nH2Mw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=DGea65uJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=DGea65uJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: DF3ED174BC X-Spam-Score: -0.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: jE+BQhKOJYks * gnu/packages/freedesktop.scm (libappindicator): Add snippet to prevent declaring _PyGObject_API twice. --- I'm not entirely sure this is the correct fix (I have no expertise with pygobject), but after reading pygobject.h it's my best guess. (I'm not sure if adding -fcommon to CFLAGS would cause issues with dependents not using -fcommon, since this is a library.) I've tested this to build on x86_64. gnu/packages/freedesktop.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a7766edf04..f7972695e5 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 pineapples +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -2210,6 +2211,13 @@ useful with system integration.") "https://launchpad.net/libappindicator/" (version-major+minor version) "/" version "/+download/libappindicator-" version ".tar.gz")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix 'multiple definitions' error from GCC 10 + (substitute* "bindings/python/appindicatormodule.c" + (("^#include " all) + (string-append "#define NO_IMPORT_PYGOBJECT\n" all))))) (sha256 (base32 "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m")))) base-commit: 68dd6d809398297dc2ebef522186c9b9f2566739 -- 2.32.0