From patchwork Tue Oct 30 17:59:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 52 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 235591676A; Tue, 30 Oct 2018 18:01:33 +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=-6.1 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id C16C916761 for ; Tue, 30 Oct 2018 18:01:32 +0000 (GMT) Received: from localhost ([::1]:54855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHYKa-0005yW-7r for patchwork@mira.cbaines.net; Tue, 30 Oct 2018 14:01:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHYKK-0005wU-7r for guix-patches@gnu.org; Tue, 30 Oct 2018 14:01:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHYK9-0001ec-8Z for guix-patches@gnu.org; Tue, 30 Oct 2018 14:01:12 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51637) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHYK9-0001eN-3K for guix-patches@gnu.org; Tue, 30 Oct 2018 14:01:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gHYK8-0003on-Vl for guix-patches@gnu.org; Tue, 30 Oct 2018 14:01:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33209] [PATCH 2/2] gnu: quaternion: Update to 0.0.9.3. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Oct 2018 18:01:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33209 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33209@debbugs.gnu.org Received: via spool by 33209-submit@debbugs.gnu.org id=B33209.154092240814543 (code B ref 33209); Tue, 30 Oct 2018 18:01:04 +0000 Received: (at 33209) by debbugs.gnu.org; 30 Oct 2018 18:00:08 +0000 Received: from localhost ([127.0.0.1]:55894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHYJD-0003mT-Vs for submit@debbugs.gnu.org; Tue, 30 Oct 2018 14:00:08 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:58410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHYJB-0003mJ-Ob for 33209@debbugs.gnu.org; Tue, 30 Oct 2018 14:00:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=hTmT+eOne/oN+k3bK18omDk42nGVlxPftV45qG8EpSA=; b=LOQkqf8Fv66SzHEwkqEIx9Vvi4 VWQaJybPLhNtPnZDbYceLuprIm4pEmxDgh0+ojGYGkrTWVaYsP5aG6aUfY1LTMGKtTCov8j3gdPNs TSy4ZD7pCE6CLM9VCpgKSGEezsAezCZELQf9SYAPhFa6GyoneDEswwLDyW5g9S+2ky40=; Received: from [103.5.134.173] (helo=steel.lan) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91) (envelope-from ) id 1gHYJ7-0005OR-LA; Tue, 30 Oct 2018 23:30:02 +0530 From: Arun Isaac Date: Tue, 30 Oct 2018 23:29:44 +0530 Message-Id: <20181030175944.19620-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181030175944.19620-1-arunisaac@systemreboot.net> References: <20181030175944.19620-1-arunisaac@systemreboot.net> 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: 208.118.235.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/messaging.scm (quaternion): Update to 0.0.9.3. [inputs]: Add qtquickcontrols, qtsvg and qttools. [arguments]: Remove fix-libqmatrixclient-dynamic-linking phase. Add wrap-program phase. --- gnu/packages/messaging.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3097f1aa2..de33d737e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1676,7 +1676,7 @@ QMatrixClient project.") (define-public quaternion (package (name "quaternion") - (version "0.0.9.2") + (version "0.0.9.3") (source (origin (method git-fetch) @@ -1686,31 +1686,31 @@ QMatrixClient project.") (file-name (git-file-name name version)) (sha256 (base32 - "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib")))) + "1hr9zqf301rg583n9jv256vzj7y57d8qgayk7c723bfknf1s6hh3")))) (build-system cmake-build-system) (inputs `(("libqmatrixclient" ,libqmatrixclient) ("qtbase" ,qtbase) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative) + ("qtquickcontrols" ,qtquickcontrols) + ("qtsvg" ,qtsvg) + ("qttools" ,qttools))) (arguments `(#:tests? #f ; No tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-libqmatrixclient-dynamic-linking - ;; Upstream recommends statically linking with - ;; libqmatrixclient. Patch the source so that we can dynamically - ;; link instead. In a future release, when upstream moves to - ;; dynamic linking, remove this phase. - (lambda _ - (substitute* "CMakeLists.txt" - (("^add_subdirectory\\(lib\\)" all) - (string-append "#" all))) - (for-each - (lambda (file) - (substitute* file - (("#include \"lib/([^\"]*)\"" all header) - (string-append "#include <" header ">")))) - (find-files "client" "\\.(cpp|h)$")) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/quaternion") + `("QT_PLUGIN_PATH" ":" prefix + (,(string-append (assoc-ref inputs "qtsvg") + "/lib/qt5/plugins"))) + `("QML2_IMPORT_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/qml")) + '("qtdeclarative" "qtquickcontrols")))) #t))))) (home-page "https://matrix.org/docs/projects/client/quaternion.html") (synopsis "Graphical client for the Matrix instant messaging protocol")