[oe] [oe-commits] Phil Blundell : gtk+: build gtk-demo and package it appropriately

[Steve Sakoman]

On Wed, Mar 10, 2010 at 12:59 PM, Phil Blundell <philb at gnu.org> wrote:

> Ah, I remember now, you need a patch to base.bbclass as well to make it
> stage the files from etc/.  Try this:

I must be cursed :-(

Still no luck.  gtk+-native builds, but gtk+ still fails with the
apple_red issue.

Here is my diff from top of tree:

diff --git a/classes/base.bbclass b/classes/base.bbclass
index bbc1cc7..a94fa27 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1100,6 +1100,7 @@ sysroot_stage_dirs() {
 		sysroot_stage_libdir $from${base_libdir} $to${STAGING_DIR_HOST}${base_libdir}
 	fi
 	sysroot_stage_dir $from${datadir} $to${STAGING_DATADIR}
+	sysroot_stage_dir $from${sysconfdir} $to${sysconfdir}
 }

 sysroot_stage_all() {
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index 268657b..5431c76 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -66,6 +66,23 @@ do_install_append () {
 	rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la
 }

+do_install_virtclass-native () {
+        autotools_do_install
+
+       mkdir -p ${D}${libdir}/gtk-2.0/include
+       install -m 0644 gdk/gdkconfig.h
${D}${libdir}/gtk-2.0/include/gdkconfig.h
+       # Copy over all headers, since the maemo stuff needs access to
the private api. *sigh*
+       cp gtk/*.h ${D}${includedir}/gtk-2.0/gtk/
+
+       install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
+
+       install -d ${D}${sysconfdir}/gtk-2.0
+       rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la
+
+        mkdir -p "${D}${sysconfdir}/gtk-2.0"
+        ${B}/gdk-pixbuf/gdk-pixbuf-query-loaders >
"${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders"
+}
+
 postinst_prologue() {
 if [ "x$D" != "x" ]; then
   exit 1

Thanks for helping!

Steve