diff options
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 252 |
1 files changed, 116 insertions, 136 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe20a9fa20..5cb577270b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -977,30 +977,30 @@ cloud integration is offered through GNOME Online Accounts.") `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))))))))) (native-inputs - `(("desktop-file-utils" ,desktop-file-utils) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("itstools" ,itstool) - ("pkg-config" ,pkg-config))) + (list desktop-file-utils + gettext-minimal + `(,glib "bin") + gobject-introspection + `(,gtk+ "bin") + itstool + pkg-config)) (inputs - `(("gnome-online-accounts:lib" ,gnome-online-accounts "lib") - ("grilo" ,grilo) - ("grilo-plugins" ,grilo-plugins) - ("gst-plugins-base" ,gst-plugins-base) - ("gst-plugins-good" ,gst-plugins-good) - ("gstreamer" ,gstreamer) - ("gvfs" ,gvfs) - ("json-glib" ,json-glib) - ("libdazzle" ,libdazzle) - ("libmediaart" ,libmediaart) - ("libsoup" ,libsoup-minimal-2) - ("pycairo" ,python-pycairo) - ("pygobject" ,python-pygobject) - ("python" ,python) - ("tracker" ,tracker) - ("tracker-miners" ,tracker-miners))) + (list `(,gnome-online-accounts "lib") + grilo + grilo-plugins + gst-plugins-base + gst-plugins-good + gstreamer + gvfs + json-glib + libdazzle + libmediaart + libsoup-minimal-2 + python-pycairo + python-pygobject + python + tracker + tracker-miners)) (synopsis "Simple music player for GNOME desktop") (description "GNOME Music is the new GNOME music playing application that aims to combine an elegant and immersive browsing experience with simple @@ -3121,7 +3121,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.") (define-public glade3 (package (name "glade") - (version "3.38.2") + (version "3.40.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3129,68 +3129,56 @@ API add-ons to make GTK+ widgets OpenGL-capable.") name "-" version ".tar.xz")) (sha256 (base32 - "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q")) - (patches (search-patches - "glade-gls-set-script-name.patch" - "glade-test-widget-null-icon.patch")))) + "171x7vshhw0nqgnhkcaqfylpr5qrmhclwmkva6wjm5s9m2pavj9i")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. - (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")))) - ,@(if (this-package-native-input "gjs") - '() - '((add-after 'unpack 'skip-gjs-test - (lambda _ - ;; When the optional dependency on GJS is missing, skip - ;; the GJS plugin tests. - (substitute* "tests/modules.c" - (("g_test_add.*JavaScript.*" all) - (string-append "// " all "\n"))) - (delete-file "tests/catalogs/gjsplugin.xml"))))) - - (add-before 'configure 'fix-docbook - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "man/meson.build" - (("http://docbook.sourceforge.net/release/xsl/\ -current/manpages/docbook.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl"))))) - (add-before 'check 'pre-check - (lambda _ - (setenv "HOME" "/tmp") - ;; Tests require a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1")))))) + #$@(if (this-package-input "gjs") + '() + '((add-after 'unpack 'skip-gjs-test + (lambda _ + ;; When the optional dependency on GJS is missing, skip + ;; the GJS plugin tests. + (substitute* "tests/modules.c" + (("g_test_add.*JavaScript.*" all) + (string-append "// " all "\n"))) + (delete-file "tests/catalogs/gjsplugin.xml"))))) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" "/tmp") + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1")))))) (inputs - (list gtk+ libxml2)) - (native-inputs - `(("hicolor-icon-theme" ,hicolor-icon-theme) - ("intltool" ,intltool) - ("itstool" ,itstool) - ("libxslt" ,libxslt) ;for xsltproc - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl) - ("glib:bin" ,glib "bin") - ("python" ,python) - ("python-pygobject" ,python-pygobject) - ("gobject-introspection" ,gobject-introspection) - - ;; GJS depends on Rust, which is x86_64-only so far, so remove the GJS - ;; dependency on other platforms (FIXME). - ,@(if (target-x86-64?) - `(("gjs" ,gjs)) - '()) - - ("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server-for-tests))) + (append + ;; GJS depends on Rust, which is x86_64-only so far, so remove the GJS + ;; dependency on other platforms (FIXME). + (if (target-x86-64?) + (list gjs) + '()) + (list gtk+ libxml2))) + (native-inputs + (list docbook-xml-4.2 + docbook-xsl + gettext-minimal + `(,glib "bin") + gobject-introspection + hicolor-icon-theme + itstool + libxml2 ;for XML_CATALOG_FILES + libxslt ;for xsltproc + python + python-pygobject + pkg-config + xorg-server-for-tests)) (home-page "https://glade.gnome.org") (synopsis "GTK+ rapid application development tool") (description "Glade is a rapid application development (RAD) tool to @@ -8202,7 +8190,7 @@ Cisco's AnyConnect SSL VPN.") (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.22.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/network-manager-applet/" @@ -8210,18 +8198,18 @@ Cisco's AnyConnect SSL VPN.") "network-manager-applet-" version ".tar.xz")) (sha256 (base32 - "1gj6lqqi613j2m49v9i82lqg1rv7kwwc8z4nxjcwpaa0ins803f7")))) + "17742kgmbj9w545zwnirgr0i40zl0xzp8jx7b8c1krp93mc4h0sw")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t #:configure-flags '("-Dappindicator=yes"))) (native-inputs - `(("intltool" ,intltool) - ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("pkg-config" ,pkg-config))) + (list gettext-minimal + `(,glib "bin") ; for glib-compile-resources, etc. + gobject-introspection + gtk-doc/stable + pkg-config)) (propagated-inputs ;; libnm-gtk.pc refers to all these. (list dbus-glib gtk+ network-manager @@ -8875,7 +8863,7 @@ like switching to windows and launching applications.") (define-public gtk-vnc (package (name "gtk-vnc") - (version "1.0.0") + (version "1.2.0") (source (origin (method url-fetch) @@ -8884,36 +8872,38 @@ like switching to windows and launching applications.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8")))) + (base32 "0jmr6igyzcj2wmx5v5ywaazvdz3hx6a6rys26yb4l4s71l281bvs")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(;; GJS depends on Rust, which is x86_64-only so far, so remove the GJS - ;; dependency on other platforms (FIXME). - ,@(if (target-x86-64?) - `(("gjs" ,gjs)) - '()) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool) - ("node" ,node) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("vala" ,vala))) + (append + ;; GJS depends on Rust, which is x86_64-only so far, so remove the GJS + ;; dependency on other platforms (FIXME). + (if (target-x86-64?) + (list gjs) + '()) + (list gettext-minimal + `(,glib "bin") + gobject-introspection + node + perl + pkg-config + python-wrapper + vala))) (inputs - `(("cairo" ,cairo) - ("librsvg" ,(librsvg-for-system)) - ("glib" ,glib) - ("gnutls" ,gnutls) - ("libgcrypt" ,libgcrypt) - ("libsasl" ,cyrus-sasl) - ("pulseaudio" ,pulseaudio) - ("x11" ,libx11) - ("zlib" ,zlib))) + (list cairo (librsvg-for-system))) (propagated-inputs - (list gtk+)) + ;; These are all in Requires or Requires.private of the .pc files. + (list cyrus-sasl + gdk-pixbuf + glib + gnutls + gtk+ + libgcrypt + libx11 + pulseaudio + zlib)) (synopsis "VNC client viewer widget for GTK+") (description "GTK-VNC is a project providing client side APIs for the RFB protocol / VNC remote desktop technology. It is built using coroutines allowing @@ -10749,7 +10739,7 @@ photo-booth-like software, such as Cheese.") (define-public cheese (package (name "cheese") - (version "3.38.0") + (version "41.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -10757,8 +10747,7 @@ photo-booth-like software, such as Cheese.") version ".tar.xz")) (sha256 (base32 - "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8")) - (patches (search-patches "cheese-vala-update.patch")))) + "1y92glc0d6w323x2bdbc0gdh1jdffvkbv6cwlwm1rx0wgvv1svqh")))) (arguments `(#:glib-or-gtk? #t ;; Tests require GDK. @@ -10771,15 +10760,6 @@ photo-booth-like software, such as Cheese.") (substitute* "meson_post_install.py" (("gtk-update-icon-cache") (which "true"))) #t)) - (add-after 'unpack 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - ;; Avoid a network connection attempt during the build. - (substitute* '("docs/reference/cheese.xml" - "docs/reference/cheese-docs.xml") - (("http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd"))) - #t)) (add-after 'install 'wrap-cheese (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -10789,16 +10769,16 @@ photo-booth-like software, such as Cheese.") #t))))) (build-system meson-build-system) (native-inputs - `(("docbook-xsl" ,docbook-xsl) - ("docbook-xml" ,docbook-xml-4.3) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc/stable) - ("itstool" ,itstool) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("pkg-config" ,pkg-config) - ("vala" ,vala))) + (list docbook-xsl + docbook-xml-4.3 + gettext-minimal + `(,glib "bin") + gtk-doc/stable + itstool + libxml2 + libxslt + pkg-config + vala)) (propagated-inputs (list gnome-video-effects clutter |