From patchwork Sat Nov 30 22:00:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 16324 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 27F2E17826; Sat, 30 Nov 2019 22:02:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 268591781C for ; Sat, 30 Nov 2019 22:02:22 +0000 (GMT) Received: from localhost ([::1]:38644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAon-0004mM-Jq for patchwork@mira.cbaines.net; Sat, 30 Nov 2019 17:02:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40048) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAoX-0004U6-Ek for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibAoU-0001LW-Hz for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57506) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibAoU-0001LS-DD for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibAoU-0005jp-AS for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38440] [PATCH 1/5] guix: Add the 'qt' build system. References: <20191130215910.18891-1-h.goebel@crazy-compilers.com> In-Reply-To: <20191130215910.18891-1-h.goebel@crazy-compilers.com> Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Nov 2019 22:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38440@debbugs.gnu.org Received: via spool by 38440-submit@debbugs.gnu.org id=B38440.157515127121953 (code B ref 38440); Sat, 30 Nov 2019 22:02:02 +0000 Received: (at 38440) by debbugs.gnu.org; 30 Nov 2019 22:01:11 +0000 Received: from localhost ([127.0.0.1]:35234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAnZ-0005hi-4q for submit@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:11 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:41032) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAnW-0005h0-D2 for 38440@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:04 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47QQLP4sktz1qqkZ for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:01 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47QQLP31JGz1qwZM for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:01 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id EDCaAXfVPqLg for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:00:59 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-57-47.dynamic.mnet-online.de [188.174.57.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:00:58 +0100 (CET) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id E8CF0601FB for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:31 +0100 (CET) From: Hartmut Goebel Date: Sat, 30 Nov 2019 23:00:51 +0100 Message-Id: <20191130220055.19069-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build-system/qt.scm, guix/build/qt-build-system.scm: New files. * Makefile.am (MODULES): Add them. * doc/guix.texi (Buiild systems): Add the new build system. --- Makefile.am | 2 + doc/guix.texi | 21 ++- guix/build-system/qt.scm | 295 +++++++++++++++++++++++++++++++++ guix/build/qt-build-system.scm | 109 ++++++++++++ 4 files changed, 426 insertions(+), 1 deletion(-) create mode 100644 guix/build-system/qt.scm create mode 100644 guix/build/qt-build-system.scm diff --git a/Makefile.am b/Makefile.am index b3f03d44c8..97f1ff514b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,7 @@ MODULES = \ guix/build-system/perl.scm \ guix/build-system/python.scm \ guix/build-system/ocaml.scm \ + guix/build-system/qt.scm \ guix/build-system/waf.scm \ guix/build-system/r.scm \ guix/build-system/rakudo.scm \ @@ -178,6 +179,7 @@ MODULES = \ guix/build/perl-build-system.scm \ guix/build/python-build-system.scm \ guix/build/ocaml-build-system.scm \ + guix/build/qt-build-system.scm \ guix/build/r-build-system.scm \ guix/build/rakudo-build-system.scm \ guix/build/ruby-build-system.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 23a30ce553..cf1d38afc9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -47,7 +47,7 @@ Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* -Copyright @copyright{} 2017 Hartmut Goebel@* +Copyright @copyright{} 2017, 2019 Hartmut Goebel@* Copyright @copyright{} 2017, 2019 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018, 2019 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* @@ -6408,6 +6408,25 @@ passes flags specified by the @code{#:make-maker-flags} or Which Perl package is used can be specified with @code{#:perl}. @end defvr +@defvr {Scheme Variable} qt-build-system +This variable is exported by @code{(guix build-system qt)}. It +is intended for use with applications using Qt or KDE. + +This build system adds the phase @code{qt-wrap} to the ones defined by +@var{cmake-build-system}, after the @code{install} phase. + +This phase searches for Qt5 plugin paths, QML paths and some XDG in the inputs +and output. In case some path is found, all programs in the output's +@file{bin/}, @file{sbin/}, @file{libexec/} and @file{lib/libexec/} directories +are wrapped in scripts defining the necessary environment variables. + +It is possible to exclude specific package outputs from that wrapping process +by listing their names in the @code{#:qt-wrap-excluded-outputs} parameter. +This is useful when an output is known not to contain any Qt binaries, and +where wrapping would gratuitously add a dependency of that output on Qt, KDE, +or such. +@end defvr + @defvr {Scheme Variable} r-build-system This variable is exported by @code{(guix build-system r)}. It implements the build procedure used by @uref{https://r-project.org, R} diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm new file mode 100644 index 0000000000..5ce4e91c41 --- /dev/null +++ b/guix/build-system/qt.scm @@ -0,0 +1,295 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013 Cyril Roelandt +;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2019 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build-system qt) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (guix derivations) + #:use-module (guix search-paths) + #:use-module (guix build-system) + #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module (guix packages) + #:use-module (ice-9 match) + #:export (%qt-build-system-modules + qt-build + qt-build-system)) + +;; Commentary: +;; +;; This build system is an extension of the 'cmake-build-system'. It +;; accommodates the needs of Qt and KDE applications by adding a phase run +;; after the 'install' phase: +;; +;; 'qt-wrap' phase: +;; +;; This phase looks for Qt5 plugin paths, QML paths and some XDG paths as well +;; as the corresponding environment variables. If any of these is found in +;; the output or if respective environment variables are set, then all +;; programs in the output's "bin", "sbin", "libexec and "lib/libexec" +;; directories are wrapped in scripts defining the necessary environment +;; variables. +;; +;; Code: + +(define %qt-build-system-modules + ;; Build-side modules imported and used by default. + `((guix build qt-build-system) + ,@%cmake-build-system-modules)) + +(define (default-cmake) + "Return the default CMake package." + + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages cmake)))) + (module-ref module 'cmake-minimal))) + +;; This barely is a copy from (guix build-system cmake), only adjusted to use +;; the variables defined here. +(define* (lower name + #:key source inputs native-inputs outputs system target + (cmake (default-cmake)) + #:allow-other-keys + #:rest arguments) + "Return a bag for NAME." + (define private-keywords + `(#:source #:cmake #:inputs #:native-inputs #:outputs + ,@(if target '() '(#:target)))) + + (bag + (name name) + (system system) + (target target) + (build-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@`(("cmake" ,cmake)) + ,@native-inputs + ,@(if target + ;; Use the standard cross inputs of + ;; 'gnu-build-system'. + (standard-cross-packages target 'host) + '()) + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages))) + (host-inputs inputs) + + ;; The cross-libc is really a target package, but for bootstrapping + ;; reasons, we can't put it in 'host-inputs'. Namely, 'cross-gcc' is a + ;; native package, so it would end up using a "native" variant of + ;; 'cross-libc' (built with 'gnu-build'), whereas all the other packages + ;; would use a target variant (built with 'gnu-cross-build'.) + (target-inputs (if target + (standard-cross-packages target 'target) + '())) + (outputs outputs) + (build (if target qt-cross-build qt-build)) + (arguments (strip-keyword-arguments private-keywords arguments)))) + + +(define* (qt-build store name inputs + #:key (guile #f) + (outputs '("out")) (configure-flags ''()) + (search-paths '()) + (make-flags ''()) + (out-of-source? #t) + (build-type "RelWithDebInfo") + (tests? #t) + (test-target "test") + (parallel-build? #t) (parallel-tests? #f) + (validate-runpath? #t) + (patch-shebangs? #t) + (strip-binaries? #t) + (strip-flags ''("--strip-debug")) + (strip-directories ''("lib" "lib64" "libexec" + "bin" "sbin")) + (phases '(@ (guix build qt-build-system) + %qt-standard-phases)) + (qt-wrap-excluded-outputs ''()) + (system (%current-system)) + (imported-modules %qt-build-system-modules) + (modules '((guix build cmake-build-system) + (guix build utils)))) + "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE +provides a 'CMakeLists.txt' file as its build system." + (define builder + `(begin + (use-modules ,@modules) + (cmake-build #:source ,(match (assoc-ref inputs "source") + (((? derivation? source)) + (derivation->output-path source)) + ((source) + source) + (source + source)) + #:system ,system + #:outputs %outputs + #:inputs %build-inputs + #:search-paths ',(map search-path-specification->sexp + search-paths) + #:phases ,phases + #:qt-wrap-excluded-outputs ,qt-wrap-excluded-outputs + #:configure-flags ,configure-flags + #:make-flags ,make-flags + #:out-of-source? ,out-of-source? + #:build-type ,build-type + #:tests? ,tests? + #:test-target ,test-target + #:parallel-build? ,parallel-build? + #:parallel-tests? ,parallel-tests? + #:validate-runpath? ,validate-runpath? + #:patch-shebangs? ,patch-shebangs? + #:strip-binaries? ,strip-binaries? + #:strip-flags ,strip-flags + #:strip-directories ,strip-directories))) + + (define guile-for-build + (match guile + ((? package?) + (package-derivation store guile system #:graft? #f)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages commencement))) + (guile (module-ref distro 'guile-final))) + (package-derivation store guile system #:graft? #f))))) + + (build-expression->derivation store name builder + #:system system + #:inputs inputs + #:modules imported-modules + #:outputs outputs + #:guile-for-build guile-for-build)) + + +;;; +;;; Cross-compilation. +;;; + +(define* (qt-cross-build store name + #:key + target native-drvs target-drvs + (guile #f) + (outputs '("out")) + (configure-flags ''()) + (search-paths '()) + (native-search-paths '()) + (make-flags ''()) + (out-of-source? #t) + (build-type "RelWithDebInfo") + (tests? #f) ; nothing can be done + (test-target "test") + (parallel-build? #t) (parallel-tests? #f) + (validate-runpath? #t) + (patch-shebangs? #t) + (strip-binaries? #t) + (strip-flags ''("--strip-debug" + "--enable-deterministic-archives")) + (strip-directories ''("lib" "lib64" "libexec" + "bin" "sbin")) + (phases '(@ (guix build qt-build-system) + %qt-standard-phases)) + (system (%current-system)) + (build (nix-system->gnu-triplet system)) + (imported-modules %qt-build-system-modules) + (modules '((guix build cmake-build-system) + (guix build utils)))) + "Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and +with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its +build system." + (define builder + `(begin + (use-modules ,@modules) + (let () + (define %build-host-inputs + ',(map (match-lambda + ((name (? derivation? drv) sub ...) + `(,name . ,(apply derivation->output-path drv sub))) + ((name path) + `(,name . ,path))) + native-drvs)) + + (define %build-target-inputs + ',(map (match-lambda + ((name (? derivation? drv) sub ...) + `(,name . ,(apply derivation->output-path drv sub))) + ((name (? package? pkg) sub ...) + (let ((drv (package-cross-derivation store pkg + target system))) + `(,name . ,(apply derivation->output-path drv sub)))) + ((name path) + `(,name . ,path))) + target-drvs)) + + (cmake-build #:source ,(match (assoc-ref native-drvs "source") + (((? derivation? source)) + (derivation->output-path source)) + ((source) + source) + (source + source)) + #:system ,system + #:build ,build + #:target ,target + #:outputs %outputs + #:inputs %build-target-inputs + #:native-inputs %build-host-inputs + #:search-paths ',(map search-path-specification->sexp + search-paths) + #:native-search-paths ',(map + search-path-specification->sexp + native-search-paths) + #:phases ,phases + #:configure-flags ,configure-flags + #:make-flags ,make-flags + #:out-of-source? ,out-of-source? + #:build-type ,build-type + #:tests? ,tests? + #:test-target ,test-target + #:parallel-build? ,parallel-build? + #:parallel-tests? ,parallel-tests? + #:validate-runpath? ,validate-runpath? + #:patch-shebangs? ,patch-shebangs? + #:strip-binaries? ,strip-binaries? + #:strip-flags ,strip-flags + #:strip-directories ,strip-directories)))) + + (define guile-for-build + (match guile + ((? package?) + (package-derivation store guile system #:graft? #f)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages commencement))) + (guile (module-ref distro 'guile-final))) + (package-derivation store guile system #:graft? #f))))) + + (build-expression->derivation store name builder + #:system system + #:inputs (append native-drvs target-drvs) + #:outputs outputs + #:modules imported-modules + #:guile-for-build guile-for-build)) + +(define qt-build-system + (build-system + (name 'qt) + (description + "The CMake build system augmented with definition of suitable environment +variables for Qt and KDE in program wrappers.") + (lower lower))) diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm new file mode 100644 index 0000000000..46fcad7848 --- /dev/null +++ b/guix/build/qt-build-system.scm @@ -0,0 +1,109 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 Federico Beffa +;;; Copyright © 2014, 2015 Ludovic Courtès +;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2019 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build qt-build-system) + #:use-module ((guix build cmake-build-system) #:prefix cmake:) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:use-module (ice-9 regex) + #:use-module (ice-9 ftw) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:export (%standard-phases + qt-build)) + +;; Commentary: +;; +;; Builder-side code of the standard Qt build procedure. +;; +;; Code: + +(define (variables-for-wrapping base-directories) + + (define (collect-sub-dirs base-directories subdirectory) + (filter-map + (lambda (dir) + (let ((directory (string-append dir subdirectory))) + (if (directory-exists? directory) directory #f))) + base-directories)) + + (filter + (lambda (var-to-wrap) (not (null? (last var-to-wrap)))) + (map + (lambda (var-spec) + `(,(first var-spec) = ,(collect-sub-dirs base-directories (last var-spec)))) + (list + ;; these shall match the search-path-specification for Qt and KDE + ;; libraries + '("XDG_DATA_DIRS" "/share") + '("XDG_CONFIG_DIRS" "/etc/xdg") + '("QT_PLUGIN_PATH" "/lib/qt5/plugins") + '("QML2_IMPORT_PATH" "/lib/qt5/qml"))))) + +(define* (wrap-all-programs #:key inputs outputs + (qt-wrap-excluded-outputs '()) + #:allow-other-keys) + "Implement phase \"qt-wrap\": look for GSettings schemas and +gtk+-v.0 libraries and create wrappers with suitably set environment variables +if found. + +Wrapping is not applied to outputs whose name is listed in +QT-WRAP-EXCLUDED-OUTPUTS. This is useful when an output is known not +to contain any Qt binaries, and where wrapping would gratuitously +add a dependency of that output on Qt." + (define (find-files-to-wrap directory) + (append-map + (lambda (dir) + (if (directory-exists? dir) (find-files dir ".*") (list))) + (list (string-append directory "/bin") + (string-append directory "/sbin") + (string-append directory "/libexec") + (string-append directory "/lib/libexec")))) + + (define input-directories + ;; FIXME: Filter out unwanted inputs, e.g. cmake + (match inputs + (((_ . dir) ...) + dir))) + + (define handle-output + (match-lambda + ((output . directory) + (unless (member output qt-wrap-excluded-outputs) + (let ((bin-list (find-files-to-wrap directory)) + (vars-to-wrap (variables-for-wrapping + (append (list output) + input-directories)))) + (when (not (null? vars-to-wrap)) + (for-each (cut apply wrap-program <> vars-to-wrap) + bin-list))))))) + + (for-each handle-output outputs) + #t) + +(define %standard-phases + (modify-phases cmake:%standard-phases + (add-after 'install 'qt-wrap wrap-all-programs))) + +(define* (qt-build #:key inputs (phases %standard-phases) + #:allow-other-keys #:rest args) + "Build the given package, applying all of PHASES in order." + (apply cmake:cmake-build #:inputs inputs #:phases phases args)) From patchwork Sat Nov 30 22:00:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 16321 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7A38917824; Sat, 30 Nov 2019 22:02:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4166617811 for ; Sat, 30 Nov 2019 22:02:14 +0000 (GMT) Received: from localhost ([::1]:38634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAof-0004X0-N6 for patchwork@mira.cbaines.net; Sat, 30 Nov 2019 17:02:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40015) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAoW-0004PO-00 for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibAoU-0001Lh-V2 for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57507) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibAoU-0001Lb-RV for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibAoU-0005jy-PJ for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38440] [PATCH 2/5] gnu: sddm: Use qt-build-system. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Nov 2019 22:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38440@debbugs.gnu.org Received: via spool by 38440-submit@debbugs.gnu.org id=B38440.157515127121959 (code B ref 38440); Sat, 30 Nov 2019 22:02:02 +0000 Received: (at 38440) by debbugs.gnu.org; 30 Nov 2019 22:01:11 +0000 Received: from localhost ([127.0.0.1]:35238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAnf-0005i2-Bx for submit@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:11 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:37611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAnZ-0005hj-Lt for 38440@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:06 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47QQLT0xFdz1qqkb for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:05 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47QQLT0krTz1qwZJ for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:05 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id Ggpa9OJnWyWz for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:04 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-57-47.dynamic.mnet-online.de [188.174.57.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:04 +0100 (CET) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 10BC960236 for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:32 +0100 (CET) From: Hartmut Goebel Date: Sat, 30 Nov 2019 23:00:52 +0100 Message-Id: <20191130220055.19069-2-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191130220055.19069-1-h.goebel@crazy-compilers.com> References: <20191130220055.19069-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/display-managers.scm (sddm): Use qt-build-sytem. [arguments]: Remove. : Base on phases from qt-build-system. {wrap-programs}: Remove. --- gnu/packages/display-managers.scm | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 21afc0ec5c..75eab48572 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -27,6 +27,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system cmake) + #:use-module (guix build-system qt) #:use-module (guix build-system gnu) #:use-module (guix packages) #:use-module (guix utils) @@ -62,7 +63,7 @@ (sha256 (base32 "0nilrhwlyvkngjgxfc08n73c16azgmw80pvx0a78xqww9y3hv4xh")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) @@ -105,24 +106,13 @@ (assoc-ref %outputs "out") "/lib/qt5/qml") (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" (assoc-ref %outputs "out") "/etc")) - #:modules ((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) #:phases - (modify-phases %standard-phases + (modify-phases (@ (guix build qt-build-system) %standard-phases) (add-after 'unpack 'embed-loginctl-reference (lambda _ (substitute* "CMakeLists.txt" (("/usr/bin/loginctl") (which "loginctl"))) - #t)) - (add-after 'install 'wrap-programs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "sddm") - (wrap-qt-program out "sddm-greeter") - #t)))))) + #t))))) (synopsis "QML based X11 and Wayland display manager") (description "SDDM is a display manager for X11 and Wayland aiming to be fast, simple and beautiful. SDDM is themeable and puts no restrictions on the From patchwork Sat Nov 30 22:00:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 16322 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8338B17824; Sat, 30 Nov 2019 22:02:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4CC6C17811 for ; Sat, 30 Nov 2019 22:02:15 +0000 (GMT) Received: from localhost ([::1]:38636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAog-0004YO-Jv for patchwork@mira.cbaines.net; Sat, 30 Nov 2019 17:02:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40024) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAoW-0004PQ-FN for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibAoV-0001Lt-E5 for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57508) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibAoV-0001Lo-Aq for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibAoV-0005k5-7s for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38440] [PATCH 3/5] gnu: ktouch: Use qt-build-system. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Nov 2019 22:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38440@debbugs.gnu.org Received: via spool by 38440-submit@debbugs.gnu.org id=B38440.157515127421978 (code B ref 38440); Sat, 30 Nov 2019 22:02:03 +0000 Received: (at 38440) by debbugs.gnu.org; 30 Nov 2019 22:01:14 +0000 Received: from localhost ([127.0.0.1]:35241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAnh-0005iP-Nq for submit@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:13 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:35776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAnd-0005hs-37 for 38440@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:09 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47QQLX433Gz1qqkW for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:08 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47QQLX3x2Jz1qwZM for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:08 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id N37ynh6Bx7EK for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:07 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-57-47.dynamic.mnet-online.de [188.174.57.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:07 +0100 (CET) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 2B1A16034B for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:32 +0100 (CET) From: Hartmut Goebel Date: Sat, 30 Nov 2019 23:00:53 +0100 Message-Id: <20191130220055.19069-3-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191130220055.19069-1-h.goebel@crazy-compilers.com> References: <20191130220055.19069-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/display-managers.scm (ktouch): Use qt-build-sytem. [arguments]: Remove. : Base on phases from qt-build-system. {wrap-executables}: Remove. --- gnu/packages/education.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index c84fa54223..5d49bfb42d 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -58,6 +58,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (srfi srfi-1)) @@ -563,15 +564,10 @@ language and very flexible regarding to new or unknown keyboard layouts.") (sha256 (base32 "19rdk94pls75hdvx11hnfk3qpm6l28p9q45q5f04sknxagrfaznr")))) - (build-system cmake-build-system) + (build-system qt-build-system) (arguments - `(#:modules ((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) - #:phases - (modify-phases %standard-phases + `(#:phases + (modify-phases (@ (guix build qt-build-system) %standard-phases) (add-after 'configure 'patch-makefiles (lambda* (#:key inputs #:allow-other-keys) (let ((qtdec (assoc-ref inputs "qtdeclarative"))) @@ -579,11 +575,6 @@ language and very flexible regarding to new or unknown keyboard layouts.") "src/CMakeFiles/ktouch.dir/build.make") (("/gnu/store/.*qmlcachegen") (string-append qtdec "/bin/qmlcachegen")))) - #t)) - (add-after 'install 'wrap-executable - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "ktouch")) #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) From patchwork Sat Nov 30 22:00:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 16323 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4C7C617824; Sat, 30 Nov 2019 22:02:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 14CF617811 for ; Sat, 30 Nov 2019 22:02:17 +0000 (GMT) Received: from localhost ([::1]:38640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAoi-0004cg-5N for patchwork@mira.cbaines.net; Sat, 30 Nov 2019 17:02:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40037) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAoW-0004RL-St for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibAoV-0001M3-SN for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57509) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibAoV-0001Ly-OZ for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibAoV-0005kD-MO for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38440] [PATCH 4/5] gnu: kdeconnect: Use qt-build-system. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Nov 2019 22:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38440@debbugs.gnu.org Received: via spool by 38440-submit@debbugs.gnu.org id=B38440.157515127421984 (code B ref 38440); Sat, 30 Nov 2019 22:02:03 +0000 Received: (at 38440) by debbugs.gnu.org; 30 Nov 2019 22:01:14 +0000 Received: from localhost ([127.0.0.1]:35243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAni-0005iR-0f for submit@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:14 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:41358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAng-0005iE-B1 for 38440@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:12 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47QQLb5qVyz1qqkW for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:11 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47QQLb5kyQz1qwZJ for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:11 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id MO73G4YHHfrp for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:11 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-57-47.dynamic.mnet-online.de [188.174.57.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:11 +0100 (CET) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 419016034C for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:32 +0100 (CET) From: Hartmut Goebel Date: Sat, 30 Nov 2019 23:00:54 +0100 Message-Id: <20191130220055.19069-4-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191130220055.19069-1-h.goebel@crazy-compilers.com> References: <20191130220055.19069-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/display-managers.scm (kdeconnect): Use qt-build-sytem. [arguments]: Remove. : Base on phases from qt-build-system. {wrap-executable}: Remove. --- gnu/packages/kde.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 778873e99c..a9cb6ad114 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -24,6 +24,7 @@ (define-module (gnu packages kde) #:use-module (guix build-system cmake) + #:use-module (guix build-system qt) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -540,28 +541,15 @@ different notification systems.") (sha256 (base32 "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5")))) - (build-system cmake-build-system) + (build-system qt-build-system) (arguments `(#:configure-flags '("-DBUILD_TESTING=ON") #:tests? #f ; tests fail hard in our build environment - #:modules ((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) #:phases - (modify-phases %standard-phases + (modify-phases (@ (guix build qt-build-system) %standard-phases) (add-before 'check 'check-setup (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") - #t)) - (add-after 'install 'wrap-executable - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "../lib/libexec/kdeconnectd") - (wrap-qt-program out "kdeconnect-cli") - (wrap-qt-program out "kdeconnect-handler") - (wrap-qt-program out "kdeconnect-indicator")) #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) From patchwork Sat Nov 30 22:00:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 16325 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5E49317825; Sat, 30 Nov 2019 22:02:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4C3DE17824 for ; Sat, 30 Nov 2019 22:02:24 +0000 (GMT) Received: from localhost ([::1]:38648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAop-0004s6-Lc for patchwork@mira.cbaines.net; Sat, 30 Nov 2019 17:02:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40049) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAoX-0004U9-Ex for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibAoW-0001MG-Bg for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibAoW-0001MB-6x for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibAoW-0005kK-4S for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38440] [PATCH 5/5] gnu: quaternion: Use qt-build-system. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Nov 2019 22:02:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38440@debbugs.gnu.org Received: via spool by 38440-submit@debbugs.gnu.org id=B38440.157515128122005 (code B ref 38440); Sat, 30 Nov 2019 22:02:04 +0000 Received: (at 38440) by debbugs.gnu.org; 30 Nov 2019 22:01:21 +0000 Received: from localhost ([127.0.0.1]:35246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAno-0005ir-Fg for submit@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:20 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:52779) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAnk-0005if-Er for 38440@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:16 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47QQLg5LsMz1rGRb for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:15 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47QQLg2bbwz1qwZJ for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:15 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 9li7js1uyFHP for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:14 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-57-47.dynamic.mnet-online.de [188.174.57.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:14 +0100 (CET) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 59031603C9 for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:32 +0100 (CET) From: Hartmut Goebel Date: Sat, 30 Nov 2019 23:00:55 +0100 Message-Id: <20191130220055.19069-5-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191130220055.19069-1-h.goebel@crazy-compilers.com> References: <20191130220055.19069-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/display-managers.scm (quaternion): Use qt-build-sytem. [arguments]: Remove. --- gnu/packages/messaging.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 33e752c9a0..88a7246e32 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -97,6 +97,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) @@ -1786,7 +1787,7 @@ QMatrixClient project.") (file-name (git-file-name name version)) (sha256 (base32 "0gpv6b3nn3lsyym8809kiqkpdszfasldqjpk5s542zyn41gdlql4")))) - (build-system cmake-build-system) + (build-system qt-build-system) (inputs `(("libqmatrixclient" ,libqmatrixclient) ("qtbase" ,qtbase) @@ -1797,19 +1798,7 @@ QMatrixClient project.") ("qtsvg" ,qtsvg) ("qttools" ,qttools))) (arguments - `(#:tests? #f ; no tests - #:modules ((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "quaternion") - #t)))))) + `(#:tests? #f)) ; no tests (home-page "https://matrix.org/docs/projects/client/quaternion.html") (synopsis "Graphical client for the Matrix instant messaging protocol") (description "Quaternion is a Qt5 desktop client for the Matrix instant