Patchwork qtbase.inc: add -no-xkbcommon

login
register
mail settings
Submitter Thomas Senyk
Date March 27, 2014, 2:33 p.m.
Message ID <1395930787-25372-1-git-send-email-thomas.senyk@pelagicore.com>
Download mbox | patch
Permalink /patch/69401/
State Accepted, archived
Headers show

Comments

Thomas Senyk - March 27, 2014, 2:33 p.m.
If one builds with xkb, both -no-xkb and
-no-xkbcommon should be set.
Without -no-xkbcommon you'll get link-errors
for libcomposeplatforminputcontextplugin.so
---
 recipes-qt/qt5/qtbase.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Thomas Senyk - March 27, 2014, 2:36 p.m.
sorry I think I've missed 

--subject-prefix="meta-qt5][PATCH"

... Is that 'bad' enough to re-send it?

Is it:
--subject-prefix="meta-qt5][PATCH"
or
--subject-prefix="oe][meta-qt5][PATCH"

?

Greets
Thomas

On Thursday, 27 March, 2014 15:33:07 Thomas Senyk wrote:
> If one builds with xkb, both -no-xkb and
> -no-xkbcommon should be set.
> Without -no-xkbcommon you'll get link-errors
> for libcomposeplatforminputcontextplugin.so
> ---
>  recipes-qt/qt5/qtbase.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
> index 89736be..8aefb5c 100644
> --- a/recipes-qt/qt5/qtbase.inc
> +++ b/recipes-qt/qt5/qtbase.inc
> @@ -105,7 +105,7 @@ PACKAGECONFIG[xsync] = "-xsync,-no-xsync"
>  PACKAGECONFIG[xvideo] = "-xvideo,-no-xvideo"
>  PACKAGECONFIG[openvg] = "-openvg,-no-openvg"
>  PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv"
> -PACKAGECONFIG[xkb] = "-xkb,-no-xkb,libxkbcommon"
> +PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon"
>  PACKAGECONFIG[evdev] = "-evdev,-no-evdev"
>  PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev"
>  # depends on glib
Martin Jansa - March 27, 2014, 4:07 p.m.
On Thu, Mar 27, 2014 at 03:36:39PM +0100, Thomas Senyk wrote:
> sorry I think I've missed 
> 
> --subject-prefix="meta-qt5][PATCH"
> 
> ... Is that 'bad' enough to re-send it?

I've noticed it and will apply, so no need to re-send this time.

> Is it:
> --subject-prefix="meta-qt5][PATCH"

this one ^^ (as README says)

> or
> --subject-prefix="oe][meta-qt5][PATCH"
> 
> ?
> 
> Greets
> Thomas
> 
> On Thursday, 27 March, 2014 15:33:07 Thomas Senyk wrote:
> > If one builds with xkb, both -no-xkb and
> > -no-xkbcommon should be set.
> > Without -no-xkbcommon you'll get link-errors
> > for libcomposeplatforminputcontextplugin.so
> > ---
> >  recipes-qt/qt5/qtbase.inc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
> > index 89736be..8aefb5c 100644
> > --- a/recipes-qt/qt5/qtbase.inc
> > +++ b/recipes-qt/qt5/qtbase.inc
> > @@ -105,7 +105,7 @@ PACKAGECONFIG[xsync] = "-xsync,-no-xsync"
> >  PACKAGECONFIG[xvideo] = "-xvideo,-no-xvideo"
> >  PACKAGECONFIG[openvg] = "-openvg,-no-openvg"
> >  PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv"
> > -PACKAGECONFIG[xkb] = "-xkb,-no-xkb,libxkbcommon"
> > +PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon"
> >  PACKAGECONFIG[evdev] = "-evdev,-no-evdev"
> >  PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev"
> >  # depends on glib
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 89736be..8aefb5c 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -105,7 +105,7 @@  PACKAGECONFIG[xsync] = "-xsync,-no-xsync"
 PACKAGECONFIG[xvideo] = "-xvideo,-no-xvideo"
 PACKAGECONFIG[openvg] = "-openvg,-no-openvg"
 PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv"
-PACKAGECONFIG[xkb] = "-xkb,-no-xkb,libxkbcommon"
+PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon"
 PACKAGECONFIG[evdev] = "-evdev,-no-evdev"
 PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev"
 # depends on glib