| Message ID | 20180607134528.7098-1-david.barbion@ext.leroymerlin.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] fix qtwebengine enable condition | expand |
David, 2018-06-07 8:45 GMT-05:00 David Barbion <david.barbion@ext.leroymerlin.fr>: > Signed-off-by: David Barbion <david.barbion@ext.leroymerlin.fr> > --- > package/qt5/qt5webengine/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in > index 38486c6dcf..744d659567 100644 > --- a/package/qt5/qt5webengine/Config.in > +++ b/package/qt5/qt5webengine/Config.in > @@ -31,7 +31,7 @@ config BR2_PACKAGE_QT5WEBENGINE > depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo > depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5base-icu > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu > - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss > + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss > depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus > depends on BR2_USE_WCHAR # libglib2 > depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs > -- Oops, sorry about the bug :-) Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
David, On Thu, Jun 07, 2018 at 03:45:28PM +0200, David Barbion wrote: > Signed-off-by: David Barbion <david.barbion@ext.leroymerlin.fr> > --- > package/qt5/qt5webengine/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in > index 38486c6dcf..744d659567 100644 > --- a/package/qt5/qt5webengine/Config.in > +++ b/package/qt5/qt5webengine/Config.in > @@ -31,7 +31,7 @@ config BR2_PACKAGE_QT5WEBENGINE > depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo > depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5base-icu > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu > - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss > + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss Good catch. > depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus > depends on BR2_USE_WCHAR # libglib2 > depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs > -- > 2.17.1 Do you mind to reword the first line of your commit message to start with the name of the affected package and a colon? Something like: qt5webengine: fix... Regards, Gael
Hi, Le 11/06/2018 à 16:57, Gaël PORTAY a écrit : > David, > > On Thu, Jun 07, 2018 at 03:45:28PM +0200, David Barbion wrote: >> Signed-off-by: David Barbion <david.barbion@ext.leroymerlin.fr> >> --- >> package/qt5/qt5webengine/Config.in | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in >> index 38486c6dcf..744d659567 100644 >> --- a/package/qt5/qt5webengine/Config.in >> +++ b/package/qt5/qt5webengine/Config.in >> @@ -31,7 +31,7 @@ config BR2_PACKAGE_QT5WEBENGINE >> depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo >> depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5base-icu >> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu >> - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss >> + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss > Good catch. > >> depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus >> depends on BR2_USE_WCHAR # libglib2 >> depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs >> -- >> 2.17.1 > Do you mind to reword the first line of your commit message to start > with the name of the affected package and a colon? > > Something like: > > qt5webengine: fix... Sure :) Just made it. David. > > Regards, > Gael Ce message et toutes les pièces jointes sont établis à l'attention exclusive de leurs destinataires et sont confidentiels. Si vous recevez ce message par erreur, merci de le détruire et d'en avertir immédiatement l'expéditeur. L'internet ne permettant pas d'assurer l'intégrité de ce message, le contenu de ce message ne représente en aucun cas un engagement de la part de Leroy Merlin.
Hello, On Thu, 7 Jun 2018 15:45:28 +0200, David Barbion wrote: > Signed-off-by: David Barbion <david.barbion@ext.leroymerlin.fr> > --- > package/qt5/qt5webengine/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, after fixing the commit title, and adding a commit log with details. Thanks! Thomas
diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 38486c6dcf..744d659567 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -31,7 +31,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5base-icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs
Signed-off-by: David Barbion <david.barbion@ext.leroymerlin.fr> --- package/qt5/qt5webengine/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)