From: Arun Isaac <arunisaac@systemreboot.net>
To: 33209@debbugs.gnu.org
Subject: [bug#33209] [PATCH 2/2] gnu: quaternion: Update to 0.0.9.3.
Date: Tue, 30 Oct 2018 23:29:44 +0530 [thread overview]
Message-ID: <20181030175944.19620-2-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20181030175944.19620-1-arunisaac@systemreboot.net>
* 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")
--
2.19.0
next prev parent reply other threads:[~2018-10-30 18:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-30 17:52 [bug#33209] [PATCH 0/2] Update quaternion Arun Isaac
2018-10-30 17:59 ` [bug#33209] [PATCH 1/2] gnu: libqmatrixclient: Update to 0.4.0 Arun Isaac
2018-10-30 17:59 ` Arun Isaac [this message]
2018-10-30 22:55 ` [bug#33209] [PATCH 0/2] Update quaternion Leo Famulari
2018-10-31 4:27 ` bug#33209: " Arun Isaac
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181030175944.19620-2-arunisaac@systemreboot.net \
--to=arunisaac@systemreboot.net \
--cc=33209@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).