From patchwork Wed Mar 10 11:09:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 27596 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 A2F2527BC51; Wed, 10 Mar 2021 11:10:31 +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 AEEC927BC50 for ; Wed, 10 Mar 2021 11:10:30 +0000 (GMT) Received: from localhost ([::1]:59302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJwjU-00055q-2T for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 06:10:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJwj4-0004sN-Gq for guix-patches@gnu.org; Wed, 10 Mar 2021 06:10:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37398) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJwj4-0007UK-8G for guix-patches@gnu.org; Wed, 10 Mar 2021 06:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJwj3-0007Mq-Tz for guix-patches@gnu.org; Wed, 10 Mar 2021 06:10: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 11:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47042 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 47042@debbugs.gnu.org Cc: Leo Prikler X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161537459328299 (code B ref -1); Wed, 10 Mar 2021 11:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Mar 2021 11:09:53 +0000 Received: from localhost ([127.0.0.1]:48944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJwis-0007MK-9l for submit@debbugs.gnu.org; Wed, 10 Mar 2021 06:09:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:59792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJwip-0007MC-WA for submit@debbugs.gnu.org; Wed, 10 Mar 2021 06:09:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJwip-0004bZ-Qe for guix-patches@gnu.org; Wed, 10 Mar 2021 06:09:47 -0500 Received: from out1.migadu.com ([91.121.223.63]:43091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJwik-0007Hg-97 for guix-patches@gnu.org; Wed, 10 Mar 2021 06:09:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615374578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=XD5858qpxKU5pHOcAA8gPCxxG0du4CkNzTQtaOgiLYY=; b=C+arvBVI/baF/WqU5hXBckHFW2+V7oZp1B/o5xt528PDtVvftQZd1TAoAp0PwhTJ24MCOE KyT4GD6ngSw6SxDZeoeYvQDsav605i0czf0FPHhkS+MosPWTD3pfXxO9x5jtmOiCqDa66z KFkYleFfUNWjwJ75peDNZgRJrZmNldcTPCAsjxogvPEvT/A7EqepN0lSjcmufzToCClQrP fOAb3sUw6KDwzha9inZEtkPXVqb/4kW6kVELLmcTWuQnD3HLBLK3kZ+6pOp/f62KwZpKiE kiImkI3OS5VMmHp/BwBr70P2F+gotybGtg2AWsMq2wldD2Gr2Eewx5oC87D19A== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. Message-ID: <84ac6377-e05b-9bac-39b0-24c35fae89cf@raghavgururajan.name> Date: Wed, 10 Mar 2021 06:09:35 -0500 MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name Received-SPF: pass client-ip=91.121.223.63; envelope-from=rg@raghavgururajan.name; helo=out1.migadu.com X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 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_BRAND_SUBJ_NAKED_TO=0.999, 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: 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! Currently with this patch, we have following issues: [1] When examples are enabled for QtSingleApplication, it doesn't get linked to QtLockFile. (Try building without `;; Disable building of examples for QtSingleApplication.` block) [2] For installation of examples, the binaries get installed in sub-dirs as `/bin/foo` instead of `/bin`. Any ideas? Regards, RG. From a1507241c457b9ee3d1474b71849112637a3c6a2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 10 Mar 2021 03:09:38 -0500 Subject: [PATCH] gnu: qtsolutions: Enable examples. * gnu/packages/qt.scm (qtsolutions) [arguments]: Modify phases 'patch-source and 'install. --- gnu/packages/qt.scm | 62 ++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 18 deletions(-) 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 \\+=") - "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 @@ -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\\+=example") "SUBDIRS+=examples"))) (substitute* (find-files "." "common.pri") + ;; Patch run-path for binaries. + (("QMAKE_RPATHDIR \\+= \\$\\$?.*_LIBDIR") + (string-append "QMAKE_RPATHDIR += " + (assoc-ref outputs "out") "/lib")) ;; 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 _ @@ -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"))))))) -- 2.30.1