Patchwork [WIP,17/20] librsvg: Fix dependencies for PACKAGECONFIG gdkpixbuf

login
register
mail settings
Submitter Martin Jansa
Date Aug. 29, 2013, 4:03 p.m.
Message ID <e77564486cce8199bd317f1ee79adb4f8b508ffa.1377792006.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/57019/
State New
Headers show

Comments

Martin Jansa - Aug. 29, 2013, 4:03 p.m.
* without gtk+ or gdk-pixbuf available it gets disabled even with --enable-pixbuf-loader

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Saul Wold - Aug. 29, 2013, 5:49 p.m.
On 08/29/2013 09:03 AM, Martin Jansa wrote:
> * without gtk+ or gdk-pixbuf available it gets disabled even with --enable-pixbuf-loader
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>   meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> index 4818422..30846bf 100644
> --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> @@ -29,7 +29,7 @@ PACKAGECONFIG ??= "croco gdkpixbuf"
>   # Support embedded CSS stylesheets (recommended upstream)
>   PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
>   # gdk-pixbuf loader
> -PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader"
> +PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gtk+ gdk-pixbuf"

I think this needs to be a target only PACKAGECONFIG, as it will try to 
depend on gtk+-native when building the librsvg-native.

Sau!

>   # GTK+ 2 theme engine
>   PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+"
>
>
Martin Jansa - Aug. 29, 2013, 6:30 p.m.
On Thu, Aug 29, 2013 at 10:49:03AM -0700, Saul Wold wrote:
> On 08/29/2013 09:03 AM, Martin Jansa wrote:
> > * without gtk+ or gdk-pixbuf available it gets disabled even with --enable-pixbuf-loader
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >   meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> > index 4818422..30846bf 100644
> > --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> > +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> > @@ -29,7 +29,7 @@ PACKAGECONFIG ??= "croco gdkpixbuf"
> >   # Support embedded CSS stylesheets (recommended upstream)
> >   PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
> >   # gdk-pixbuf loader
> > -PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader"
> > +PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gtk+ gdk-pixbuf"
> 
> I think this needs to be a target only PACKAGECONFIG, as it will try to 
> depend on gtk+-native when building the librsvg-native.

Yes I've noticed it couple minutes after sending this patchset and it's
already fixed in branch (just not squashed yet - waiting for next
build).

Thanks for review

> 
> Sau!
> 
> >   # GTK+ 2 theme engine
> >   PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+"
> >
> >
Richard Purdie - Aug. 30, 2013, 2:59 p.m.
On Thu, 2013-08-29 at 10:49 -0700, Saul Wold wrote:
> On 08/29/2013 09:03 AM, Martin Jansa wrote:
> > * without gtk+ or gdk-pixbuf available it gets disabled even with --enable-pixbuf-loader
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >   meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> > index 4818422..30846bf 100644
> > --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> > +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
> > @@ -29,7 +29,7 @@ PACKAGECONFIG ??= "croco gdkpixbuf"
> >   # Support embedded CSS stylesheets (recommended upstream)
> >   PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
> >   # gdk-pixbuf loader
> > -PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader"
> > +PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gtk+ gdk-pixbuf"
> 
> I think this needs to be a target only PACKAGECONFIG, as it will try to 
> depend on gtk+-native when building the librsvg-native.

Also do we really need gtk for the pixbuf loader? gtk2 theme engine
pulls in gtk+ elsewhere?

Cheers,

Richard
Ross Burton - Sept. 3, 2013, 10:17 a.m.
On 30 August 2013 15:59, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>> I think this needs to be a target only PACKAGECONFIG, as it will try to
>> depend on gtk+-native when building the librsvg-native.
>
> Also do we really need gtk for the pixbuf loader? gtk2 theme engine
> pulls in gtk+ elsewhere?

gdk-pixbuf should be sufficient.

Ross

Patch

diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 4818422..30846bf 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -29,7 +29,7 @@  PACKAGECONFIG ??= "croco gdkpixbuf"
 # Support embedded CSS stylesheets (recommended upstream)
 PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
 # gdk-pixbuf loader
-PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader"
+PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gtk+ gdk-pixbuf"
 # GTK+ 2 theme engine
 PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+"