public inbox for buildroot@busybox.net
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2] package/python-pyqt5: fix QtLocation module dependency
@ 2020-05-16 11:26 Peter Seiderer
  2020-05-16 11:45 ` Yann E. MORIN
  2020-05-26  9:21 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Peter Seiderer @ 2020-05-16 11:26 UTC (permalink / raw)
  To: buildroot

The QT module location from qt5location depends on
QT quick from qt5declarative.

From qt5location-5.14.2/src/src.pro:

  qtHaveModule(quick) {
      SUBDIRS += positioningquick location
      ...
  }

Adjust pyqt5 QtLocation module dependency accordingly.

Fixes:

  - http://autobuild.buildroot.net/results/122bb0a37d968cd79dc043b48f90f1ba4135491f

  Reading .../build/python-pyqt5-5.7/QtLocation/QtLocation.pro
  Project ERROR: Unknown module(s) in QT: location

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
  - fix python-pyqt5 QTLocation vs. QtLocation spelling
---
 package/python-pyqt5/python-pyqt5.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk
index 260a93af9c..9b5e9089fc 100644
--- a/package/python-pyqt5/python-pyqt5.mk
+++ b/package/python-pyqt5/python-pyqt5.mk
@@ -65,7 +65,10 @@ endif
 
 ifeq ($(BR2_PACKAGE_QT5LOCATION),y)
 PYTHON_PYQT5_DEPENDENCIES += qt5location
-PYTHON_PYQT5_MODULES += QtLocation QtPositioning
+PYTHON_PYQT5_MODULES += QtPositioning
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
+PYTHON_PYQT5_MODULES += QtLocation
+endif
 endif
 
 ifeq ($(BR2_PACKAGE_QT5MULTIMEDIA),y)
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH v2] package/python-pyqt5: fix QtLocation module dependency
  2020-05-16 11:26 [Buildroot] [PATCH v2] package/python-pyqt5: fix QtLocation module dependency Peter Seiderer
@ 2020-05-16 11:45 ` Yann E. MORIN
  2020-05-26  9:21 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2020-05-16 11:45 UTC (permalink / raw)
  To: buildroot

Peter, All,

On 2020-05-16 13:26 +0200, Peter Seiderer spake thusly:
> The QT module location from qt5location depends on
> QT quick from qt5declarative.
> 
> From qt5location-5.14.2/src/src.pro:
> 
>   qtHaveModule(quick) {
>       SUBDIRS += positioningquick location
>       ...
>   }
> 
> Adjust pyqt5 QtLocation module dependency accordingly.
> 
> Fixes:
> 
>   - http://autobuild.buildroot.net/results/122bb0a37d968cd79dc043b48f90f1ba4135491f
> 
>   Reading .../build/python-pyqt5-5.7/QtLocation/QtLocation.pro
>   Project ERROR: Unknown module(s) in QT: location
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> Changes v1 -> v2:
>   - fix python-pyqt5 QTLocation vs. QtLocation spelling
> ---
>  package/python-pyqt5/python-pyqt5.mk | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk
> index 260a93af9c..9b5e9089fc 100644
> --- a/package/python-pyqt5/python-pyqt5.mk
> +++ b/package/python-pyqt5/python-pyqt5.mk
> @@ -65,7 +65,10 @@ endif
>  
>  ifeq ($(BR2_PACKAGE_QT5LOCATION),y)
>  PYTHON_PYQT5_DEPENDENCIES += qt5location
> -PYTHON_PYQT5_MODULES += QtLocation QtPositioning
> +PYTHON_PYQT5_MODULES += QtPositioning
> +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
> +PYTHON_PYQT5_MODULES += QtLocation
> +endif
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QT5MULTIMEDIA),y)
> -- 
> 2.26.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH v2] package/python-pyqt5: fix QtLocation module dependency
  2020-05-16 11:26 [Buildroot] [PATCH v2] package/python-pyqt5: fix QtLocation module dependency Peter Seiderer
  2020-05-16 11:45 ` Yann E. MORIN
@ 2020-05-26  9:21 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-05-26  9:21 UTC (permalink / raw)
  To: buildroot

>>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes:

 > The QT module location from qt5location depends on
 > QT quick from qt5declarative.

 > From qt5location-5.14.2/src/src.pro:

 >   qtHaveModule(quick) {
 >       SUBDIRS += positioningquick location
 >       ...
 >   }

 > Adjust pyqt5 QtLocation module dependency accordingly.

 > Fixes:

 >   - http://autobuild.buildroot.net/results/122bb0a37d968cd79dc043b48f90f1ba4135491f

 >   Reading .../build/python-pyqt5-5.7/QtLocation/QtLocation.pro
 >   Project ERROR: Unknown module(s) in QT: location

 > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
 > ---
 > Changes v1 -> v2:
 >   - fix python-pyqt5 QTLocation vs. QtLocation spelling

Committed to 2020.02.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-05-26  9:21 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-16 11:26 [Buildroot] [PATCH v2] package/python-pyqt5: fix QtLocation module dependency Peter Seiderer
2020-05-16 11:45 ` Yann E. MORIN
2020-05-26  9:21 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox