From patchwork Wed Jan 1 16:03:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 19499 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 C8EA6179D6; Wed, 1 Jan 2020 16:05:17 +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=-1.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED,URI_NOVOWEL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 17D70179D5 for ; Wed, 1 Jan 2020 16:05:17 +0000 (GMT) Received: from localhost ([::1]:59498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imgUm-0007aF-7d for patchwork@mira.cbaines.net; Wed, 01 Jan 2020 11:05:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48465) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imgUa-0007Zd-Eb for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imgUY-0005Fc-Ly for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59675) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1imgUY-0005ER-Fx for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1imgUY-0001JM-91 for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#35866] [PATCH 1/4] gnu: Add qtwebengine. References: <20190523062344.20601-1-mrosset@bufio.org> In-Reply-To: <20190523062344.20601-1-mrosset@bufio.org> Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jan 2020 16:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35866 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35866@debbugs.gnu.org Cc: mike.rosset@gmail.com Received: via spool by 35866-submit@debbugs.gnu.org id=B35866.15778946474924 (code B ref 35866); Wed, 01 Jan 2020 16:05:02 +0000 Received: (at 35866) by debbugs.gnu.org; 1 Jan 2020 16:04:07 +0000 Received: from localhost ([127.0.0.1]:37406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imgTf-0001HL-Ac for submit@debbugs.gnu.org; Wed, 01 Jan 2020 11:04:07 -0500 Received: from mail-pl1-f176.google.com ([209.85.214.176]:41612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imgTd-0001Gs-EQ for 35866@debbugs.gnu.org; Wed, 01 Jan 2020 11:04:06 -0500 Received: by mail-pl1-f176.google.com with SMTP id bd4so16886878plb.8 for <35866@debbugs.gnu.org>; Wed, 01 Jan 2020 08:04:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=z5QRvbf1TRp/mzsJ7eNgllH9c5aexmBOK15CXtQYXWk=; b=AX0qvmk4BA/NQs0D8gtga60EHchsssyieeHlXXDalgAxP7F+8b+qzzFXRlA58PqRkf d0WyQh3b2OcMtqMkHg0vK1EEeHSz7cFpp/WHmCb4NTA7ktNvEAjAfT02otoZSJK4j4NK dAP04bf9l7DTv/Gxaiu0l9tYS2UJ0LDSHfV64XQUqnTDn8jAgIaTNol+/rK8wvHWyAvm YT/zb9lXFUuyBreAywWfdZXDG4fbK+fs8MekdwNLpFDMM4mfbj0NBxosItExLJ5iNcml lBGQXQ6AhwZPZDSMzlDXRzZe+wWZ1yihWTOuuvIk9CbJdG1Q3EkafGX5MyNKytUtbVpd NxJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=z5QRvbf1TRp/mzsJ7eNgllH9c5aexmBOK15CXtQYXWk=; b=PPk9+48HS/D0yJKJpCDi1uAwyir34X1bw353/hmrj+5wG/xcJNyYe2XVJ1LbVvwIoJ ScwkgVtSSeNmU8OAFYAqszwTOsSr4fSxo/FG0LcZjc9akGFIv5k8YnNxWWDpucT+IZ1P YFo+uRVWcDeZKrOchpki83Dwz1BGkAMJB8v5Jvc0gfDE1GSIBzmtIxRnXQ+FDUCivGtY 8Kzc22QIpr1NTs9Pei6pnhXJtTzp/QoUJkcAQkpVNxem/9U3KXxOl1kSlGO3idcx8j89 T4lbnoMPZJOcIH4lck3MOKF3D3GJqGlHzxF7m8qr3v+LBquGkuFAHWWA4J2V1a5VDNPG JtSw== X-Gm-Message-State: APjAAAWM0W+068QCr7Et5fAFSwdpi8AUVhnNkn8x4RuQfZDcLI475LcS Dxp6iv50cbAA2QgkXsZDCbFV6F09Lgk= X-Google-Smtp-Source: APXvYqzYeA56bANajHy40juIZ5TCnB99T+rMwWJXEF3G+/zDtJacg0bZZ6aEV80LMaTrZtfM83fz7w== X-Received: by 2002:a17:90a:2351:: with SMTP id f75mr14392632pje.133.1577894639198; Wed, 01 Jan 2020 08:03:59 -0800 (PST) Received: from neutron.telus (node-1w7jr9qlfahmev9dakqkc7if6.ipv6.telus.net. [2001:569:74e0:7d00:c8c3:b228:84c0:5502]) by smtp.gmail.com with ESMTPSA id o14sm54524337pgm.67.2020.01.01.08.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jan 2020 08:03:58 -0800 (PST) From: Mike Rosset Date: Wed, 1 Jan 2020 08:03:52 -0800 Message-Id: <20200101160355.32604-1-mike.rosset@gmail.com> X-Mailer: git-send-email 2.24.1 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: 209.51.188.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/qt.scm (qtwebengine): New variable. This is a new qtwebengine patch with working locales. --- gnu/packages/qt.scm | 129 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 795b5e9d2b..2b4b167a14 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -52,30 +52,40 @@ #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages maths) + #:use-module (gnu packages ninja) #:use-module (gnu packages nss) #:use-module (gnu packages pciutils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages regex) #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) + #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) + #:use-module (gnu packages telephony) #:use-module (gnu packages tls) + #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (gnu packages xml) #:use-module (srfi srfi-1)) @@ -2020,6 +2030,125 @@ time Web content can be enhanced with native controls.") (license license:lgpl2.1+))) +(define-public qtwebengine + (package (inherit qtsvg) + (name "qtwebengine") + (version (package-version qtbase)) + (source + (origin + (method url-fetch) + (uri + (string-append "https://download.qt.io/official_releases/qt/" + (substring version 0 4) + "/" version "/submodules/" + (string-append name "-everywhere-src-" version) + ".tar.xz")) + (sha256 + (base32 + "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa")))) + (build-system gnu-build-system) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ("gperf" ,gperf) + ("ninja" ,ninja) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-2" ,python-2) + ("ruby" ,ruby) + )) + (inputs + `(("alsa-lib" ,alsa-lib) + ("atk" ,atk) + ("cups-minimal" ,cups-minimal) + ("dbus" ,dbus) + ("ffmpeg" ,ffmpeg) + ("fontconfig" ,fontconfig) + ("harbuzz" ,harfbuzz) + ("icu4c" ,icu4c) + ("jsoncpp" ,jsoncpp) + ("lcms" ,lcms) + ("libcap" ,libcap) + ("libevent" ,libevent) + ("libgcrypt" ,libgcrypt) + ("libjpeg" ,libjpeg-turbo) + ;; libsrtp not found by qmake. seems to not have config.tests? + ("libsrtp" ,libsrtp) + ;; FIXME: error: ?struct vpx_svc_ref_frame_config? has no member named ?frame_flags? + ;; ("libvpx" ,libvpx) + ("libwebp" ,libwebp) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxi" ,libxi) + ("libxkbcommon" ,libxkbcommon) + ;; libxml not found due to icu not enabled in libxml? + ("libxml2" ,libxml2) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxslt" ,libxslt) + ("libxtst" ,libxtst) + ("mesa" ,mesa) + ("minizip" ,minizip) + ("nss" ,nss) + ("opus" ,opus) + ("pciutils" ,pciutils) + ("protobuf" ,protobuf) + ;; ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtmultimedia" ,qtmultimedia) + ("qtwebchannel" ,qtwebchannel) + ("re2" ,re2) + ("snappy" ,snappy) + ("udev" ,eudev) + ("xcb-util" ,xcb-util))) + (arguments + (substitute-keyword-arguments (package-arguments qtsvg) + ((#:phases phases) + `(modify-phases ,phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Avoids potential race conditions + (setenv "PYTHONDONTWRITEBYTECODE" "1") + ;; Make build output less verbose + (setenv "NINJAFLAGS" "-k1") + ;; Use this output translations not qtbase + (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 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 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"))) + ;; Valid QT_BUILD_PARTS variables are: + ;; libs tools tests examples demos docs translations + (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--" + "--webengine-printing-and-pdf=no" + "--webengine-ffmpeg=system" + "--webengine-icu=system" + "--webengine-pepper-plugins=no"))))) + ((#:tests? _ #f) #f))) + (native-search-paths + (list (search-path-specification + (file-type 'regular) + (separator #f) + (variable "QTWEBENGINEPROCESS_PATH") + (files '("lib/qt5/libexec/QtWebEngineProcess"))))) + (home-page "https://www.qt.io") + (synopsis "Qt WebEngine Module") + (description "Qt5WebEngine provides support for web +applications using the Chromium browser project.") + (license + (package-license qt)))) + (define-public dotherside (package (name "dotherside") From patchwork Wed Jan 1 16:03:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 19498 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 7DFE4179D6; Wed, 1 Jan 2020 16:05:17 +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=-1.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED,URI_NOVOWEL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D462D179D4 for ; Wed, 1 Jan 2020 16:05:16 +0000 (GMT) Received: from localhost ([::1]:59494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imgUl-0007Zw-NZ for patchwork@mira.cbaines.net; Wed, 01 Jan 2020 11:05:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48466) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imgUa-0007Ze-Eb for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imgUY-0005G9-TZ for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59676) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1imgUY-0005Ft-Q3 for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1imgUY-0001JT-MK for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#35866] [PATCH 2/4] gnu: qtwebengine now uses pulseaudio Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jan 2020 16:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35866 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35866@debbugs.gnu.org Cc: mike.rosset@gmail.com Received: via spool by 35866-submit@debbugs.gnu.org id=B35866.15778946614959 (code B ref 35866); Wed, 01 Jan 2020 16:05:02 +0000 Received: (at 35866) by debbugs.gnu.org; 1 Jan 2020 16:04:21 +0000 Received: from localhost ([127.0.0.1]:37410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imgTs-0001Hu-PH for submit@debbugs.gnu.org; Wed, 01 Jan 2020 11:04:21 -0500 Received: from mail-pf1-f171.google.com ([209.85.210.171]:38894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imgTr-0001HZ-GJ for 35866@debbugs.gnu.org; Wed, 01 Jan 2020 11:04:19 -0500 Received: by mail-pf1-f171.google.com with SMTP id x185so20916750pfc.5 for <35866@debbugs.gnu.org>; Wed, 01 Jan 2020 08:04:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WJwQNbtSbaoelNMnKFX2q2AL96Bnvz7Ta8pnBVCbWCg=; b=qmi1jh2m1S/ohLYnswQKmIghoFtLWJfN0H6r9blkcMg9Nf0q16qWRo1PAWv3zWk1Wp lpiRed6oAwsXR4x/a0qMlhH4XnTWpFVUqAzSE1tSMqIfFXvvHhrf6VqfqrZMkKfrUFbT 6cGW3d2byQvT0HF/ZycdQIFTmepvnp5+KN+hFabjuDQGtuImXfM88dNDUI2Xe0PYmbtw qIY9q4Amd6Pa0QFl/cQMLzVKgRHp9Pzq51VhS3Niq1mmLRay0F7hxp+D1nZsJLArH1qp MtyT6IsE5Mm7xlWplxGE95wJKBS336dXDoGznyssRrv1vLEABzmgNc8wKraFC6L9Egqv sThg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WJwQNbtSbaoelNMnKFX2q2AL96Bnvz7Ta8pnBVCbWCg=; b=kOCYsa9kXgX0Ub1mlMQEb2FAag7/zwio71CGCh4g3TpBV72SzIv4LF+BV+eo8CnaYr n2apkP1NggA7SfBHjF9m/nUwTAAKrfFcXYLlrWHddB+Lz4hp85jGf1qPg6WvvWHr1xMp oVGJDdyeUa5bLr9MaGDSQAJ+m2g4ED10COR5p9eDEUezS3DEyDDx7Qsys+bvSzs+6uTW TIJPdWxIwYUwGWkG01/kn/14C3yaB1hVjQbps2HE9AEoWL4knsgRwSxp0AG+A6VBS2kA ZK+cX6r5uTUaK/V34HchyTzrOcUxFHIW2n8+sg4Wh9+9TIUTcspuVdRthgLMiY0+YiXe 6HHQ== X-Gm-Message-State: APjAAAU8hJekpoaJIAnmqTkWm0KUX48AnIuoF9iCOVIEfj3ZqY5Q+1xZ xRofiN9uCEXGZ9J0MFAXT3s3eZ4stlE= X-Google-Smtp-Source: APXvYqypS716sEhGfigpfUIiiTNmGtWNnipC1/HHtYWnREK2Q9Ifbge3sZBcCLr0Sj4aj9WITd/KSA== X-Received: by 2002:a63:950c:: with SMTP id p12mr85641582pgd.85.1577894653244; Wed, 01 Jan 2020 08:04:13 -0800 (PST) Received: from neutron.telus (node-1w7jr9qlfahmev9dakqkc7if6.ipv6.telus.net. [2001:569:74e0:7d00:c8c3:b228:84c0:5502]) by smtp.gmail.com with ESMTPSA id o14sm54524337pgm.67.2020.01.01.08.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jan 2020 08:04:12 -0800 (PST) From: Mike Rosset Date: Wed, 1 Jan 2020 08:03:53 -0800 Message-Id: <20200101160355.32604-2-mike.rosset@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200101160355.32604-1-mike.rosset@gmail.com> References: <20200101160355.32604-1-mike.rosset@gmail.com> 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: 209.51.188.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 This also documents know input issues and improves the package expression syntax --- gnu/packages/qt.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2b4b167a14..456b394230 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2039,10 +2039,9 @@ time Web content can be enhanced with native controls.") (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" - (substring version 0 4) - "/" version "/submodules/" - (string-append name "-everywhere-src-" version) - ".tar.xz")) + (version-major+minor version) "/" version + "/submodules/" name "-everywhere-src-" + version ".tar.xz")) (sha256 (base32 "08c60nh95m98mcqk444axs76xi6m9x0wvdxrzk9c2cxwqdbz59fa")))) @@ -2055,8 +2054,7 @@ time Web content can be enhanced with native controls.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-2" ,python-2) - ("ruby" ,ruby) - )) + ("ruby" ,ruby))) (inputs `(("alsa-lib" ,alsa-lib) ("atk" ,atk) @@ -2072,8 +2070,6 @@ time Web content can be enhanced with native controls.") ("libevent" ,libevent) ("libgcrypt" ,libgcrypt) ("libjpeg" ,libjpeg-turbo) - ;; libsrtp not found by qmake. seems to not have config.tests? - ("libsrtp" ,libsrtp) ;; FIXME: error: ?struct vpx_svc_ref_frame_config? has no member named ?frame_flags? ;; ("libvpx" ,libvpx) ("libwebp" ,libwebp) @@ -2083,7 +2079,9 @@ time Web content can be enhanced with native controls.") ("libxcursor" ,libxcursor) ("libxi" ,libxi) ("libxkbcommon" ,libxkbcommon) - ;; libxml not found due to icu not enabled in libxml? + ;; FIXME: libxml2 needs to built with icu support though it links to + ;; libxml2 configure summary still states. Checking for compatible + ;; system libxml2... no ("libxml2" ,libxml2) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) @@ -2095,7 +2093,7 @@ time Web content can be enhanced with native controls.") ("opus" ,opus) ("pciutils" ,pciutils) ("protobuf" ,protobuf) - ;; ("pulseaudio" ,pulseaudio) + ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) @@ -2112,19 +2110,22 @@ time Web content can be enhanced with native controls.") (lambda* (#:key inputs outputs #:allow-other-keys) ;; Avoids potential race conditions (setenv "PYTHONDONTWRITEBYTECODE" "1") - ;; Make build output less verbose + ;; Make ninja build output less verbose (setenv "NINJAFLAGS" "-k1") - ;; Use this output translations not qtbase + ;; 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 path for nss + ;; 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 path for udev + ;; 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"))) @@ -2143,7 +2144,7 @@ time Web content can be enhanced with native controls.") (variable "QTWEBENGINEPROCESS_PATH") (files '("lib/qt5/libexec/QtWebEngineProcess"))))) (home-page "https://www.qt.io") - (synopsis "Qt WebEngine Module") + (synopsis "Qt WebEngine module") (description "Qt5WebEngine provides support for web applications using the Chromium browser project.") (license From patchwork Wed Jan 1 16:03:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 19497 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 2084C179D7; Wed, 1 Jan 2020 16:05:17 +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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C4A6A179D3 for ; Wed, 1 Jan 2020 16:05:16 +0000 (GMT) Received: from localhost ([::1]:59496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imgUl-0007aD-Fz for patchwork@mira.cbaines.net; Wed, 01 Jan 2020 11:05:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48464) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imgUa-0007Zc-EX for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imgUZ-0005Hf-BV for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59677) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1imgUZ-0005H8-7p for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1imgUZ-0001Ja-3i for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#35866] [PATCH 3/4] gnu: qtwebengine: now uses system libvpx Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jan 2020 16:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35866 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35866@debbugs.gnu.org Cc: mike.rosset@gmail.com Received: via spool by 35866-submit@debbugs.gnu.org id=B35866.15778946624972 (code B ref 35866); Wed, 01 Jan 2020 16:05:03 +0000 Received: (at 35866) by debbugs.gnu.org; 1 Jan 2020 16:04:22 +0000 Received: from localhost ([127.0.0.1]:37413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imgTu-0001I8-4N for submit@debbugs.gnu.org; Wed, 01 Jan 2020 11:04:22 -0500 Received: from mail-pj1-f66.google.com ([209.85.216.66]:53988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imgTs-0001Hb-27 for 35866@debbugs.gnu.org; Wed, 01 Jan 2020 11:04:20 -0500 Received: by mail-pj1-f66.google.com with SMTP id n96so2243804pjc.3 for <35866@debbugs.gnu.org>; Wed, 01 Jan 2020 08:04:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/eycnMPHgIJcsH50EaE4xSSAxKZkjvIxRZ8F4CC8pVc=; b=Wb744bpjI3JTk1EFHQZrne+7o+it+j/uO3tD1mg7UD9rncnvpxK9IAmeNEhNwWN3m1 McvExYP5UIBFO6RQY6HL0SerLHZPvVFMo8ODGqhX5aH8acHF/uiLQ1FKJyh0+sWFyQ0X 9brM9ZnnXH+UHoUUXjjqqcKDSlb4QLn9vpQznOvW8sP3qeILYHTO2oYqoSM2Yx+QyhXH jhP+f3qSQWmWapkV5+dYhhc/VpnAvsLq8cuD9/P+/AIuG7pIYYniaUYq0qWPYWLzajP1 GaBPV85kcgpP3ucHAS+DhziGhPUIAol7/+Mw5pgJl7r7em1RLPFwWomyoQ3gCgYGiZud 5sIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/eycnMPHgIJcsH50EaE4xSSAxKZkjvIxRZ8F4CC8pVc=; b=VzD1JMkZiNQM9OioTfJVnOh1qsTU0qgILxYWYPp7HxtOFvO+jLYM1yoJVy6SDqjSO+ Izgy0lo0VK4ExRT43aFb6rpElVLHGg+9S+mUu7hKcu+p4gTCZVNxR92GwsFX34f0QKAJ C2lP/BUM+25rXBPdgNyUN9HQFIoXfxErsq54QibQYEHgknSDGjw9w0T0GzQpFFNvdtNI LweKWYCqNBQRpTIkWJhSRxQ5k0NZ+jYr6yXKKz2RERRxcrKWMnzfAU4b4ondkyKCCEDW vyIlao+aDE7X2zwaVp0ML5IxlbEFiJCdETLWcmSgPeHpPECbCriRoK69hLboqiLz19fH TaGQ== X-Gm-Message-State: APjAAAU+TOM3arc9e3t/2075lOF0iaPYsvOnTtmNppRBKgs+xp7KvQdv 6mQeuthhzFND48xqMkX9FG/lPFI5pFI= X-Google-Smtp-Source: APXvYqzm1dfQsa0uixxGBSsMNLyN6F3Ssrncht4efPk84x/5is8KMCt9PPF+B0oBE10oRA+q8EPODw== X-Received: by 2002:a17:902:8344:: with SMTP id z4mr83632675pln.41.1577894654183; Wed, 01 Jan 2020 08:04:14 -0800 (PST) Received: from neutron.telus (node-1w7jr9qlfahmev9dakqkc7if6.ipv6.telus.net. [2001:569:74e0:7d00:c8c3:b228:84c0:5502]) by smtp.gmail.com with ESMTPSA id o14sm54524337pgm.67.2020.01.01.08.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jan 2020 08:04:13 -0800 (PST) From: Mike Rosset Date: Wed, 1 Jan 2020 08:03:54 -0800 Message-Id: <20200101160355.32604-3-mike.rosset@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200101160355.32604-1-mike.rosset@gmail.com> References: <20200101160355.32604-1-mike.rosset@gmail.com> 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: 209.51.188.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/qt.scm (qtwebengine): This also documents why qtwebengine test phase is disabled. --- gnu/packages/qt.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 456b394230..f4908d1f27 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2070,8 +2070,9 @@ time Web content can be enhanced with native controls.") ("libevent" ,libevent) ("libgcrypt" ,libgcrypt) ("libjpeg" ,libjpeg-turbo) - ;; FIXME: error: ?struct vpx_svc_ref_frame_config? has no member named ?frame_flags? - ;; ("libvpx" ,libvpx) + ("libvpx" ,libvpx) + ;; FIXME: configure does not find system lcms + ;; ("lcms" ,lcms) ("libwebp" ,libwebp) ("libx11" ,libx11) ("libxcb" ,libxcb) @@ -2136,6 +2137,9 @@ time Web content can be enhanced with native controls.") "--webengine-ffmpeg=system" "--webengine-icu=system" "--webengine-pepper-plugins=no"))))) + ;; Tests are disabled due to Could not find QtWebEngineProcess error + ;; It's possible this can be fixed by setting QTWEBENGINEPROCESS_PATH + ;; before running tests It's also possible some tests need a network ((#:tests? _ #f) #f))) (native-search-paths (list (search-path-specification From patchwork Wed Jan 1 16:03:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 19500 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 15D5A179D5; Wed, 1 Jan 2020 16:05:18 +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=-1.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED,URI_NOVOWEL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9A5C2179D3 for ; Wed, 1 Jan 2020 16:05:17 +0000 (GMT) Received: from localhost ([::1]:59500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imgUm-0007bZ-N1 for patchwork@mira.cbaines.net; Wed, 01 Jan 2020 11:05:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48506) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imgUb-0007Zf-Ad for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imgUZ-0005JH-Rw for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59678) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1imgUZ-0005Im-N6 for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1imgUZ-0001Ji-Ik for guix-patches@gnu.org; Wed, 01 Jan 2020 11:05:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#35866] [PATCH 4/4] gnu: qtwebengine: separate substitution and configure phase Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jan 2020 16:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35866 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35866@debbugs.gnu.org Cc: mike.rosset@gmail.com Received: via spool by 35866-submit@debbugs.gnu.org id=B35866.15778946634983 (code B ref 35866); Wed, 01 Jan 2020 16:05:03 +0000 Received: (at 35866) by debbugs.gnu.org; 1 Jan 2020 16:04:23 +0000 Received: from localhost ([127.0.0.1]:37415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imgTv-0001IJ-B8 for submit@debbugs.gnu.org; Wed, 01 Jan 2020 11:04:23 -0500 Received: from mail-pj1-f65.google.com ([209.85.216.65]:52482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imgTs-0001Hf-UV for 35866@debbugs.gnu.org; Wed, 01 Jan 2020 11:04:21 -0500 Received: by mail-pj1-f65.google.com with SMTP id a6so2248097pjh.2 for <35866@debbugs.gnu.org>; Wed, 01 Jan 2020 08:04:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4Aaa9N265Hlg6Vpd/fFBbCc3uLzPZUmvA2K6vF0Edas=; b=dCSjpFSHDgPRbdtpGIgS7r/qcoiLup1w3dP/5Mh0JYlx4O1Ot9cUjStMrnyOxXTXUJ 1Ea+8zidNfs+g/v6U/11JBR3l8wzcpB5PZ/bNmyTWNSZKJdogW13Huq+XkaCx6LeWnKG jk1PSh0pWHTddIBbNlMvaNb4pIAO0b0beRstgdPjSgS+oZG/L9e6TriiwT+KY9vuxxlY NqAcLtRRKaw5XRM+P9HQVjtXCbpHrqapYwvu09EGQdg0/5XVFgX5ejuF/quyBtoDhThS T+mfpnefbaJSteaz+cTaD1h3NmPdE75fcmroRtkyLQ2vyR17KNBkpXo1KKzyUO9cXJv0 fewg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4Aaa9N265Hlg6Vpd/fFBbCc3uLzPZUmvA2K6vF0Edas=; b=Ehba/cg1k2LlQHH3qxHVOV46Eg8w4aIJAhzBNSAGxbsff+f0+n8+kiBKSBVpzgLddW o4zqD/HZ0opKUkxinJaH7d54RVVUy3idi2YxrcLbtAF9HbIZbXyCEtaFC3ejCjXggk6x l1aG5Q5cSv1z9LlKEXNOGHaHwWenlNk4cOKIv9XFzn/Xn45g3a7uupgC+UDy4qv2i2I/ O2MqWR81gSO9yHUqDPLAwmdUYrJj8LDVJFm/aebKoyJGQWI14u8a/zdVvjAc8/Dz9h0i 1m5lloNlzQyz5dM4ildyMaysyPlxvzJnxPIWGZ7HmL+ceN2dU6bRQ9e+KhWVjlwt2DwT q+QA== X-Gm-Message-State: APjAAAV82k/o1CkbgGgPGirxk+DlvU6VR+fMkLnH8zPsaTtylqOyNf6C 3QJqK60lE6FB0+VSXN0WeVHCMLyiS/M= X-Google-Smtp-Source: APXvYqxQ4QfNha0XjyaTF231KOmzDWkNKueCcOrYmF1mLXvmJ1kFOVHQxdf7OuP6BOjM1D/suYENaA== X-Received: by 2002:a17:902:b596:: with SMTP id a22mr77900266pls.297.1577894655045; Wed, 01 Jan 2020 08:04:15 -0800 (PST) Received: from neutron.telus (node-1w7jr9qlfahmev9dakqkc7if6.ipv6.telus.net. [2001:569:74e0:7d00:c8c3:b228:84c0:5502]) by smtp.gmail.com with ESMTPSA id o14sm54524337pgm.67.2020.01.01.08.04.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jan 2020 08:04:14 -0800 (PST) From: Mike Rosset Date: Wed, 1 Jan 2020 08:03:55 -0800 Message-Id: <20200101160355.32604-4-mike.rosset@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200101160355.32604-1-mike.rosset@gmail.com> References: <20200101160355.32604-1-mike.rosset@gmail.com> 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: 209.51.188.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/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" "--"