From patchwork Wed Mar 10 15:00:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 27599 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 576B727BC51; Wed, 10 Mar 2021 15:02:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D13D027BC50 for ; Wed, 10 Mar 2021 15:02:42 +0000 (GMT) Received: from localhost ([::1]:57530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK0MD-0008DB-VE for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 10:02:41 -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: X-Migadu-Flow: FLOW_OUT 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches 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 – >> rather their source code etc. should be installed to share/doc (in a >> qtsolutions subfolder of course).  The act of compiling them is merely >> a check, that they (plus the code they are an example of) "work as >> intended" or at least compile as intended. > > Never mind this patch then. I started working on this, thinking that > example binaries might be useful. So I'll close this report. FWIW, can you merge the attached patch please? It enables building of examples, except for qtsingleapplication. Regards, RG. From 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 for qtsingleapplication. * gnu/packages/qt.scm (qtsolutions) [arguments]: Modify phase 'patch-source. --- 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 \\+=") - "INCLUDEPATH += ../../qtlockedfile/src") - ;; Link library of LockedFile. - (("LIBS \\+=") - "LIBS += -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 \\+=") + "INCLUDEPATH += ../../qtlockedfile/src") + ;; Link library of LockedFile. + (("LIBS \\+=") + "LIBS += -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 names. (("qt5") "qt") (("-head") "")) - ;; Disable building of examples. - (substitute* (find-files "." "\\.pro$") + ;; Disable building of examples for QtSingleApplication. + (substitute* "qtsingleapplication/qtsingleapplication.pro" (("SUBDIRS\\+=examples") "")) - ;; Fix deprecated functions. - (substitute* "qtsoap/src/qtsoap.cpp" - (("toAscii") "toUtf8")) + (with-directory-excursion "qtsoap/src" + ;; Patch Qt imports for QtSoap. + (substitute* "qtsoap.pri" + (("QT \\+= xml network") + "QT += core gui widgets xml network")) + ;; Fix deprecated functions. + (substitute* "qtsoap.cpp" + (("toAscii") "toUtf8"))) #t)) (replace 'configure (lambda _ -- 2.30.1