From patchwork Fri Dec 20 15:52:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 16582 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 E40241794E; Fri, 20 Dec 2019 15:53:10 +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=-3.7 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED,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 9543D17940 for ; Fri, 20 Dec 2019 15:53:10 +0000 (GMT) Received: from localhost ([::1]:58226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiKaU-0003vY-0v for patchwork@mira.cbaines.net; Fri, 20 Dec 2019 10:53:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60710) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iiKaN-0003vR-AI for guix-patches@gnu.org; Fri, 20 Dec 2019 10:53:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iiKaL-0002n1-Or for guix-patches@gnu.org; Fri, 20 Dec 2019 10:53:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41218) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iiKaL-0002mo-Kf for guix-patches@gnu.org; Fri, 20 Dec 2019 10:53:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iiKaL-0000u9-KP for guix-patches@gnu.org; Fri, 20 Dec 2019 10:53:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#35866] [PATCH 2/2] gnu: qtwebengine now uses pulseaudio Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Dec 2019 15:53:01 +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.15768571423422 (code B ref 35866); Fri, 20 Dec 2019 15:53:01 +0000 Received: (at 35866) by debbugs.gnu.org; 20 Dec 2019 15:52:22 +0000 Received: from localhost ([127.0.0.1]:47191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iiKZh-0000t7-VP for submit@debbugs.gnu.org; Fri, 20 Dec 2019 10:52:22 -0500 Received: from mail-pl1-f174.google.com ([209.85.214.174]:37652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iiKZg-0000st-LM for 35866@debbugs.gnu.org; Fri, 20 Dec 2019 10:52:21 -0500 Received: by mail-pl1-f174.google.com with SMTP id c23so4270954plz.4 for <35866@debbugs.gnu.org>; Fri, 20 Dec 2019 07:52: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=Fm1SIq3PY5stSyNZmOI7/gbUdbOrOun+vsSMoMXbfhQ=; b=enAdjYZws5t7lE0okMIDS7yoEJ5t+m/fQKOoA9KW+YoYCZyHvI6eT6ribg23m2RNnq UtQKLgUnts3RkNciL6AL4Gm9NKNweSGuS/noIOUKNAoPoO29xU7XBA6n+z44lOS2Btjq MZ/k7gjzSuLjybileGNFGy3+gL0pBXiFMI/X4hKsdCjFDrbhn0rAIVTYW1f1SW7yhzF5 +BiYeaHUoD4/IXEBqOnE3L/qC0ZPD0RVUANnz1ibIIwfb7SXWvC37/0G2iBkD1a7L75f UmD/6w//zSjUvjgVemMh3oTJCI9hcRQOw10Y3GJFDigUp/l6rghAtO5DKUIyeAOQc/98 P2Vw== 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=Fm1SIq3PY5stSyNZmOI7/gbUdbOrOun+vsSMoMXbfhQ=; b=Eb68+TnLrR0So5wtC5bE8PFXKZQADSdNY6aK67ZoLxGmg++tN9CS2eXyvV0lXvDfFV G3i+Ql2R9tqj7NiojkwC7Wk1OG4eL2qmbnj8TMvsgbXRLbyO9Yn01JGxrSyMN9B/eFie 1GPVRuyWikX5DZh013gt9XpH6Xu8FSvb3C8w92gDnjhA+M/kxxUzkfSR7p2KeKoiqHEC Mtul7AzkY9yo6cepQEWpJe9OpPX62ZN8/jcb1elSifltxu1bzBq0rxM9J6Njb6Mxd9xq 6H0u/IWqKNwQ/852EQdHCYz5EJAWLWPY2jRXZZ6NqScplKHqTGgPWYlvZCKDONaqGcXK ZXJg== X-Gm-Message-State: APjAAAWH57f8GgAJTaeKWh1gVzsWCMQbV+GWMUrP+kdBgLs6Zlqx+z+Z Nj5sGlxqZnV1WKAAtERGECaxNKSO X-Google-Smtp-Source: APXvYqy0L7KSk8GeavHzO9Uwmh0FhL2fxbRGwyoA9luinE8fWMD73V7bkVW7Rfsh1KPsOCInJcIc0w== X-Received: by 2002:a17:902:a407:: with SMTP id p7mr15192335plq.4.1576857134367; Fri, 20 Dec 2019 07:52: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 r66sm13936702pfc.74.2019.12.20.07.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 07:52:13 -0800 (PST) From: Mike Rosset Date: Fri, 20 Dec 2019 07:52:01 -0800 Message-Id: <20191220155201.12594-1-mike.rosset@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <87zhfn6ebv.fsf@gmail.com> References: <87zhfn6ebv.fsf@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 12028fd64c..ae356e533b 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