[bug#38319] [PATCH 0/4] Fix wrap-qt-program some packages using Qt

[bug#38319] [PATCH 0/4] Fix wrap-qt-program some packages using Qt

[Hartmut Goebel]

During investigating `wrap-qt-program` for kdevelop I discovered that the
paths added there does not match the paths used by qtbase's native-search-path
specifications.

While this would not matter much for the wrapped program (as long as the
package it belongs to stores the files into these places) this is at least
irritating. More important: The wrong paths will not be picked up by qtbase's
native-search-path and thus other packages might experience dubious problems.

I checked all packages using `wrap-qt-package` whether they are using one of
these changed paths, and also all occurrences of '"/plugin' and '"/qml' in
package definitions.


Hartmut Goebel (4):
  gnu: sddm: Fix output directory for QML files.
  guix: Fix wrap-qt-program..
  gnu: python-pyqt: Fix output directory for plugins.
  gnu: kdeconnect: Remove useless code.

 gnu/packages/display-managers.scm | 2 +-
 gnu/packages/kde.scm              | 3 ---
 gnu/packages/qt.scm               | 2 +-
 guix/build/qt-utils.scm           | 4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

-- 
2.21.0

[bug#38319] [PATCH 1/4] gnu: sddm: Fix output directory for QML files.

[Hartmut Goebel]

Path must match qtbase's native-search-path specification, otherwise it
will not be picked up by other packages.

* gnu/packages/display-managers.scm(sddm)[arguments]<configure-flags>:
  Change value of "-DQT_IMPORTS_DIR".
---
 gnu/packages/display-managers.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 0b8f742c38..21afc0ec5c 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -102,7 +102,7 @@
                        (assoc-ref %build-inputs "shadow")
                        "/etc/login.defs")
         (string-append "-DQT_IMPORTS_DIR="
-                       (assoc-ref %outputs "out") "/qml")
+                       (assoc-ref %outputs "out") "/lib/qt5/qml")
         (string-append "-DCMAKE_INSTALL_SYSCONFDIR="
                        (assoc-ref %outputs "out") "/etc"))
        #:modules ((guix build cmake-build-system)
-- 
2.21.0

[bug#38319] [PATCH 2/4] guix: Fix wrap-qt-program.

[Hartmut Goebel]

Paths added here need to match qtbase's native-search-path specifications.

* guix/build/qt-utils.scm(wrap-qt-program): Change paths used for
  QML2_IMPORT_PATH and QT_PLUGIN_PATH.
---
 guix/build/qt-utils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index 48a32674e9..d2486ee86c 100644
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@ -26,9 +26,9 @@
       (if env-val (string-append env-val ":" path) path)))
 
   (let ((qml-path        (suffix "QML2_IMPORT_PATH"
-                                 (string-append out "/qml")))
+                                 (string-append out "/lib/qt5/qml")))
         (plugin-path     (suffix "QT_PLUGIN_PATH"
-                                 (string-append out "/plugins")))
+                                 (string-append out "/lib/qt5/plugins")))
         (xdg-data-path   (suffix "XDG_DATA_DIRS"
                                  (string-append out "/share")))
         (xdg-config-path (suffix "XDG_CONFIG_DIRS"
-- 
2.21.0

[bug#38319] [PATCH 2/4] guix: Fix wrap-qt-program.

[Ludovic Courtès]

Hello,

Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> Paths added here need to match qtbase's native-search-path specifications.
  ^~~~~

“File names” or “directory names”.

> * guix/build/qt-utils.scm(wrap-qt-program): Change paths used for
                           ^
Missing space.  :-)

LGTM!

If I’m not mistaken, less than a dozen of packages depend on this file,
right?  If that’s the case, this can go to master.

Thanks,
Ludo’.

[bug#38319] [PATCH 3/4] gnu: python-pyqt: Fix output directory for plugins.

[Hartmut Goebel]

This defaults to QT_INSTALL_PLUGINS, thus we should use the same
sub-path ($out/lib/qt5/plugins) here.

* gnu/packages/qt.scm(python-pyqt)[arguments]<phases>{configure}:
  Change base path for plugins.
---
 gnu/packages/qt.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5f4f29a948..ba6595cdfb 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1616,7 +1616,7 @@ module provides support functions to the automatically generated code.")
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin"))
                     (sip (string-append out "/share/sip"))
-                    (plugins (string-append out "/plugins"))
+                    (plugins (string-append out "/lib/qt5/plugins"))
                     (designer (string-append plugins "/designer"))
                     (qml (string-append plugins "/PyQt5"))
                     (python (assoc-ref inputs "python"))
-- 
2.21.0

[bug#38319] [PATCH 3/4] gnu: python-pyqt: Fix output directory for plugins.

[Ludovic Courtès]

Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> This defaults to QT_INSTALL_PLUGINS, thus we should use the same
> sub-path ($out/lib/qt5/plugins) here.

“sub-directory”  :-)

> * gnu/packages/qt.scm(python-pyqt)[arguments]<phases>{configure}:
>   Change base path for plugins.

“base file name”

LGTM, thanks!

Ludo’.

[bug#38319] [PATCH 4/4] gnu: kdeconnect: Remove useless code.

[Hartmut Goebel]

After fixing wrap-qt-program, setting QT_PLUGIN_PATH here is no longer
necessary.

* gnu/packages/kde.scm(kdeconnect)[arguments]<phases>{wrap-executable}:
  Remove setting QT_PLUGIN_PATH.
---
 gnu/packages/kde.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index dcce02e467..636b5d60ba 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -558,9 +558,6 @@ different notification systems.")
          (add-after 'install 'wrap-executable
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
-               (setenv "QT_PLUGIN_PATH"
-                       (string-append out "/lib/qt5/plugins"
-                                      ":" (getenv "QT_PLUGIN_PATH")))
                (wrap-qt-program out "../lib/libexec/kdeconnectd")
                (wrap-qt-program out "kdeconnect-cli")
                (wrap-qt-program out "kdeconnect-handler")
-- 
2.21.0

[bug#38319] [PATCH 4/4] gnu: kdeconnect: Remove useless code.

[Ludovic Courtès]

Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> After fixing wrap-qt-program, setting QT_PLUGIN_PATH here is no longer
> necessary.
>
> * gnu/packages/kde.scm(kdeconnect)[arguments]<phases>{wrap-executable}:
>   Remove setting QT_PLUGIN_PATH.

LGTM, thanks!

bug#38319: [PATCH 4/4] gnu: kdeconnect: Remove useless code.

[Hartmut Goebel]

Updated and pushed as 0d455d9865c1bfd21a9415aa8515e75058dd7ee5

Thansk for the review.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

[bug#38319] [PATCH 1/4] gnu: sddm: Fix output directory for QML files.

[Ludovic Courtès]

Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> Path must match qtbase's native-search-path specification, otherwise it
> will not be picked up by other packages.
>
> * gnu/packages/display-managers.scm(sddm)[arguments]<configure-flags>:
>   Change value of "-DQT_IMPORTS_DIR".

LGTM!