Merge remote-tracking branch 'origin/master' into staging

With resolved conflicts in:
	gnu/packages/bittorrent.scm
	gnu/packages/databases.scm
	gnu/packages/geo.scm
	gnu/packages/gnupg.scm
	gnu/packages/gstreamer.scm
	gnu/packages/gtk.scm
	gnu/packages/linux.scm
	gnu/packages/python-xyz.scm
	gnu/packages/xorg.scm
	guix/build/qt-utils.scm

1 files changed, 52 insertions, 36 deletions

diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index 8e6db10ca1..c2b80cab7d 100644
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@ -2,6 +2,8 @@
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2019, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,40 +38,57 @@
 ;; contain any of the standard subdirectories.
 (define (variables-for-wrapping base-directories output-directory)
 
-  (define (collect-sub-dirs base-directories subdirectory-spec)
-    (filter-map
-     (lambda (dir)
-       (match
-        subdirectory-spec
-        ((subdir)
-         (and (directory-exists? (string-append dir subdir))
-              (string-append dir (car subdirectory-spec))))
-        ((subdir children)
-         (and
-          (or
-           (and (string=? dir output-directory)
-                (directory-exists? (string-append dir subdir)))
-           (or-map
-            (lambda (kid) (directory-exists? (string-append dir subdir kid)))
-            children))
-          (string-append dir subdir)))))
-     base-directories))
+  (define (collect-sub-dirs base-directories file-type subdirectory selectors)
+    ;; Append SUBDIRECTORY and each of BASE-DIRECTORIES, and return the subset
+    ;; that exists and has at least one of the SELECTORS sub-directories,
+    ;; unless SELECTORS is the empty list.  FILE-TYPE should by 'directory or
+    ;; 'regular file.  For the later, it allows searching for plain files
+    ;; rather than directories.
+    (define exists? (match file-type
+                      ('directory directory-exists?)
+                      ('regular file-exists?)))
 
-  (filter
-   (lambda (var-to-wrap) (not (null? (last var-to-wrap))))
-   (map
-    (match-lambda
-     ((var kind . subdir-spec)
-      `(,var ,kind ,(collect-sub-dirs base-directories subdir-spec))))
-    (list
-     ;; these shall match the search-path-specification for Qt and KDE
-     ;; libraries
-     '("XDG_DATA_DIRS" suffix "/share" ("/applications" "/fonts"
-                                        "/icons" "/mime"))
-     '("XDG_CONFIG_DIRS" suffix "/etc/xdg")
-     '("QT_PLUGIN_PATH" prefix "/lib/qt5/plugins")
-     '("QML2_IMPORT_PATH" prefix "/lib/qt5/qml")))))
+    (filter-map (lambda (dir)
+                  (let ((directory (string-append dir subdirectory)))
+                    (and (exists? directory)
+                         (or (null? selectors)
+                             (any (lambda (selector)
+                                    (exists?
+                                     (string-append directory selector)))
+                                  selectors))
+                         directory)))
+                base-directories))
 
+  (filter-map
+   (match-lambda
+     ((variable type file-type directory selectors ...)
+      (match (collect-sub-dirs base-directories file-type directory selectors)
+        (()
+         #f)
+        (directories
+         `(,variable ,type ,directories)))))
+   ;; These shall match the search-path-specification for Qt and KDE
+   ;; libraries.
+   (list
+    ;; The XDG environment variables are defined with the 'suffix type, which
+    ;; allows the users to override or extend their value, so that custom icon
+    ;; themes can be honored, for example.
+    '("XDG_DATA_DIRS" suffix directory "/share"
+      ;; These are "selectors": consider /share if and only if at least
+      ;; one of these sub-directories exist.  This avoids adding
+      ;; irrelevant packages to XDG_DATA_DIRS just because they have a
+      ;; /share sub-directory.
+      "/applications" "/cursors" "/fonts" "/icons" "/glib-2.0/schemas"
+      "/mime" "/sounds" "/themes" "/wallpapers")
+    '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
+    ;; The following variables can be extended by the user, but not
+    ;; overridden, to ensure proper operation.
+    '("QT_PLUGIN_PATH" prefix directory "/lib/qt5/plugins")
+    '("QML2_IMPORT_PATH" prefix directory "/lib/qt5/qml")
+    ;; QTWEBENGINEPROCESS_PATH accepts a single value, which makes 'exact the
+    ;; most suitable environment variable type for it.
+    '("QTWEBENGINEPROCESS_PATH" = regular
+      "/lib/qt5/libexec/QtWebEngineProcess"))))
 
 (define* (wrap-qt-program* program #:key inputs output-dir
                            qt-wrap-excluded-inputs)
@@ -88,7 +107,6 @@
     (when (not (null? vars-to-wrap))
       (apply wrap-program program vars-to-wrap))))
 
-
 (define* (wrap-qt-program program-name #:key inputs output
                           (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs))
   "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\"
@@ -100,7 +118,6 @@ is wrapped."
                     #:output-dir output #:inputs inputs
                     #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs))
 
-
 (define* (wrap-all-qt-programs #:key inputs outputs
                                (qt-wrap-excluded-outputs '())
                                (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)
@@ -131,5 +148,4 @@ add a dependency of that output on Qt."
                        #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)
                   (find-files-to-wrap output-dir))))))
 
-  (for-each handle-output outputs)
-  #t)
+  (for-each handle-output outputs))