Skip to contentSkip to conversation

fix qtwebengine enable condition

PATCH New David Barbion 4 participants 5 messages Jun 7, 2018 – Jun 13, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix qtwebengine enable condition

---
 package/qt5/qt5webengine/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/qt5/qt5webengine/Config.in +1 -1
index 38486c6dcf..744d659567 100644
@@ -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
Signature · 5 lines
2.17.1



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.
#1 lore raw

PATCH 1/1 fix qtwebengine enable condition

David,

2018-06-07 8:45 GMT-05:00 David Barbion <[email protected]>:

Quoted 10 lines
---
 package/qt5/qt5webengine/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/qt5/qt5webengine/Config.in +0 -0
index 38486c6dcf..744d659567 100644

package/qt5/qt5webengine/Config.in config BR2_PACKAGE_QT5WEBENGINE

Quoted 9 lines
package/qt5/qt5webengine/Config.in +1 -2
@@ -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 :-)

#2 lore raw

PATCH 1/1 fix qtwebengine enable condition

In reply to David Barbion

David,

Quoted 10 lines · David Barbion
---
 package/qt5/qt5webengine/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/qt5/qt5webengine/Config.in +0 -0
index 38486c6dcf..744d659567 100644

package/qt5/qt5webengine/Config.in config BR2_PACKAGE_QT5WEBENGINE · line 34

Quoted 5 lines
package/qt5/qt5webengine/Config.in +1 -1
@@ -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.

Quoted 5 lines
package/qt5/qt5webengine/Config.in +0 -0
 	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
Signature · 1 line
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

#3 lore raw

PATCH 1/1 fix qtwebengine enable condition

Hi,

Le 11/06/2018 ? 16:57, Ga?l PORTAY a ?crit?:

Quoted 25 lines

David,

Quoted 10 lines · David Barbion
---
 package/qt5/qt5webengine/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/qt5/qt5webengine/Config.in +0 -0
index 38486c6dcf..744d659567 100644

package/qt5/qt5webengine/Config.in config BR2_PACKAGE_QT5WEBENGINE · line 34

Quoted 5 lines
package/qt5/qt5webengine/Config.in +1 -1
@@ -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.

Quoted 5 lines
package/qt5/qt5webengine/Config.in +0 -0
 	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
Signature · 1 line
2.17.1
Quoted 6 lines

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.

Quoted 3 lines

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.

#4 lore raw

PATCH 1/1 fix qtwebengine enable condition

In reply to David Barbion

Hello,

Quoted 4 lines · David Barbion
---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com