[bug#33812] [PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for plugins.

[bug#33812] [PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for plugins.

[Hartmut Goebel]

The respective entry changed for kde-frameworks 5.46.

* gnu/packages/kde-frameworks.scm(krunner)[#phases]<fix-lib-path>:
  Change substitute for QTPLUGINDIR.
---
 gnu/packages/kde-frameworks.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 49c986483..8997f0522 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -98,8 +98,10 @@
                (("\"lib64\"") "\"lib\"")
                ;; TODO: Base the following on values taken from Qt
                ;; Install plugins into lib/qt5/plugins
-               (("_define_relative\\(QTPLUGINDIR LIBDIR \"plugins\"")
-                "_define_relative(QTPLUGINDIR LIBDIR \"qt5/plugins\"")
+               ;; TODO: Check if this is okay for Android, too
+               ;; (see comment in KDEInstallDirs.cmake)
+               (("_define_relative\\(QTPLUGINDIR \"\\$\\{_pluginsDirParent}\" \"plugins\"")
+                "_define_relative(QTPLUGINDIR \"${_pluginsDirParent}\" \"qt5/plugins\"")
                ;; Install imports into lib/qt5/imports
                (("_define_relative\\(QTQUICKIMPORTSDIR QTPLUGINDIR \"imports\"")
                 "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"")
-- 
2.13.7

[bug#33812] [PATCH 2/2] gnu: krunner: Blacklist another test failing with 5.49.0.

[Hartmut Goebel]

* gnu/packages/kde-frameworks.scm(krunner)[#phases]<check-setup>:
  Blacklist 'testMulti'.
---
 gnu/packages/kde-frameworks.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 8997f0522..0e32d8881 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2956,10 +2956,10 @@ to easily extend the contacts collection.")
              (setenv "HOME" (getcwd))
              ;; make Qt render "offscreen", required for tests
              (setenv "QT_QPA_PLATFORM" "offscreen")
-             ;; Blacklist a failing test-function. FIXME: Make it pass.
+             ;; Blacklist some failing test-functions. FIXME: Make it pass.
              (with-output-to-file "bin/BLACKLIST"
                (lambda _
-                 (display "[testMatch]\n*\n")))
+                 (display "[testMatch]\n*\n[testMulti]\n*\n")))
              #t)))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Framework for Plasma runners")
-- 
2.13.7

bug#33812: Acknowledgement ([PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for plugins.)

[Hartmut Goebel]

Applied as b824dbec5d331e79a50734fb543bbe064eb7fc17

with trivial changes to the second patch.


-- 
Regards
Hartmut Goebel

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