guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/05: gnu: libappindicator: Fix build for GCC 10.


From: guix-commits
Subject: 04/05: gnu: libappindicator: Fix build for GCC 10.
Date: Sun, 5 Sep 2021 05:09:51 -0400 (EDT)

glv pushed a commit to branch core-updates-frozen
in repository guix.

commit cdb63b192c0756e2cfbe2cf4336ea3670409df57
Author: Sarah Morgensen <iskarian@mgsn.dev>
AuthorDate: Sat Sep 4 21:36:53 2021 -0700

    gnu: libappindicator: Fix build for GCC 10.
    
    * gnu/packages/freedesktop.scm (libappindicator)[source]: Add snippet to
      prevent declaring _PyGObject_API twice.
    
    Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
 gnu/packages/freedesktop.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a7766ed..f797269 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -24,6 +24,7 @@
 ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; 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 <pygobject.h>" all)
+              (string-append "#define NO_IMPORT_PYGOBJECT\n" all)))))
        (sha256
         (base32
          "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]