unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Kei Kebreau <kkebreau@posteo.net>
To: 36905-done@debbugs.gnu.org
Subject: bug#36905: [PATCH] gnu: gnome-control-center: Fix info-overview panel issues.
Date: Wed, 21 Aug 2019 11:30:07 -0400	[thread overview]
Message-ID: <87ef1etu2o.fsf@posteo.net> (raw)
In-Reply-To: <20190803124301.14920-1-kkebreau@posteo.net> (Kei Kebreau's message of "Sat, 3 Aug 2019 08:43:01 -0400")

Kei Kebreau <kkebreau@posteo.net> writes:

> 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)

Pushed to master as 64c70430ec80c93faff6139fdb9d3de92704b81e.

      reply	other threads:[~2019-08-21 15:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-03 12:43 [bug#36905] [PATCH] gnu: gnome-control-center: Fix info-overview panel issues Kei Kebreau
2019-08-21 15:30 ` Kei Kebreau [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87ef1etu2o.fsf@posteo.net \
    --to=kkebreau@posteo.net \
    --cc=36905-done@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).