From patchwork Sat Aug 3 12:43:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 14821 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 7A6B917298; Sat, 3 Aug 2019 13:44:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 35D9A17264 for ; Sat, 3 Aug 2019 13:44:23 +0100 (BST) Received: from localhost ([::1]:39954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1httOY-0002JV-QM for patchwork@mira.cbaines.net; Sat, 03 Aug 2019 08:44:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58347) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1httOH-0002Gr-G6 for guix-patches@gnu.org; Sat, 03 Aug 2019 08:44:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1httOF-0002pz-Gg for guix-patches@gnu.org; Sat, 03 Aug 2019 08:44:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49657) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1httOE-0002pd-8S for guix-patches@gnu.org; Sat, 03 Aug 2019 08:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1httOE-0005MM-4o for guix-patches@gnu.org; Sat, 03 Aug 2019 08:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36905] [PATCH] gnu: gnome-control-center: Fix info-overview panel issues. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Aug 2019 12:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36905@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156483619720542 (code B ref -1); Sat, 03 Aug 2019 12:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Aug 2019 12:43:17 +0000 Received: from localhost ([127.0.0.1]:58478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1httNU-0005LG-Lb for submit@debbugs.gnu.org; Sat, 03 Aug 2019 08:43:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:55693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1httNS-0005L6-Dy for submit@debbugs.gnu.org; Sat, 03 Aug 2019 08:43:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58270) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1httNR-000283-B6 for guix-patches@gnu.org; Sat, 03 Aug 2019 08:43:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1httNQ-0002gS-Cj for guix-patches@gnu.org; Sat, 03 Aug 2019 08:43:13 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52719) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1httNP-0002fk-QO for guix-patches@gnu.org; Sat, 03 Aug 2019 08:43:12 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 58EAD2400FC for ; Sat, 3 Aug 2019 14:43:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1564836189; bh=htOoJADq/6SEP16nTeVNCopRs93lBiSArOTfGqysN2g=; h=From:To:Cc:Subject:Date:From; b=Yv5zQQNRzfL6pOjLuxMsWoaQXs3BPFuS4mjjkT8aYal3PIq0IAvaL6oNJzydFjIrH t6mM6HcK2jY/ki7Pg2P6VXeJOLy1CG4mkW55yCNDXZKzGFsCwIx3YHFXOKM+7ElQxS 90jgiAs9korEPgEH6a0gWi5RLSiBjQqqI3vDpvEkpXDrddhivAJ42XjyzaJHarGJ1E lcGCZghav3c/BNkl8NoIJALO7klGWd38g/hguxM11lMnIlb4OVC+w/5o5r5vh0C9yY n1D6lFEabo1DzWPxd01eu1TiVgFz5b25241cON3PTSFsuVHUz4SSel83Hkuess7sYL hPHH9S/jhfL7w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4613bb6RtSz9rxT; Sat, 3 Aug 2019 14:43:07 +0200 (CEST) From: Kei Kebreau Date: Sat, 3 Aug 2019 08:43:01 -0400 Message-Id: <20190803124301.14920-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kei Kebreau Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches GNOME Control Center should now display the correct GNOME version and graphics information in the "Details > About" panel. * gnu/packages/gnome.scm (gnome-control-center)[arguments]: Add configure flag. Adjust 'patch-paths' phase accordingly. [inputs]: Add gnome-session. --- gnu/packages/gnome.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3f7bbac214..72b88c73c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5915,7 +5915,10 @@ devices using the GNOME desktop.") (arguments '(#:glib-or-gtk? #t #:configure-flags - (list "-Dcheese=false") + (list "-Dcheese=false" + (string-append "-Dgnome_session_libexecdir=" + (assoc-ref %build-inputs "gnome-session") + "/libexec")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-paths @@ -5923,7 +5926,8 @@ devices using the GNOME desktop.") (let ((libc (assoc-ref inputs "libc")) (tzdata (assoc-ref inputs "tzdata")) (libgnomekbd (assoc-ref inputs "libgnomekbd")) - (nm-applet (assoc-ref inputs "network-manager-applet"))) + (nm-applet (assoc-ref inputs "network-manager-applet")) + (gnome-desktop (assoc-ref inputs "gnome-desktop"))) (substitute* "panels/datetime/tz.h" (("/usr/share/zoneinfo/zone.tab") (string-append tzdata "/share/zoneinfo/zone.tab"))) @@ -5943,6 +5947,10 @@ devices using the GNOME desktop.") (substitute* '("panels/user-accounts/run-passwd.c") (("/usr/bin/passwd") "/run/setuid-programs/passwd")) + (substitute* "panels/info/cc-info-overview-panel.c" + (("DATADIR \"/gnome/gnome-version.xml\"") + (string-append "\"" gnome-desktop + "/share/gnome/gnome-version.xml\""))) #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. @@ -5962,6 +5970,7 @@ devices using the GNOME desktop.") ("gnome-desktop" ,gnome-desktop) ("gnome-online-accounts" ,gnome-online-accounts) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + ("gnome-session" ,gnome-session) ("gnome-settings-daemon" ,gnome-settings-daemon) ("grilo" ,grilo) ("ibus" ,ibus)