unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Kei Kebreau <kkebreau@posteo.net>
To: 38029@debbugs.gnu.org
Cc: Kei Kebreau <kkebreau@posteo.net>
Subject: [bug#38029] [PATCH 12/80] gnu: gnome-desktop: Update to 3.32.2.
Date: Fri,  1 Nov 2019 21:43:41 -0400	[thread overview]
Message-ID: <20191102014348.3191-3-kkebreau@posteo.net> (raw)
In-Reply-To: <20191102014348.3191-1-kkebreau@posteo.net>

* gnu/packages/gnome.scm (gnome-desktop): Update to 3.32.2.
[build-system]: Use meson-build-system.
[arguments]: Add 'pre-check' phase.
[native-inputs]: Add glib:bin, glibc-locales and xorg-server-for-tests.
[inputs]: Move iso-codes, libseccomp, libx11 and xkeyboard-config...
[propagated-inputs]: ...here.
---
 gnu/packages/gnome.scm | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5b0448c87c..ae3a064334 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -470,7 +470,7 @@ commonly used macros.")
 (define-public gnome-desktop
   (package
     (name "gnome-desktop")
-    (version "3.30.2")
+    (version "3.32.2")
     (source
      (origin
       (method url-fetch)
@@ -479,8 +479,8 @@ commonly used macros.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-        "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal"))))
-    (build-system gnu-build-system)
+        "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9"))))
+    (build-system meson-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -490,27 +490,39 @@ commonly used macros.")
                (substitute* "libgnome-desktop/gnome-languages.c"
                  (("\"locale\"")
                   (string-append "\"" libc "/bin/locale\"")))
-               #t))))))
+               #t)))
+         (add-before 'check 'pre-check
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Tests require a running X server and locales.
+             (system "Xvfb :1 &")
+             (setenv "DISPLAY" ":1")
+             (setenv "GUIX_LOCPATH"
+                     (string-append (assoc-ref inputs "glibc-locales")
+                                    "/lib/locale"))
+             #t)))))
     (native-inputs
-     `(("gobject-introspection" ,gobject-introspection)
+     `(("glib:bin" ,glib "bin") ; for gdbus-codegen
+       ("glibc-locales" ,glibc-locales) ; for tests
+       ("gobject-introspection" ,gobject-introspection)
        ("itstool" ,itstool)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
-       ("xmllint" ,libxml2)))
+       ("xmllint" ,libxml2)
+       ("xorg-server" ,xorg-server-for-tests)))
     (propagated-inputs
      ;; Required by gnome-desktop-3.0.pc.
      `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("gtk+" ,gtk+)))
-    (inputs
-     `(("gdk-pixbuf" ,gdk-pixbuf)
-       ("glib" ,glib)
+       ("gtk+" ,gtk+)
        ("iso-codes" ,iso-codes)
        ("libseccomp" ,libseccomp)
        ("libx11" ,libx11)
+       ("xkeyboard-config" ,xkeyboard-config)))
+    (inputs
+     `(("gdk-pixbuf" ,gdk-pixbuf)
+       ("glib" ,glib)
        ("libxext" ,libxext)
        ("libxkbfile" ,libxkbfile)
-       ("libxrandr" ,libxrandr)
-       ("xkeyboard-config" ,xkeyboard-config)))
+       ("libxrandr" ,libxrandr)))
     (home-page "https://www.gnome.org/")
     (synopsis
      "Libgnome-desktop, gnome-about, and desktop-wide documents")
-- 
2.23.0

  parent reply	other threads:[~2019-11-02  1:45 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-02  1:39 [bug#38029] GNOME 3.32 patches Kei Kebreau
2019-11-02  1:40 ` [bug#38029] [PATCH 01/80] gnu: adwaita-icon-theme: Update to 3.32.0 Kei Kebreau
2019-11-02  1:40   ` [bug#38029] [PATCH 02/80] gnu: baobab: " Kei Kebreau
2019-11-02  1:40   ` [bug#38029] [PATCH 03/80] gnu: eog: Update to 3.32.2 Kei Kebreau
2019-11-02  1:40   ` [bug#38029] [PATCH 04/80] gnu: epiphany: Update to 3.32.3 Kei Kebreau
2019-11-02  1:40   ` [bug#38029] [PATCH 05/80] gnu: evince: Update to 3.32.0 Kei Kebreau
2019-11-02  1:40   ` [bug#38029] [PATCH 06/80] gnu: file-roller: Update to 3.32.1 Kei Kebreau
2019-11-02  1:40   ` [bug#38029] [PATCH 07/80] gnu: gedit: Update to 3.32.2 Kei Kebreau
2019-11-02  1:40   ` [bug#38029] [PATCH 08/80] gnu: gnome-backgrounds: Update to 3.32.0 Kei Kebreau
2019-11-02  1:40   ` [bug#38029] [PATCH 09/80] gnu: gnome-bluetooth: Update to 3.32.1 Kei Kebreau
2019-11-02  1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
2019-11-02  1:43   ` [bug#38029] [PATCH 11/80] gnu: gnome-icon-theme: Update home page Kei Kebreau
2019-11-02  1:43   ` Kei Kebreau [this message]
2019-11-02  1:43   ` [bug#38029] [PATCH 13/80] gnu: gnome-online-accounts: Update to 3.32.0 Kei Kebreau
2019-11-02  1:43   ` [bug#38029] [PATCH 14/80] gnu: gnome-settings-daemon: Update to 3.32.1 Kei Kebreau
2019-11-02  1:43   ` [bug#38029] [PATCH 15/80] gnu: Add python-dbusmock Kei Kebreau
2019-11-02  1:43   ` [bug#38029] [PATCH 16/80] gnu: gnome-control-center: Update to 3.32.2 Kei Kebreau
2019-11-02  1:43   ` [bug#38029] [PATCH 17/80] gnu: grilo: Update to 0.3.9 Kei Kebreau
2019-11-02  1:43   ` [bug#38029] [PATCH 18/80] gnu: tracker: Update to 2.2.2 Kei Kebreau
2019-11-02  1:43   ` [bug#38029] [PATCH 19/80] gnu: vala: Update to 0.44.6 Kei Kebreau
2019-11-02  1:56 ` [bug#38029] GNOME 3.32 patches Kei Kebreau
2019-11-02  2:06   ` Leo Famulari
2019-11-02  2:21     ` Kei Kebreau
2019-12-08 18:19 ` bug#38029: " Kei Kebreau

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=20191102014348.3191-3-kkebreau@posteo.net \
    --to=kkebreau@posteo.net \
    --cc=38029@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).