diff options
| author |   Stanislav Brabec <utx@penguin.cz> | 2009-04-02 19:39:54 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2009-04-02 19:39:54 +0000 |
| commit | 9c67c93114222bc6a33e653c21a1fa71a5d65e5e (patch) | |
| tree | 3dffa07bd0d9bd22c74a65f89bf62b1df5a1ed88 /recipes/gtk+ | |
| parent | b711f9d53e5647a993ee3e258bd2e1f37b0875e3 (diff) | |
| download | openembedded-9c67c93114222bc6a33e653c21a1fa71a5d65e5e.tar.gz | |
virtual/gail: Introduction of new virtual:
* provided by gtk+ >= 2.13.0 or gail
* gtk+ >= 2.13.0 now stages libgailutil
* use appropriate PROVIDES and DEPENDS for gail
* bump PR to fix packages dependencies
Diffstat (limited to 'recipes/gtk+')
| -rw-r--r-- | recipes/gtk+/gtk+.inc | 3 | ||||
| -rw-r--r-- | recipes/gtk+/gtk+_2.14.2.bb | 4 | ||||
| -rw-r--r-- | recipes/gtk+/gtk+_2.16.0.bb | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc index e17a91dcc4..c0b9ed5c80 100644 --- a/recipes/gtk+/gtk+.inc +++ b/recipes/gtk+/gtk+.inc @@ -44,6 +44,9 @@ do_stage () { oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} + if test -d modules/other/gail/libgail-util ; then + oe_libinstall -so -C modules/other/gail/libgail-util libgailutil ${STAGING_LIBDIR} + fi autotools_stage_includes diff --git a/recipes/gtk+/gtk+_2.14.2.bb b/recipes/gtk+/gtk+_2.14.2.bb index 259c0ac672..eb6cc536b9 100644 --- a/recipes/gtk+/gtk+_2.14.2.bb +++ b/recipes/gtk+/gtk+_2.14.2.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r3" +PR = "r4" DEPENDS += "cairo jasper" @@ -39,6 +39,8 @@ python populate_packages_prepend () { bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) } +# gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23): +PROVIDES = "virtual/gail" RPROVIDES_${PN} = "libgailutil18" RCONFLICTS_${PN} = "libgailutil18" RREPLACES_${PN} = "libgailutil18" diff --git a/recipes/gtk+/gtk+_2.16.0.bb b/recipes/gtk+/gtk+_2.16.0.bb index b5f7c71afb..0b4e24eea7 100644 --- a/recipes/gtk+/gtk+_2.16.0.bb +++ b/recipes/gtk+/gtk+_2.16.0.bb @@ -1,7 +1,7 @@ require gtk+.inc DEPENDS += "cairo jasper" -PR = "r1" +PR = "r2" # disabled per default - this uses as little patches as possible DEFAULT_PREFERENCE = "-1" @@ -40,6 +40,8 @@ python populate_packages_prepend () { bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) } +# gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23): +PROVIDES = "virtual/gail" RPROVIDES_${PN} = "libgailutil18" RCONFLICTS_${PN} = "libgailutil18" RREPLACES_${PN} = "libgailutil18" |