Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH-FOR-NEXT v1 5/6] qt5webengine: satisfy new requirements for 5.10
Date: Wed, 21 Feb 2018 22:58:15 +0100	[thread overview]
Message-ID: <20180221225815.0ee22315@windsurf.lan> (raw)
In-Reply-To: <20180221142801.28997-6-gael.portay@savoirfairelinux.com>

Hello,

On Wed, 21 Feb 2018 09:28:00 -0500, Ga?l PORTAY wrote:
> Since Qt WebEngine 5.10, libnss is a requirement[1] because OpenSSL
> certificate validation[3] and NSS bundle[3] was dropped.
> 
> Also, it compiles host-tools that require libnss and libpng.
> 
> Let satisfy these new requirements by selecting libnss and adding
> host-libnss and host-libpng dependencies.
> 
> [1]: https://github.com/qt/qtwebengine/commit/9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb
> [2]: https://codereview.chromium.org/2862543003
> [3]: https://codereview.chromium.org/1882433002
> 
> Signed-off-by: Ga?l PORTAY <gael.portay@savoirfairelinux.com>

So if we merge PATCH 4/6, but not this PATCH 5/6, qt5webengine doesn't
build in its 5.10 version ? If that's the case, then you have a
bisectability problem.

I'm fine with having it separate during the review, to make PATCH 4/6
be just a mechanism change of all versions and hashes, and PATCH 5/6 be
a fixup patch that should be squashed into the 5.10 bump once applied.
But if that's the case, it should be noted...

> ---

... here.

>  package/qt5/qt5webengine/Config.in       | 1 +
>  package/qt5/qt5webengine/qt5webengine.mk | 4 ++++
>  2 files changed, 5 insertions(+)
> 
> diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
> index d0c8d18210..c0d2a54682 100644
> --- a/package/qt5/qt5webengine/Config.in
> +++ b/package/qt5/qt5webengine/Config.in
> @@ -38,6 +38,7 @@ config BR2_PACKAGE_QT5WEBENGINE
>  	select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 # v8/chromium
>  	select BR2_PACKAGE_FFMPEG
>  	select BR2_PACKAGE_LIBGLIB2
> +	select BR2_PACKAGE_LIBNSS if !BR2_PACKAGE_QT5_VERSION_5_6
>  	select BR2_PACKAGE_LIBVPX
>  	select BR2_PACKAGE_OPUS
>  	select BR2_PACKAGE_WEBP
> diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
> index b9edacec62..47084c1af4 100644
> --- a/package/qt5/qt5webengine/qt5webengine.mk
> +++ b/package/qt5/qt5webengine/qt5webengine.mk
> @@ -22,6 +22,10 @@ QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \
>  	xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst
>  endif
>  
> +ifneq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
> +QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss
> +endif
> +
>  QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_system_ffmpeg
>  
>  ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y)

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com

  reply	other threads:[~2018-02-21 21:58 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-21 14:27 [Buildroot] [PATCH-FOR-NEXT v1 0/6] Qt5 bump latest version to 5.10.1 Gaël PORTAY
2018-02-21 14:27 ` [Buildroot] [PATCH-FOR-NEXT v1 1/6] package: add libnpsr host package Gaël PORTAY
2018-02-21 21:27   ` Thomas Petazzoni
2018-02-22 14:29     ` Gaël PORTAY
2018-02-22 16:38       ` Baruch Siach
2018-02-21 14:27 ` [Buildroot] [PATCH-FOR-NEXT v1 2/6] package: add libnss " Gaël PORTAY
2018-02-21 21:32   ` Thomas Petazzoni
2018-02-21 14:27 ` [Buildroot] [PATCH-FOR-NEXT v1 3/6] pkgconf: add host-pkg-config wrapper Gaël PORTAY
2018-02-21 21:50   ` Thomas Petazzoni
2018-02-22  9:27     ` Arnout Vandecappelle
2018-02-22  9:41       ` Thomas Petazzoni
2018-02-22 10:56         ` Arnout Vandecappelle
2018-02-25 20:38           ` Thomas De Schampheleire
2018-02-25 20:53             ` Yann E. MORIN
2018-02-25 21:56               ` Thomas De Schampheleire
2018-02-21 14:27 ` [Buildroot] [PATCH-FOR-NEXT v1 4/6] qt5: bump latest version to 5.10.1 Gaël PORTAY
2018-02-21 21:56   ` Thomas Petazzoni
2018-02-23 18:32   ` Peter Seiderer
2018-02-21 14:28 ` [Buildroot] [PATCH-FOR-NEXT v1 5/6] qt5webengine: satisfy new requirements for 5.10 Gaël PORTAY
2018-02-21 21:58   ` Thomas Petazzoni [this message]
2018-02-22 14:42     ` Gaël PORTAY
2018-02-21 14:28 ` [Buildroot] [PATCH-FOR-NEXT v1 6/6] qt5webengine: set ninja host pkg-config tool Gaël PORTAY
2018-02-21 21:59   ` Thomas Petazzoni
2018-02-22 14:44     ` Gaël PORTAY

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=20180221225815.0ee22315@windsurf.lan \
    --to=thomas.petazzoni@bootlin.com \
    --cc=buildroot@busybox.net \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox