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

login
register
about
Submitter Steve Sakoman
Date 2010-03-10 20:34:22
Message ID <5e088bd91003101234h267a24bfr558d696fdf703685@mail.gmail.com>
Download mbox | patch
Permalink /patch/1681/
State Not Applicable, archived
Headers show

Comments

Steve Sakoman - 2010-03-10 20:34:22
On Wed, Mar 10, 2010 at 12:25 PM, Phil Blundell <pb@reciva.com> wrote:

> Did you clean and rebuild gtk+-native?  I forgot to mention that this is
> necessary.

Yes, I did:

bitbake -c clean gtk+ gtk+-native gdk-pixbuf-csource-native
bitbake gtk+

My repo is at current top of tree with your gtk+.inc patch and
gtk+_2.18.6.bb unchanged:

$ git diff recipes/gtk+/gtk+.inc

$ git diff recipes/gtk+/gtk+_2.18.6.bb
$

Patch

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.
+       # Copy over all headers, since the maemo stuff needs access to the priva
+       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/g
+}
+
 postinst_prologue() {
 if [ "x$D" != "x" ]; then
   exit 1