all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 29114@debbugs.gnu.org
Subject: [bug#29114] [PATCH 01/10] gnu: extra-cmake-modules: Install pri-files into lib/qt5/.
Date: Thu,  2 Nov 2017 09:47:41 +0100	[thread overview]
Message-ID: <20171102084750.21368-1-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <20171102084625.21306-1-h.goebel@crazy-compilers.com>

This in accordance with the documentation in
ECMGeneratePriFile.cmake: "Packagers … want to set
`ECM_MKSPECS_INSTALL_DIR` to something like
`share/qt5/mkspecs/modules`." Our Qt5 is putting pri-files into
`lib/qt5/mkspecs/modules`.

* gnu/packages/kde-frameworks.scm(extra-cmake-modules)[#:phase fix-lib-path]:
  New substitute for file 'modules/ECMGeneratePriFile.cmake'.
---
 gnu/packages/kde-frameworks.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6a46f2868..59022f3f0 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -104,7 +104,11 @@
                 "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"")
                ;; Install qml-files into lib/qt5/qml
                (("_define_relative\\(QMLDIR LIBDIR \"qml\"")
-                "_define_relative(QMLDIR LIBDIR \"qt5/qml\""))))
+                "_define_relative(QMLDIR LIBDIR \"qt5/qml\""))
+             (substitute* "modules/ECMGeneratePriFile.cmake"
+               ;; Install pri-files into lib/qt5/mkspecs
+               (("set\\(ECM_MKSPECS_INSTALL_DIR mkspecs/modules")
+                "set(ECM_MKSPECS_INSTALL_DIR lib/qt5/mkspecs/modules"))))
          ;; install and check phase are swapped to prevent install from failing
          ;; after testsuire has run
          (add-after 'install 'check-post-install
-- 
2.13.5

  reply	other threads:[~2017-11-02  8:48 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-02  8:46 [bug#29114] [PATCH 00/10] KDE Updates and cleanups Hartmut Goebel
2017-11-02  8:47 ` Hartmut Goebel [this message]
2017-11-02  8:47   ` [bug#29114] [PATCH 02/10] gnu: kde-frameworks: Update to 5.39.0 Hartmut Goebel
2017-11-02  8:47   ` [bug#29114] [PATCH 03/10] gnu: kimageformats: Update comment Hartmut Goebel
2017-11-02  8:47   ` [bug#29114] [PATCH 04/10] gnu: kdelibs4support: Make test kstandarddirstest pass Hartmut Goebel
2017-11-02  8:47   ` [bug#29114] [PATCH 05/10] gnu: krunner: Make some tests pass Hartmut Goebel
2017-11-02  8:47   ` [bug#29114] [PATCH 06/10] gnu: solid: Enable building interface for qml Hartmut Goebel
2017-11-02  8:47   ` [bug#29114] [PATCH 07/10] gnu: libksysguard: Update to 5.11.2 Hartmut Goebel
2017-11-02 20:37     ` Marius Bakke
2017-11-02 21:43       ` Hartmut Goebel
2017-11-02  8:47   ` [bug#29114] [PATCH 08/10] gnu: kactivities: Move to tier 2 Hartmut Goebel
2017-11-02  8:47   ` [bug#29114] [PATCH 09/10] gnu: kdewebkit: Move to be in alphabetical order Hartmut Goebel
2017-11-02  8:47   ` [bug#29114] [PATCH 10/10] gnu: prison: " Hartmut Goebel
2017-11-02 20:39 ` [bug#29114] [PATCH 00/10] KDE Updates and cleanups Marius Bakke
     [not found] ` <handler.29114.B.150961240712169.ack@debbugs.gnu.org>
2017-11-05  9:58   ` bug#29114: Acknowledgement ([PATCH 00/10] KDE Updates and cleanups) Hartmut Goebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171102084750.21368-1-h.goebel@crazy-compilers.com \
    --to=h.goebel@crazy-compilers.com \
    --cc=29114@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.