| Submitter | Ross Burton |
|---|---|
| Date | Sept. 14, 2012, 9:44 a.m. |
| Message ID | <1347615853-20491-1-git-send-email-ross.burton@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/36527/ |
| State | New |
| Headers | show |
Comments
On 09/14/2012 02:44 AM, Ross Burton wrote: > Default to enabling it as we were build-depending on it already. If a user > needs the disk space and the limitations imposed by not using libcroco are > acceptable they can override this. > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb > index 6bb5fe2..b118805 100644 > --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb > +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb > @@ -7,15 +7,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ > file://rsvg.h;beginline=3;endline=24;md5=20b4113c4909bbf0d67e006778302bc6" > > SECTION = "x11/utils" > -DEPENDS = "gtk+ libcroco cairo libxml2" > +DEPENDS = "gtk+ cairo libxml2" > DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native" > BBCLASSEXTEND = "native" > > -PR = "r9" > +PR = "r10" > > inherit autotools pkgconfig gnome gtk-doc > > -EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco" > +EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz" > + > +PACKAGECONFIG ??= "croco" > +# When native we can manage without croco, as it's only for GTK+ > +PACKAGECONFIG_class-native ??= "" > + > +PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" > > SRC_URI += "file://doc_Makefile.patch" > > Merged int OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb index 6bb5fe2..b118805 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb @@ -7,15 +7,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://rsvg.h;beginline=3;endline=24;md5=20b4113c4909bbf0d67e006778302bc6" SECTION = "x11/utils" -DEPENDS = "gtk+ libcroco cairo libxml2" +DEPENDS = "gtk+ cairo libxml2" DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native" BBCLASSEXTEND = "native" -PR = "r9" +PR = "r10" inherit autotools pkgconfig gnome gtk-doc -EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco" +EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz" + +PACKAGECONFIG ??= "croco" +# When native we can manage without croco, as it's only for GTK+ +PACKAGECONFIG_class-native ??= "" + +PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" SRC_URI += "file://doc_Makefile.patch"
Default to enabling it as we were build-depending on it already. If a user needs the disk space and the limitations imposed by not using libcroco are acceptable they can override this. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)