From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6DTnKJXfSGCeCgAA0tVLHw (envelope-from ) for ; Wed, 10 Mar 2021 15:02:45 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IKvOJJXfSGD/GwAAB5/wlQ (envelope-from ) for ; Wed, 10 Mar 2021 15:02:45 +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 DF8E514040 for ; Wed, 10 Mar 2021 16:02:44 +0100 (CET) Received: from localhost ([::1]:57530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK0MF-0008DB-71 for larch@yhetil.org; Wed, 10 Mar 2021 10:02:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK0Lf-000880-IU for guix-patches@gnu.org; Wed, 10 Mar 2021 10:02:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lK0LZ-0001zk-LP for guix-patches@gnu.org; Wed, 10 Mar 2021 10:02:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lK0LZ-0003Aq-IP for guix-patches@gnu.org; Wed, 10 Mar 2021 10:02:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47042] gnu: qtsolutions: Enable examples. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 15:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47042 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Leo Prikler , 47042@debbugs.gnu.org Received: via spool by 47042-submit@debbugs.gnu.org id=B47042.16153884649407 (code B ref 47042); Wed, 10 Mar 2021 15:02:01 +0000 Received: (at 47042) by debbugs.gnu.org; 10 Mar 2021 15:01:04 +0000 Received: from localhost ([127.0.0.1]:51505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lK0Ke-0002RB-1e for submit@debbugs.gnu.org; Wed, 10 Mar 2021 10:01:04 -0500 Received: from out0.migadu.com ([94.23.1.103]:41845) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lK0Ka-0002MV-Pf for 47042@debbugs.gnu.org; Wed, 10 Mar 2021 10:01:02 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615388458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ac6GZuGbtpB+Ko6RyKJDZcPvW3aXQpjD4+rFlV/OdAU=; b=tPBXNOPtoUlkoFrxPHQ9vyMkUlCWxKVqHgW/09GGLhGq2NWGNgMktgISA7KWtX9qWQUPWq He67GW0FZSWJ2Kvazw41BDPehCEKpg0V7XVyVIN+XEQVgZMx3yuIHHVipx+vjsrzNJZGbW YTlOSaq2qO8tizmRuE//PZjftIHua4FPwhU0GZ+yht2BPdZ6ehhkerPHgYMcghRb9vFrU0 ++IjG57nT/4R2+5UVkCJF/jD1YORkj0vROngeygvY2mL50qR4UThS2SbJgcUwIDUmmAJTx A38T4xLAjw8KIAEMlNcN382qNnJNzjV1RZVLXwd7toQe/4ZQiOwPqaRqsx9hcw== References: <84ac6377-e05b-9bac-39b0-24c35fae89cf@raghavgururajan.name> Message-ID: <4eb6a0a4-7c99-5f7c-4c2d-edf6e71d87e5@raghavgururajan.name> Date: Wed, 10 Mar 2021 10:00:55 -0500 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ObJBkO5XfIS38d6hpPWX9mA71PJSSbLaS" X-Migadu-Auth-User: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches From: Raghav Gururajan via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615388565; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=ac6GZuGbtpB+Ko6RyKJDZcPvW3aXQpjD4+rFlV/OdAU=; b=VrPXGmtwtyQZv45lpRxUCnKP8sVnTyMrKLuSEfkj1TO7bXHaZfN/B45zRUm6Ukb8MExdYU mOPnOwQ4KuNpGUqp62k0UMjgnwq0Xev9yUOgd29ojn+5HYTlZe00bE+nunGTYevIm73tjs OBT64B1k++C0qPEaZrEfmuFslvIuZUp5IWHJqXpTxLtHYsQt5R0aE4ifguT9hRXtkFopX0 /FopbL9b7O2W+IBSH4DMVCLP9la1tqM9aIizOtZeGH35iGibw9k9z+XdaiGr5fGJjWpwAh tA/lEL61ZwsQ1eeUhkfOiWqyC0NWlYb6Ws6fW8h+cNa8AKtKYxRNZNFkAxbusg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615388565; a=rsa-sha256; cv=none; b=IxFmjsHpP4bLUut0UWxa0LPPnGIaYPw+I5ilqSHrAfc6NXAc+19V0XIdqsm+EiNh11l2ci O5yPiwHvRS4fLnXVqgWlA1uqbcjcpIUUxEf912TFxPCCBaWX2vIPgfcZgT47c0w//Di0jk 1Hecq0dEAw49bB4y82oTVmAfIbVarjc0rGdRWMiu66cc2BhlQcTMVC2JPtUJx0X+NvbTE8 +r89iYJhF5AVzoLh2GOScyztzw0EHg8p2TTIWDYy6djZFe9reqY9Bf+GWsiOdQEkhQ9YQa T3emcJYhadB5d5AKbJtKyuLyF+cUuFb8zY5c79bqnGiOVrvtu/XiLiAqPTyk3Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=tPBXNOPt; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -4.99 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=tPBXNOPt; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: DF8E514040 X-Spam-Score: -4.99 X-Migadu-Scanner: scn1.migadu.com X-TUID: tCn+b1ety1qa This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ObJBkO5XfIS38d6hpPWX9mA71PJSSbLaS Content-Type: multipart/mixed; boundary="xtWZ4MlZLODm5ER5OACvnlU6TXBjftW2x"; protected-headers="v1" From: Raghav Gururajan To: Leo Prikler , 47042@debbugs.gnu.org Message-ID: <4eb6a0a4-7c99-5f7c-4c2d-edf6e71d87e5@raghavgururajan.name> Subject: Re: gnu: qtsolutions: Enable examples. References: <84ac6377-e05b-9bac-39b0-24c35fae89cf@raghavgururajan.name> In-Reply-To: --xtWZ4MlZLODm5ER5OACvnlU6TXBjftW2x Content-Type: multipart/mixed; boundary="------------0DBF2B6A8ED51D5914331296" Content-Language: en-US This is a multi-part message in MIME format. --------------0DBF2B6A8ED51D5914331296 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Leo! >> Then I guess we have to rewrite that Makefile (or pseudo-Makefile) in >> the snippet as well? >> >> I don't think the compiled examples need to be installed at all =E2=80= =93 >> rather their source code etc. should be installed to share/doc (in a >> qtsolutions subfolder of course).=C2=A0 The act of compiling them is m= erely >> a check, that they (plus the code they are an example of) "work as >> intended" or at least compile as intended. >=20 > Never mind this patch then. I started working on this, thinking that=20 > example binaries might be useful. So I'll close this report. FWIW, can you merge the attached patch please? It enables building of=20 examples, except for qtsingleapplication. Regards, RG. --------------0DBF2B6A8ED51D5914331296 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-qtsolutions-Enable-building-of-examples-except-f.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0001-gnu-qtsolutions-Enable-building-of-examples-except-f.pa"; filename*1="tch" =46rom c722c494d2a210b53bf869a874dbc7237bf64920 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 10 Mar 2021 03:09:38 -0500 Subject: [PATCH] gnu: qtsolutions: Enable building of examples, except fo= r qtsingleapplication. * gnu/packages/qt.scm (qtsolutions) [arguments]: Modify phase 'patch-sour= ce. --- gnu/packages/qt.scm | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d921aa87fe..f3b2c5e8ed 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 @@ -2528,12 +2528,17 @@ securely. It will not store any data unencrypted= unless explicitly requested.") ;; 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 _ --=20 2.30.1 --------------0DBF2B6A8ED51D5914331296-- --xtWZ4MlZLODm5ER5OACvnlU6TXBjftW2x-- --ObJBkO5XfIS38d6hpPWX9mA71PJSSbLaS Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEjfJwUDAAAAAAAKCRBfWBZkf4vlUZJZ AP9XmPlCryFzhbRk5rZfEetSkWVYpwbvc4yIB6dz+zoHnQEAvtZnRLkrrqE2ldfMLg142x4yRzH7 S+Us+lTWz/iDFgA= =xcb9 -----END PGP SIGNATURE----- --ObJBkO5XfIS38d6hpPWX9mA71PJSSbLaS--