Merge branch 'master' into gnome-team

Change-Id: Ib6f55bebef2fb235fa59fd5442102a3e0ace3191

gnu/packages/freedesktop.scm

@@ -407,6 +407,20 @@ inappropriate content.")
                (base32
                 "1dkjxvfxg56hfy70j6ibfklfyv57jiha4vgc3ggl60r5kjx65s5b"))))
     (build-system cmake-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                ;; The Ft_MIMPluginManager::testPluginDescriptions test fails
+                ;; with a QFATAL error: received signal 11, while
+                ;; ut_mimpluginmanager fails at least on powerpc64le with a
+                ;; subprocess aborted error (see:
+                ;; https://github.com/maliit/framework/issues/120).
+                (invoke "ctest" "-E"
+                        "(ft_mimpluginmanager|ut_mimpluginmanager)")))))))
     (native-inputs (list extra-cmake-modules
                          wayland-protocols
                          pkg-config
@@ -687,14 +701,20 @@ freedesktop.org project.")
        ;; Meson target anyway.
        #:build-type "release"))
     (native-inputs
-     (list check pkg-config))
+     (append (list check pkg-config)
+             (if (%current-target-system)
+               (list pkg-config-for-build)
+               '())))
     (inputs
-     (list cairo
-           glib
-           gtk+
-           libevdev
-           libwacom
-           mtdev))
+     (append (list cairo
+                   glib
+                   gtk+
+                   libevdev
+                   libwacom
+                   mtdev)
+             (if (%current-target-system)
+               (list check)
+               '())))
     (propagated-inputs
      `(;; libinput.h requires <libudev.h>, so propagate it.
        ("udev" ,eudev)))