From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:59577) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iQiTS-0007r8-S6 for guix-patches@gnu.org; Fri, 01 Nov 2019 21:45:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iQiTR-0001eZ-Ic for guix-patches@gnu.org; Fri, 01 Nov 2019 21:45:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49035) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iQiTR-0001eK-EP for guix-patches@gnu.org; Fri, 01 Nov 2019 21:45:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iQiTR-000897-AB for guix-patches@gnu.org; Fri, 01 Nov 2019 21:45:05 -0400 Subject: [bug#38029] [PATCH 12/80] gnu: gnome-desktop: Update to 3.32.2. Resent-Message-ID: From: Kei Kebreau Date: Fri, 1 Nov 2019 21:43:41 -0400 Message-Id: <20191102014348.3191-3-kkebreau@posteo.net> In-Reply-To: <20191102014348.3191-1-kkebreau@posteo.net> References: <20191102014348.3191-1-kkebreau@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38029@debbugs.gnu.org Cc: Kei Kebreau * 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