From: Raghav Gururajan via Guix-patches via <guix-patches@gnu.org>
To: 47042@debbugs.gnu.org
Cc: Leo Prikler <leo.prikler@student.tugraz.at>
Subject: [bug#47042] gnu: qtsolutions: Enable examples.
Date: Wed, 10 Mar 2021 06:09:35 -0500 [thread overview]
Message-ID: <84ac6377-e05b-9bac-39b0-24c35fae89cf@raghavgururajan.name> (raw)
[-- Attachment #1.1.1: Type: text/plain, Size: 394 bytes --]
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.
[-- Attachment #1.1.2: 0001-gnu-qtsolutions-Enable-examples.patch --]
[-- Type: text/x-patch, Size: 5605 bytes --]
From a1507241c457b9ee3d1474b71849112637a3c6a2 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <rg@raghavgururajan.name>
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
next reply other threads:[~2021-03-10 11:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 11:09 Raghav Gururajan via Guix-patches via [this message]
2021-03-10 12:58 ` [bug#47042] gnu: qtsolutions: Enable examples Leo Prikler
2021-03-10 14:49 ` Raghav Gururajan via Guix-patches via
2021-03-10 15:00 ` Raghav Gururajan via Guix-patches via
2021-03-10 15:15 ` Leo Prikler
2021-03-10 15:28 ` Raghav Gururajan via Guix-patches via
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=84ac6377-e05b-9bac-39b0-24c35fae89cf@raghavgururajan.name \
--to=guix-patches@gnu.org \
--cc=47042@debbugs.gnu.org \
--cc=leo.prikler@student.tugraz.at \
--cc=rg@raghavgururajan.name \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.