emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[debbugs-tracker] bug#33812: closed ([PATCH 1/2] gnu: extra-cmake-module


From: GNU bug Tracking System
Subject: [debbugs-tracker] bug#33812: closed ([PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for plugins.)
Date: Fri, 04 Jan 2019 09:28:01 +0000

Your message dated Fri, 4 Jan 2019 10:27:25 +0100
with message-id <address@hidden>
and subject line Re: bug#33812: Acknowledgement ([PATCH 1/2] gnu: 
extra-cmake-modules: Fix install-path for plugins.)
has caused the debbugs.gnu.org bug report #33812,
regarding [PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for plugins.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
33812: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=33812
GNU Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- Subject: [PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for plugins. Date: Thu, 20 Dec 2018 15:17:19 +0100
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




--- End Message ---
--- Begin Message --- Subject: Re: bug#33812: Acknowledgement ([PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for plugins.) Date: Fri, 4 Jan 2019 10:27:25 +0100 User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0
Applied as b824dbec5d331e79a50734fb543bbe064eb7fc17

with trivial changes to the second patch.


-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | address@hidden               |
| www.crazy-compilers.com | compilers which you thought are impossible |



--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]