From patchwork Wed May 29 23:37:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 14153 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 C44E517029; Thu, 30 May 2019 00:38:13 +0100 (BST) 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 autolearn=ham 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 5150E16CC8 for ; Thu, 30 May 2019 00:38:13 +0100 (BST) Received: from localhost ([127.0.0.1]:60870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hW896-00037n-UE for patchwork@mira.cbaines.net; Wed, 29 May 2019 19:38:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hW88x-00031f-RR for guix-patches@gnu.org; Wed, 29 May 2019 19:38:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hW88w-0006yO-HJ for guix-patches@gnu.org; Wed, 29 May 2019 19:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46770) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hW88w-0006yG-DW for guix-patches@gnu.org; Wed, 29 May 2019 19:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hW88w-0006hC-AW for guix-patches@gnu.org; Wed, 29 May 2019 19:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35866] [PATCH] gnu: qtwebengine: Do not use 3rd party libraries. Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 May 2019 23:38: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 Received: via spool by 35866-submit@debbugs.gnu.org id=B35866.155917306225701 (code B ref 35866); Wed, 29 May 2019 23:38:02 +0000 Received: (at 35866) by debbugs.gnu.org; 29 May 2019 23:37:42 +0000 Received: from localhost ([127.0.0.1]:60312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hW88b-0006gQ-7E for submit@debbugs.gnu.org; Wed, 29 May 2019 19:37:42 -0400 Received: from mout.perfora.net ([74.208.4.194]:51315) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hW88Y-0006g2-V4 for 35866@debbugs.gnu.org; Wed, 29 May 2019 19:37:39 -0400 Received: from orion.hitronhub.home ([70.68.94.152]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1N2ma8-1gTTkW3aMW-0136JL; Thu, 30 May 2019 01:37:33 +0200 From: Mike Rosset Date: Wed, 29 May 2019 16:37:05 -0700 Message-Id: <20190529233705.21127-2-mrosset@bufio.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190529233705.21127-1-mrosset@bufio.org> References: <20190529233705.21127-1-mrosset@bufio.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:RErsd6B81LLVIjZ6z7rQJZyIY2t3JL7qCg29l5CgSlM4zHX3tLS SnqaMATMQTot7BLow7UPdbZfbrCV/Qy8+Odbld660ItfvLRyVSfvW6Tu+SPOsIlYcTIJxwe Cl8O5ybXCWR1Kr9kzCn+sA8+EHkfRqYwWRotr7ZrqUBitskcxciWqjSVGPaorbY6V29pBL7 WcgfKAx4Ie47zblnGRGCQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:/7gmPKF6kWQ=:vRVh2VttoQVhuApboOkgwM /R86jpZBwsAehLFf3Ahdv5x7/acXwV4Hgy8oPLCw4O1SfhrVOBVWeB5xElqYynQOWI9CrOuzY 4KHAYi+gdimd8tX+RZsOQWiwGmn5qpY2G1avWg1aCoWT1jI7mPoFtgLRLjVVJeE2a6YSESjzi 1luQcQUNU4E7ai55GGLI9IVuN7wpUw3gTfjlS5c5zgh1YklfW5nT1/DLDaEV/PH6ReCJvDxPD 47hL2NB/n/q7lZ9hXNUja6cGyPEg9ExSfR1u5m0cYV8SvIApThdNjyx2j6JbPLmeZfAAjb3h9 OHsSpXuKzRkDLrK64lHXm8hmy+tfgyhYwryIP4ylBX5LUoHt2tycq10MzqzhcQU3H8CgQ3UJf 2ADw4liGZda3SnYsZWVtDgbsm7fPGak0OIk8P42v/Z0QSJwd+kZbrIPrgwWTbocM2FeoMdykU SSnZ4t6dsN8vM8SjQ1FmyEfVok62mM9NWl8EgK5pgs3BxrZ7XJX1gGyHKXOivi3P4KqS1dVbv Unmf2SDQgqGtKJ17U9+PsYkLmMT4BVgUKJgir0PBjdARQt3Rv3Fa048x5nbmXqoi0E2DKRy5s 6GVpmQQHgMqHkwFcWyv9zY2M/+mfrqbMUeLxndZrmygzZsvCe6/TlLEXaKKQVpq76qjEMEAyn 9Bjj1QrT3usdt9UP56i2AXKWUqPNUdbXkNujCS3R/vrjlTDCzIPrIvr4i9es+RtNK8w+qG7+J HeRhxgO/EJUwXpOCPnXLReCN/DTDz7rtgCq57g== 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: , Cc: mike.rosset@gmail.com Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Most in tree third party libraries are now linked to Guix libraries. There are a few Guix libraries that break the build or are not automatically detected these are now documented in the input expression. gnu: qtwebengine: PDF and printing support is now disabled. PDF and printing requires pepper plugins. which is not enabled. --- gnu/packages/qt.scm | 87 +++++++++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 30 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d00cc2692a..658946f4a1 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) @@ -55,6 +56,7 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages linux) + #:use-module (gnu packages libevent) #:use-module (gnu packages maths) #:use-module (gnu packages ninja) #:use-module (gnu packages nss) @@ -62,16 +64,21 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages re2c) + #:use-module (gnu packages regex) #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) + #:use-module (gnu packages serialization) #:use-module (gnu packages tls) + #:use-module (gnu packages telephony) + #: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)) @@ -2297,47 +2304,63 @@ color-related widgets.") (build-system gnu-build-system) (native-inputs `( + ("bison" ,bison) + ("flex" ,flex) + ("gperf" ,gperf) + ("ninja" ,ninja) ("perl" ,perl) - ("python-2" ,python-2) ("pkg-config" ,pkg-config) - ("flex" ,flex) - ("bison" ,bison) + ("python-2" ,python-2) ("ruby" ,ruby) - ("ninja" ,ninja) )) (inputs `( - ("qtbase" ,qtbase) - ("qtdeclarative" ,qtdeclarative) + ("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) - ("xcb-util" ,xcb-util) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxi" ,libxi) ("libxkbcommon" ,libxkbcommon) - ("libx11" ,libx11) + ;; libxml not found due to icu not enabled in libxml? + ("libxml2" ,libxml2) + ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) - ("libxi" ,libxi) - ;; OpenGL + ("libxslt" ,libxslt) + ("libxtst" ,libxtst) ("mesa" ,mesa) - ;; qt web engine - ("libgcrypt" ,libgcrypt) - ("pciutils" ,pciutils) + ("minizip" ,minizip) ("nss" ,nss) - ("libxtst" ,libxtst) - ("gperf" ,gperf) - ("cups-minimal" ,cups-minimal) + ("opus" ,opus) + ("pciutils" ,pciutils) + ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) - ("udev" ,eudev) - ;; systemd-devel? no systemd on guix - ("libcap" ,libcap) - ("alsa-lib" ,alsa-lib) - ("dbus" ,dbus) - ("libxrandr" ,libxrandr) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("fontconfig" ,fontconfig) - ("qtwebchannel" ,qtwebchannel) - ("atk" ,atk) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) - ("re2c" ,re2c) + ("qtwebchannel" ,qtwebchannel) + ("re2" ,re2) + ("snappy" ,snappy) + ("udev" ,eudev) + ("xcb-util" ,xcb-util) )) (arguments `(#:phases @@ -2386,7 +2409,11 @@ HostData=lib/qt5 (lambda* (#:key inputs outputs #:allow-other-keys) ;; Valid QT_BUILD_PARTS variables are: ;; libs tools tests examples demos docs translations - (invoke "qmake" "QT_BUILD_PARTS = libs tools"))) + (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--" + "--webengine-printing-and-pdf=no" + "--webengine-ffmpeg=system" + "--webengine-icu=system" + "--webengine-pepper-plugins=no"))) (add-before 'check 'set-display (lambda _ ;; make Qt render "offscreen", required for tests