From: Mike Rosset <mike.rosset@gmail.com>
To: 35866@debbugs.gnu.org
Cc: mike.rosset@gmail.com
Subject: [bug#35866] [PATCH 4/4] gnu: qtwebengine: separate substitution and configure phase
Date: Wed, 1 Jan 2020 08:03:55 -0800 [thread overview]
Message-ID: <20200101160355.32604-4-mike.rosset@gmail.com> (raw)
In-Reply-To: <20200101160355.32604-1-mike.rosset@gmail.com>
* gnu/packages/qt.scm (qtwebengine)[phases]: This moves the store
substitutions to a substitute-source phase. And now a set-env phase sets
environment build variables.
format is no longer used when substituting translations and data paths
---
gnu/packages/qt.scm | 65 ++++++++++++++++++++++++---------------------
1 file changed, 35 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f4908d1f27..a4a039dc80 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2034,17 +2034,15 @@ time Web content can be enhanced with native controls.")
(package (inherit qtsvg)
(name "qtwebengine")
(version (package-version qtbase))
- (source
- (origin
- (method url-fetch)
- (uri
- (string-append "https://download.qt.io/official_releases/qt/"
- (version-major+minor version) "/" version
- "/submodules/" name "-everywhere-src-"
- version ".tar.xz"))
- (sha256
- (base32
- "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa"))))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qt.io/official_releases/qt/"
+ (version-major+minor version) "/" version
+ "/submodules/" name "-everywhere-src-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa"))))
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
@@ -2107,29 +2105,36 @@ time Web content can be enhanced with native controls.")
(substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases)
`(modify-phases ,phases
- (replace 'configure
+ (add-before 'configure 'substitue-source
(lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (nss (assoc-ref inputs "nss"))
+ (udev (assoc-ref inputs "udev")))
+ ;; Qtwebengine is not installed into the same prefix as
+ ;; qtbase. Some qtbase QTLibraryInfo constants will not
+ ;; work. Replace with the full path to the qtwebengine
+ ;; translations and locales in the store.
+ (substitute* "src/core/web_engine_library_info.cpp"
+ (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)")
+ (string-append "QLatin1String(\"" out "/share/qt5/translations\")"))
+ (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)")
+ (string-append "QLatin1String(\"" out "/share/qt5\")")))
+ ;; Substitute full dynamic library path for nss
+ (substitute* "src/3rdparty/chromium/crypto/nss_util.cc"
+ (("libnssckbi.so")
+ (string-append nss "/lib/nss/libnssckbi.so")))
+ ;; Substitute full dynamic library path for udev
+ (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
+ (("libudev.so.1")
+ (string-append udev "/lib/libudev.so.1"))))))
+ (add-before 'configure 'set-env
+ (lambda _
;; Avoids potential race conditions
(setenv "PYTHONDONTWRITEBYTECODE" "1")
;; Make ninja build output less verbose
- (setenv "NINJAFLAGS" "-k1")
- ;; Qtwebengine is not installed into the same prefix as
- ;; qtbase. Some qtbase QTLibraryInfo constants will not
- ;; work. Replace with the full path to the qtwebengine
- ;; translations and locales in the store.
- (substitute* "src/core/web_engine_library_info.cpp"
- (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)")
- (format #f "QLatin1String(\"~a\")" (string-append (assoc-ref outputs "out") "/share/qt5/translations")))
- (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)")
- (format #f "QLatin1String(\"~a\")" (string-append (assoc-ref outputs "out") "/share/qt5"))))
- ;; Substitute full dynamic library path for nss
- (substitute* "src/3rdparty/chromium/crypto/nss_util.cc"
- (("libnssckbi.so")
- (string-append (assoc-ref inputs "nss") "/lib/nss/libnssckbi.so")))
- ;; Substitute full dynamic library path for udev
- (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
- (("libudev.so.1")
- (string-append (assoc-ref inputs "udev") "/lib/libudev.so.1")))
+ (setenv "NINJAFLAGS" "-k1")))
+ (replace 'configure
+ (lambda _
;; Valid QT_BUILD_PARTS variables are:
;; libs tools tests examples demos docs translations
(invoke "qmake" "QT_BUILD_PARTS = libs tools" "--"
--
2.24.1
next prev parent reply other threads:[~2020-01-01 16:05 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 6:23 [bug#35866] [PATCH] gnu: Add qtwebengine mike rosset
2019-05-27 21:05 ` Ludovic Courtès
2019-05-28 17:48 ` mrosset
2019-06-01 9:46 ` Ludovic Courtès
2019-05-29 23:37 ` [bug#35866] Mike Rosset
2019-05-29 23:37 ` [bug#35866] [PATCH] gnu: qtwebengine: Do not use 3rd party libraries Mike Rosset
2019-05-31 19:28 ` Marius Bakke
2019-05-31 23:16 ` mrosset
2019-07-18 9:26 ` [bug#35866] [PATCH] gnu: Add qtwebengine Ricardo Wurmus
2019-10-06 15:45 ` Pierre Neidhardt
2019-10-07 15:49 ` mike.rosset
2019-07-24 14:06 ` Brendan Tildesley
2019-12-16 15:29 ` [bug#35866] " Hartmut Goebel
2019-12-16 16:02 ` mike.rosset
2019-12-16 18:01 ` Pierre Neidhardt
2019-12-18 20:32 ` [bug#35866] [PATCH] " Mike Rosset
2019-12-19 18:29 ` Pierre Neidhardt
2019-12-19 20:19 ` Ricardo Wurmus
2019-12-20 0:02 ` mike.rosset
2019-12-18 20:45 ` Mike Rosset
2019-12-31 13:10 ` Hartmut Goebel
2020-01-01 16:29 ` mike.rosset
2020-01-01 16:03 ` [bug#35866] [PATCH 1/4] " Mike Rosset
2020-01-01 16:03 ` [bug#35866] [PATCH 2/4] gnu: qtwebengine now uses pulseaudio Mike Rosset
2020-01-01 16:03 ` [bug#35866] [PATCH 3/4] gnu: qtwebengine: now uses system libvpx Mike Rosset
2020-01-01 16:03 ` Mike Rosset [this message]
2020-01-24 0:16 ` bug#35866: Status: [PATCH] gnu: Add qtwebengine Mike Rosset
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=20200101160355.32604-4-mike.rosset@gmail.com \
--to=mike.rosset@gmail.com \
--cc=35866@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).