Patchwork [4/4] gnu: kauth: Fix cmake macros to be used by other packages.

login
register
mail settings
Submitter Hartmut Goebel
Date Nov. 28, 2016, 10:20 p.m.
Message ID <1480371612-23822-5-git-send-email-h.goebel@crazy-compilers.com>
Download mbox | patch
Permalink /patch/18021/
State New
Headers show

Comments

Hartmut Goebel - Nov. 28, 2016, 10:20 p.m.
* gnu/packages/kde-framework.scm (kauth)[phases]: New phase
  fix-cmake-install-paths.
---
 gnu/packages/kde-frameworks.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)
Ludovic Courtès - Nov. 29, 2016, 3:19 p.m.
Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> * gnu/packages/kde-framework.scm (kauth)[phases]: New phase
>   fix-cmake-install-paths.
> ---
>  gnu/packages/kde-frameworks.scm | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 415b54d..fb7d7d9 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -1202,6 +1202,17 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
>      (arguments
>       `(#:phases
>         (modify-phases %standard-phases
> +         (add-after 'unpack 'fix-cmake-install-paths

s/paths/directories/

> +           (lambda _
> +             ;; Make packages using kauth put their policy files and helpers
> +             ;; into their own prefix

Missing period.  :-)

OK with these changes, thanks!

Ludo’.
Hartmut Goebel - Nov. 29, 2016, 6:15 p.m.
Am 29.11.2016 um 16:19 schrieb Ludovic Courtès:
> OK with these changes, thanks!

Pushed. Thanks for the review.

Patch

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 415b54d..fb7d7d9 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1202,6 +1202,17 @@  uses a job-based interface to queue tasks and execute them in an efficient way."
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-cmake-install-paths
+           (lambda _
+             ;; Make packages using kauth put their policy files and helpers
+             ;; into their own prefix
+             (substitute* "KF5AuthConfig.cmake.in"
+               (("@KAUTH_POLICY_FILES_INSTALL_DIR@")
+                "${KDE_INSTALL_DATADIR}/polkit-1/actions")
+               (("@KAUTH_HELPER_INSTALL_DIR@")
+                "${KDE_INSTALL_LIBEXECDIR}")
+               (("@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
+                "${KDE_INSTALL_LIBEXECDIR}"))))
          (replace 'check
            (lambda _
              (setenv "DBUS_FATAL_WARNINGS" "0")