Merge branch 'staging' into core-updates

1 files changed, 59 insertions, 16 deletions

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a0308cb036..f05da01f7a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
@@ -20,6 +20,7 @@
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -555,16 +556,15 @@ in the GNOME project.")
 (define-public at-spi2-core
   (package
    (name "at-spi2-core")
-   (version "2.32.0")
+   (version "2.32.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
                                 (version-major+minor version)  "/"
                                 name "-" version ".tar.xz"))
-            (patches (search-patches "at-spi2-core-meson-compat.patch"))
             (sha256
              (base32
-              "083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923"))))
+              "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw"))))
    (build-system meson-build-system)
    (outputs '("out" "doc"))
    (arguments
@@ -728,7 +728,7 @@ application suites.")
    (name "gtk+")
    ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in
    ;;       mate.scm will also need to be updated.
-   (version "3.24.7")
+   (version "3.24.8")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -736,18 +736,9 @@ application suites.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj"))
+              "16f71bbkhwhndcsrpyhjia3b77cb5ksf5c45lyfgws4pkgg64sb6"))
             (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
-                                     "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))
-            (modules '((guix build utils)))
-            (snippet
-             '(begin
-                ;; Version 3.24.2 was released with a typo that broke the build.
-                ;; See upstream commit 2905fc861acda3d134a198e56ef2f6c962ad3061
-                ;; at <https://gitlab.gnome.org/GNOME/gtk/tree/gtk-3-24>
-                (substitute* "docs/tools/shooter.c"
-                  (("gdk_screen_get_dfeault") "gdk_screen_get_default"))
-                #t))))
+                                     "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
    (outputs '("out" "bin" "doc"))
    (propagated-inputs
     `(("at-spi2-atk" ,at-spi2-atk)
@@ -1754,3 +1745,55 @@ popular spread sheet programs.")
 shell scripts.  Example of how to use @code{yad} can be consulted at
 @url{https://sourceforge.net/p/yad-dialog/wiki/browse_pages/}.")
     (license license:gpl3+)))
+
+(define-public libdbusmenu
+  (package
+    (name "libdbusmenu")
+    (version "16.04.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://launchpad.net/libdbusmenu/"
+                           (version-major+minor version) "/" version
+                           "/+download/libdbusmenu-" version ".tar.gz"))
+       (sha256
+        (base32 "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       '("--sysconfdir=/etc"
+         "--localstatedir=/var"
+         ;; The shebang of the generated test files should be patched before
+         ;; enabling tests.
+         "--disable-tests")
+       #:make-flags
+       `(,(string-append "typelibdir=" (assoc-ref %outputs "out")
+                         "/lib/girepository-1.0"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'set-environment
+           (lambda _
+             (setenv "HAVE_VALGRIND_TRUE" "")
+             (setenv "HAVE_VALGRIND_FALSE" "#")
+             #t)))))
+    (inputs
+     `(("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("gtk+-2" ,gtk+-2)))
+    (native-inputs
+     `(("glib:bin" ,glib "bin")
+       ("gnome-doc-utils" ,gnome-doc-utils)
+       ("gobject-introspection" ,gobject-introspection)
+       ("intltool" ,intltool)
+       ("json-glib" ,json-glib)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-2)
+       ("vala" ,vala)))
+    (home-page "https://launchpad.net/libdbusmenu")
+    (synopsis "Library for passing menus over DBus")
+    (description "@code{libdbusmenu} passes a menu structure across DBus so
+that a program can create a menu simply without worrying about how it is
+displayed on the other side of the bus.")
+
+    ;; Dual-licensed under either LGPLv2.1 or LGPLv3.
+    (license (list license:lgpl2.1 license:lgpl3))))