From 2a9761b13b44032f8d902e0fcfecd0659cbfa8c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 00:00:46 +0200 Subject: gnu: totem: Don't use NAME in source URI. * gnu/packages/gnome.scm (totem)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1745bf7906..03de03559d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4889,9 +4889,9 @@ discovery protocols.") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/totem/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "totem-" version ".tar.xz")) (sha256 (base32 "028sc6xbyi7rs884862d8f3di6zhcm0lhvlpc3r69ifzjsq9my3b")))) -- cgit v1.2.3 From 187d02cd437ae9e6d2a67e56c82502c6feea73cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 00:14:37 +0200 Subject: gnu: totem: Remove python-pylint native input. It's optional & runs a pointless lint check that fails with pylint 2.5. * gnu/packages/gnome.scm (totem)[native-inputs]: Remove python-pylint. --- gnu/packages/gnome.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 03de03559d..fe71e316f3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4904,7 +4904,6 @@ discovery protocols.") ("intltool" ,intltool) ("itstool" ,itstool) ("xmllint" ,libxml2) - ("python-pylint" ,python-pylint) ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs `(("dconf" ,dconf))) -- cgit v1.2.3 From 53c41e958ffe2d7f8f58d70ab8f5ef6518484b3e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 21:56:33 -0500 Subject: gnu: libsoup: Add the missing PHP dependency. * gnu/packages/gnome.scm (libsoup)[native-inputs]: Add php. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe71e316f3..fa9a8fc168 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -145,6 +145,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages photo) + #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages popt) @@ -3718,8 +3719,7 @@ libxml to ease remote use of the RESTful API.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("vala" ,vala) - ;; These are needed for the tests. - ;; FIXME: Add PHP once available. + ("php" ,php) ("curl" ,curl) ("gnutls" ,gnutls) ;for 'certtool' ("httpd" ,httpd))) -- cgit v1.2.3 From 43b6b45e7be8cc25eba9f606015bee9653730b43 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 21:57:33 -0500 Subject: gnu: Add libsoup-minimal. * gnu/packages/gnome.scm (libsoup-minimal): New variable. --- gnu/packages/gnome.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fa9a8fc168..6d0f7fe2a4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -183,6 +183,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu artwork) + #:use-module ((guix build utils) #:select (modify-phases)) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) @@ -3741,6 +3742,22 @@ libxml to ease remote use of the RESTful API.") and the GLib main loop, to integrate well with GNOME applications.") (license license:lgpl2.0+))) + +;;; A minimal version of libsoup used to prevent a cycle with Inkscape. +(define-public libsoup-minimal + (package + (inherit libsoup) + (name "libsoup-minimal") + (outputs (delete "doc" (package-outputs libsoup))) + (arguments + (substitute-keyword-arguments (package-arguments libsoup) + ((#:configure-flags configure-flags) + `(delete "-Dgtk_doc=true" ,configure-flags)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'move-doc))))) + (native-inputs (alist-delete "gtk-doc" (package-native-inputs libsoup))))) + (define-public libsecret (package (name "libsecret") -- cgit v1.2.3 From 88e61bd4a4e14061f194b4e883ee6af8850ecb1f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jan 2020 23:01:24 -0500 Subject: gnu: Add gdl. * gnu/packages/gnome.scm (gdl): New variable. --- gnu/packages/gnome.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6d0f7fe2a4..c5e0959b23 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1501,6 +1501,53 @@ accessing key stores. It also provides the viewer for crypto files on the GNOME Desktop.") (license license:lgpl2.1+))) +(define-public gdl + (package + (name "gdl") + (version "3.34.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/gdl.git") + (commit (string-append "GDL_" (string-map (match-lambda + (#\. #\_) + (c c)) + version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + ;; The autogen.sh script in gnome-common will run ./configure + ;; by default, which is problematic because source shebangs + ;; have not yet been patched. + (setenv "NOCONFIGURE" "t") + (invoke "sh" "autogen.sh")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("gnome-common" ,gnome-common) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("which" ,which))) + (inputs + `(("libxml2" ,libxml2))) + (propagated-inputs + ;; The gdl-3.0.pc file 'Requires' GTK+. + `(("gtk+" ,gtk+))) + (home-page "https://gitlab.gnome.org/GNOME/gdl/") + (synopsis "GNOME docking library") + (description "This library provides docking features for gtk+.") + (license license:lgpl2.1+))) + (define-public libgnome-keyring (package (name "libgnome-keyring") -- cgit v1.2.3 From ca3adf26072c759b198042ced866efc423dd4b97 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jan 2020 23:01:59 -0500 Subject: gnu: Add gdl-minimal. * gnu/packages/gnome.scm (gdl-minimal): New variable. --- gnu/packages/gnome.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c5e0959b23..da69f1bdeb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1548,6 +1548,27 @@ GNOME Desktop.") (description "This library provides docking features for gtk+.") (license license:lgpl2.1+))) +;;; A minimal variant used to break a cycle with Inkscape. +(define-public gdl-minimal + (package + (inherit gdl) + (name "gdl-minimal") + (arguments + (substitute-keyword-arguments (package-arguments gdl) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'disable-doc-generation + ;; XXX: There is no easy way to disable generating the + ;; documentation. + (lambda _ + (substitute* "configure.in" + (("GTK_DOC_CHECK.*") "") + (("docs/.*") "")) + (substitute* "Makefile.am" + (("gdl docs po") "gdl po")) + #t)))))) + (native-inputs (alist-delete "gtk-doc" (package-native-inputs gdl))))) + (define-public libgnome-keyring (package (name "libgnome-keyring") -- cgit v1.2.3 From 70cf011390d92e44877502bc5765a3c87834dac2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 1 Jun 2020 08:44:21 +0300 Subject: gnu: gdl: Don't use custom bootstrap phase. * gnu/packages/gnome.scm (gdl)[arguments]: Remove custom boostrap phase. (gdl-minimal)[arguments]: Don't inherit arguments from gdl. --- gnu/packages/gnome.scm | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da69f1bdeb..2be117d21b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1518,16 +1518,6 @@ GNOME Desktop.") (base32 "154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna")))) (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - ;; The autogen.sh script in gnome-common will run ./configure - ;; by default, which is problematic because source shebangs - ;; have not yet been patched. - (setenv "NOCONFIGURE" "t") - (invoke "sh" "autogen.sh")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -1554,19 +1544,18 @@ GNOME Desktop.") (inherit gdl) (name "gdl-minimal") (arguments - (substitute-keyword-arguments (package-arguments gdl) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'disable-doc-generation - ;; XXX: There is no easy way to disable generating the - ;; documentation. - (lambda _ - (substitute* "configure.in" - (("GTK_DOC_CHECK.*") "") - (("docs/.*") "")) - (substitute* "Makefile.am" - (("gdl docs po") "gdl po")) - #t)))))) + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-doc-generation + ;; XXX: There is no easy way to disable generating the + ;; documentation. + (lambda _ + (substitute* "configure.in" + (("GTK_DOC_CHECK.*") "") + (("docs/.*") "")) + (substitute* "Makefile.am" + (("gdl docs po") "gdl po")) + #t))))) (native-inputs (alist-delete "gtk-doc" (package-native-inputs gdl))))) (define-public libgnome-keyring -- cgit v1.2.3 From 415b90f24ee83059102f5fb0ce74a2bc0954fe58 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Tue, 2 Jun 2020 21:32:32 +0200 Subject: gnu: network-manager-applet: Propagate 'libnma'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/gnome.scm (network-manager-applet)[inputs]: Move 'libnma' to … [propagated-inputs]: … here. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2be117d21b..7335dc1cd6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6807,10 +6807,11 @@ Cisco's AnyConnect SSL VPN.") ;; libnm-gtk.pc refers to all these. `(("dbus-glib" ,dbus-glib) ("gtk+" ,gtk+) - ("network-manager" ,network-manager))) + ("network-manager" ,network-manager) + ;; nm-applet need by org.gnome.nm-applet.gschema.xml + ("libnma" ,libnma))) (inputs `(("gcr" ,gcr) - ("libnma" ,libnma) ("libgudev" ,libgudev) ("libnotify" ,libnotify) ("libsecret" ,libsecret) -- cgit v1.2.3 From 6f64a05ec920ed46a845ad399546170988d2e05d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:16:36 +0200 Subject: gnu: evince: Update to 3.36.1. * gnu/packages/gnome.scm (evince): Update to 3.36.1. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7335dc1cd6..6bcc36dec5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1668,7 +1668,7 @@ forgotten when the session ends.") (define-public evince (package (name "evince") - (version "3.34.2") + (version "3.36.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evince/" @@ -1676,7 +1676,7 @@ forgotten when the session ends.") "evince-" version ".tar.xz")) (sha256 (base32 - "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w")))) + "1msbb66lasikpfjpkwsvi7h22hqmk275850ilpdqwbd0b39vzf4c")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus" "--enable-introspection") @@ -1726,8 +1726,7 @@ forgotten when the session ends.") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("xmllint" ,libxml2))) - (home-page - "https://www.gnome.org/projects/evince/") + (home-page "https://www.gnome.org/projects/evince/") (synopsis "GNOME's document viewer") (description "Evince is a document viewer for multiple document formats. It -- cgit v1.2.3 From 2bf0a5cbae96adfe97de5903f620d441a3106c07 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:17:40 +0200 Subject: gnu: geoclue: Update to 2.5.6. * gnu/packages/gnome.scm (geoclue): Update to 2.5.6. --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6bcc36dec5..592cab0b49 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4124,7 +4124,7 @@ output devices.") (define-public geoclue (package (name "geoclue") - (version "2.5.5") + (version "2.5.6") (source (origin (method url-fetch) @@ -4132,8 +4132,7 @@ output devices.") (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" version "/geoclue-" version ".tar.bz2")) (sha256 - (base32 - "1b7jqrsn4x7mxjxj8hvb2dl2cmhrpb9vibs4rvkkanky5nsx3sai")) + (base32 "0a833x5apzabxj80ywvsh8crd635vni2i9v9c1p095f6hvmfc45k")) (patches (search-patches "geoclue-config.patch")))) (build-system meson-build-system) (arguments -- cgit v1.2.3