From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id LK4ABTusSGD4FgAA0tVLHw (envelope-from ) for ; Wed, 10 Mar 2021 11:23:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id AJBlADusSGB4OgAA1q6Kng (envelope-from ) for ; Wed, 10 Mar 2021 11:23:39 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4805519FEA for ; Wed, 10 Mar 2021 12:23:38 +0100 (CET) Received: from localhost ([::1]:37434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJwwD-0000h3-6y for larch@yhetil.org; Wed, 10 Mar 2021 06:23:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJww3-0000gx-Jd for help-guix@gnu.org; Wed, 10 Mar 2021 06:23:27 -0500 Received: from out0.migadu.com ([94.23.1.103]:36472) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJww0-0007bX-Ay for help-guix@gnu.org; Wed, 10 Mar 2021 06:23:27 -0500 To: help-guix@gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615375400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=uQ5Zd81Mra+NkMuTU2VDRbTp3ZkBnLZ/1mSIqK5UcQc=; b=iTmzrsqDEeUFOtLrhzi8OjW0+xq8DvzmF0tryqG8yvSD8i481NvPUMTh5h1yLWwda8DOoP smCERRfTbioxUl/HeVxdKi95wXnSjX1/LO/cnfWcue89fqupo/DCFv6wigOlqQaG+/w9QE gZ/p1RAx69n+mTF+lZuHA5Wrq7/JG9LhgCM9fXsbBm3/xjXJW9B2Lxjsd+tdMDYAKar6kj CZdaM4uRqdF60tnP67yi1LYN5Nn0Pgd7P2bsNHdaut6ljoG5PT7vXwwcHw4WUusCRbkSeG m+GsAzIM2yxUXg2BfYMzxnL77fJgFSqAI41ykRy1ZZNl/OJ9lUgd7PqbWcL95w== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Help with copy-build-system Message-ID: <63c41e90-0fbb-08fa-b22a-9d5046b04aa9@raghavgururajan.name> Date: Wed, 10 Mar 2021 06:23:19 -0500 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="b7meU7zfGKXsUQowQX03wzrNpsrKqZigu" X-Migadu-Auth-User: rg@raghavgururajan.name Received-SPF: pass client-ip=94.23.1.103; envelope-from=rg@raghavgururajan.name; helo=out0.migadu.com X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: help-guix@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-guix-bounces+larch=yhetil.org@gnu.org Sender: "Help-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615375418; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=uQ5Zd81Mra+NkMuTU2VDRbTp3ZkBnLZ/1mSIqK5UcQc=; b=OqI4sdAp/11RwUvbIYPj3xOG/AH2LShjL7gVLw978RsTT6PvuT9pEVFzFCMjkcAmtAqLyH f9j57VH9SG8uODipw9WSCjJAH7s82HZxpLdbJL42Xk7t+KYQpaQkPgxNBQ0IHOPpcArwF6 qYCSe5zy0UjLj7ejXrKnmR5wZdN7TscLaim9x1QMXnie/pSBHEInFoxp9dowqOXvSoERSu I8d1ap0EFn3sbYyQHUNGIbb/+9IeKfVOKnkzvbdzuEhVIj5cF9J7JlnwlTppdLsiYzycOq +rtTdq3RWqbqRUiMr1L9R0PNY4DrEzeRL58myFWgNhc0/9AaSFMt1ZegA6rvng== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615375418; a=rsa-sha256; cv=none; b=Pdv68OYSmgvr5MOCgZ5cQ+HaK1PEiuttjPMS3SAslg/HBUu/F/yuPOpn6LkXlHgjxEOh/l IsuGHcfpK72pGcc+TGdGL0oW9yaOb/w1m1bj8mBgEbl/mN/WPSe8q/IFLjQfEDebIATV17 j2aYcrJnqM6aZsckR+4OlmLStNQdIVFqS18ve+0JX+IelfMEV4ptcRk7WEwWZyPyN0j7TV mpnvSqJPf093jT5dygDFvgtyBy+bGpbByb8+9WOdzxqFQmIbbgcTUZWIvRv2Gf1tQPpcxk okD8DlH4+t0CcH+aBwVQhiM9gPKyF0SRGmiGWW3772SPh9wCGWURZBq0acYbvQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=raghavgururajan.name header.s=key1 header.b=iTmzrsqD; dmarc=pass (policy=quarantine) header.from=raghavgururajan.name; spf=pass (aspmx1.migadu.com: domain of help-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=help-guix-bounces@gnu.org X-Migadu-Spam-Score: -5.19 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=raghavgururajan.name header.s=key1 header.b=iTmzrsqD; dmarc=pass (policy=quarantine) header.from=raghavgururajan.name; spf=pass (aspmx1.migadu.com: domain of help-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=help-guix-bounces@gnu.org X-Migadu-Queue-Id: 4805519FEA X-Spam-Score: -5.19 X-Migadu-Scanner: scn1.migadu.com X-TUID: ozfPqjYxxEXW This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --b7meU7zfGKXsUQowQX03wzrNpsrKqZigu Content-Type: multipart/mixed; boundary="hHlbWl12Y8bjwaOnX9XClfLgAlZ6cddVi"; protected-headers="v1" From: Raghav Gururajan To: help-guix@gnu.org Message-ID: <63c41e90-0fbb-08fa-b22a-9d5046b04aa9@raghavgururajan.name> Subject: Help with copy-build-system --hHlbWl12Y8bjwaOnX9XClfLgAlZ6cddVi Content-Type: multipart/mixed; boundary="------------F971E7A1862048D12777B3F4" Content-Language: en-US This is a multi-part message in MIME format. --------------F971E7A1862048D12777B3F4 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hello Guix! With the attached patch (top be applied on top-off current master), how=20 to make copy-build-system to install files as `/bin/foofile` instead of=20 `/bin/foodir/foofile`? (The foofiles are selected via #:include) Thank you! Regards, RG. --------------F971E7A1862048D12777B3F4 Content-Type: text/x-patch; charset=UTF-8; name="qtsol.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="qtsol.diff" diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d921aa87fe..8409fc1803 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2497,18 +2497,18 @@ securely. It will not store any data unencrypted= unless explicitly requested.") (with-directory-excursion "qtsingleapplication/src" (for-each delete-file (find-files "." "qtlockedfile.*\\.(h|cpp)")) - (substitute* "qtsingleapplication.pri" - ;; Add include path of LockedFile. - (("INCLUDEPATH \\+=3D") - "INCLUDEPATH +=3D ../../qtlockedfile/src") - ;; Link library of LockedFile. - (("LIBS \\+=3D") - "LIBS +=3D -lQtSolutions_LockedFile")) - (substitute* '("qtlocalpeer.h" "qtlocalpeer.cpp") - (("#include \"qtlockedfile.*\\.cpp\"") "") - ;; Unwrap namespace added in the vendoring process. - (("QtLP_Private::QtLockedFile") - "QtLockedFile"))) + (substitute* "qtsingleapplication.pri" + ;; Add include path of LockedFile. + (("INCLUDEPATH \\+=3D") + "INCLUDEPATH +=3D ../../qtlockedfile/src") + ;; Link library of LockedFile. + (("LIBS \\+=3D") + "LIBS +=3D -lQtSolutions_LockedFile")) + (substitute* '("qtlocalpeer.h" "qtlocalpeer.cpp") + (("#include \"qtlockedfile.*\\.cpp\"") "") + ;; Unwrap namespace added in the vendoring process. + (("QtLP_Private::QtLockedFile") + "QtLockedFile"))) #t)))) (build-system gnu-build-system) (arguments @@ -2524,16 +2524,32 @@ securely. It will not store any data unencrypted= unless explicitly requested.") (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda* (#:key outputs #:allow-other-keys) + ;; Rename example to examples, in qtlockedfile, + ;; so that it gets picked up during install phase. + (with-directory-excursion "qtlockedfile" + (rename-file "example" "examples") + (rename-file "examples/example.pro" "examples/examples.= pro") + (substitute* "qtlockedfile.pro" + (("SUBDIRS\\+=3Dexample") "SUBDIRS+=3Dexamples"))) (substitute* (find-files "." "common.pri") + ;; Patch run-path for binaries. + (("QMAKE_RPATHDIR \\+=3D \\$\\$?.*_LIBDIR") + (string-append "QMAKE_RPATHDIR +=3D " + (assoc-ref outputs "out") "/lib")) ;; Remove unnecessary prefixes/suffixes in library name= s. (("qt5") "qt") (("-head") "")) - ;; Disable building of examples. - (substitute* (find-files "." "\\.pro$") + ;; Disable building of examples for QtSingleApplication. + (substitute* "qtsingleapplication/qtsingleapplication.pro= " (("SUBDIRS\\+=3Dexamples") "")) - ;; Fix deprecated functions. - (substitute* "qtsoap/src/qtsoap.cpp" - (("toAscii") "toUtf8")) + (with-directory-excursion "qtsoap/src" + ;; Patch Qt imports for QtSoap. + (substitute* "qtsoap.pri" + (("QT \\+=3D xml network") + "QT +=3D core gui widgets xml network")) + ;; Fix deprecated functions. + (substitute* "qtsoap.cpp" + (("toAscii") "toUtf8"))) #t)) (replace 'configure (lambda _ @@ -2560,7 +2576,17 @@ securely. It will not store any data unencrypted = unless explicitly requested.") (assoc-ref copy:%standard-phases 'install)= #:install-plan '(("src" "include" #:include-regexp ("\\.h= $")) - ("lib" "lib")) + ("lib" "lib") + ("examples" "bin" + #:include ("examples" "canvas_typed" + "canvas_variant" "decoration= " + "demo" "extension" + "object_controller" "simple"= + "controller" "interactive" + "httpservice" "console" + "loader" "trivial" + "easter" "google" + "population"))) args))) '("qtlockedfile" "qtpropertybrowser" "qtservice= " "qtsingleapplication" "qtsoap"))))))) --------------F971E7A1862048D12777B3F4-- --hHlbWl12Y8bjwaOnX9XClfLgAlZ6cddVi-- --b7meU7zfGKXsUQowQX03wzrNpsrKqZigu Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEisJwUDAAAAAAAKCRBfWBZkf4vlUQVv AP46hWC6s5+YMqA197Laa1ggzljvt5wQBZSkH4C3KUyhagEAim4i0kHEpo+sPhaNYl7/DfvOmJK8 L1n6lzyQ1kOzHgQ= =sbLf -----END PGP SIGNATURE----- --b7meU7zfGKXsUQowQX03wzrNpsrKqZigu--