[oe-commits] Stanislav Brabec : virtual/gail: Introduction of new virtual:
GIT User account
git at amethyst.openembedded.net
Thu Apr 2 21:56:21 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 9c67c93114222bc6a33e653c21a1fa71a5d65e5e
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9c67c93114222bc6a33e653c21a1fa71a5d65e5e
Author: Stanislav Brabec <utx at penguin.cz>
Date: Thu Apr 2 19:39:54 2009 +0000
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
---
recipes/eel/eel_2.12.2.bb | 3 ++-
recipes/eel/eel_2.22.2.bb | 3 ++-
recipes/eel/eel_2.24.1.bb | 3 ++-
recipes/eel/eel_2.6.1.bb | 3 ++-
recipes/gnome/gail_1.20.0.bb | 1 +
recipes/gnome/libgnomecanvas_2.20.0.bb | 3 ++-
recipes/gtk+/gtk+.inc | 3 +++
recipes/gtk+/gtk+_2.14.2.bb | 4 +++-
recipes/gtk+/gtk+_2.16.0.bb | 4 +++-
recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb | 4 ++--
recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb | 4 ++--
recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb | 3 ++-
recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb | 3 ++-
recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb | 3 ++-
recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb | 3 ++-
recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb | 3 ++-
recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb | 4 ++--
recipes/nonworking/sword/gnomesword_2.1.2.bb | 4 ++--
18 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/recipes/eel/eel_2.12.2.bb b/recipes/eel/eel_2.12.2.bb
index 92bfc88..88682b5 100644
--- a/recipes/eel/eel_2.12.2.bb
+++ b/recipes/eel/eel_2.12.2.bb
@@ -3,11 +3,12 @@
# Released under the MIT license (see packages/COPYING)
inherit gnome
+PR = "r2"
LICENSE="GPL"
SRC_URI += "file://configure.patch;patch=1"
-DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail"
+DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail"
EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/recipes/eel/eel_2.22.2.bb b/recipes/eel/eel_2.22.2.bb
index 0435379..0c7a6de 100644
--- a/recipes/eel/eel_2.22.2.bb
+++ b/recipes/eel/eel_2.22.2.bb
@@ -3,12 +3,13 @@
# Released under the MIT license (see packages/COPYING)
inherit gnome
+PR = "r2"
LICENSE="GPL"
SRC_URI += "file://eel-no-strftime.patch;patch=1"
-DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail"
+DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail"
EXTRA_OECONF = "--disable-gtk-doc"
do_stage() {
diff --git a/recipes/eel/eel_2.24.1.bb b/recipes/eel/eel_2.24.1.bb
index 0435379..0c7a6de 100644
--- a/recipes/eel/eel_2.24.1.bb
+++ b/recipes/eel/eel_2.24.1.bb
@@ -3,12 +3,13 @@
# Released under the MIT license (see packages/COPYING)
inherit gnome
+PR = "r2"
LICENSE="GPL"
SRC_URI += "file://eel-no-strftime.patch;patch=1"
-DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail"
+DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail"
EXTRA_OECONF = "--disable-gtk-doc"
do_stage() {
diff --git a/recipes/eel/eel_2.6.1.bb b/recipes/eel/eel_2.6.1.bb
index f123a4a..d93aab1 100644
--- a/recipes/eel/eel_2.6.1.bb
+++ b/recipes/eel/eel_2.6.1.bb
@@ -3,11 +3,12 @@
# Released under the MIT license (see packages/COPYING)
inherit gnome
+PR = "r2"
LICENSE="GPL"
SRC_URI += "file://configure.patch;patch=1"
-DEPENDS="libgnomeui gail"
+DEPENDS="libgnomeui virtual/gail"
EXTRA_OECONF = "--disable-gtk-doc"
edir="${STAGING_INCDIR}/eel-2/eel"
diff --git a/recipes/gnome/gail_1.20.0.bb b/recipes/gnome/gail_1.20.0.bb
index 58168a0..13346f3 100644
--- a/recipes/gnome/gail_1.20.0.bb
+++ b/recipes/gnome/gail_1.20.0.bb
@@ -3,6 +3,7 @@ SECTION = "x11/libs"
PR = "r0"
DESCRIPTION = "GNOME Accessibility Implementation Library"
DEPENDS = "gtk+"
+PROVIDES = "virtual/gail"
inherit gnome
diff --git a/recipes/gnome/libgnomecanvas_2.20.0.bb b/recipes/gnome/libgnomecanvas_2.20.0.bb
index 8e13c95..16391cb 100644
--- a/recipes/gnome/libgnomecanvas_2.20.0.bb
+++ b/recipes/gnome/libgnomecanvas_2.20.0.bb
@@ -1,10 +1,11 @@
LICENSE = "GPL"
SECTION = "x11/gnome/libs"
DESCRIPTION = "A powerful object-oriented display"
+PR = "r2"
inherit gnome
-DEPENDS = "libglade libart-lgpl gail"
+DEPENDS = "libglade libart-lgpl virtual/gail"
EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index e17a91d..c0b9ed5 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 259c0ac..eb6cc53 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 b5f7c71..0b4e24e 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"
diff --git a/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb b/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb
index f44e8b5..21d1a6b 100644
--- a/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb
+++ b/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb
@@ -1,7 +1,7 @@
require gtkhtml.inc
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
-PR = "r0"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
+PR = "r1"
SRC_URI = "http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz"
diff --git a/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb b/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb
index 66993ce..c45b9f7 100644
--- a/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb
+++ b/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb
@@ -1,7 +1,7 @@
require gtkhtml.inc
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
-PR = "r2"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui gal-2.0"
+PR = "r3"
SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \
file://fix-missing-colormap.patch;patch=1"
diff --git a/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb b/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb
index 1e389da..18d77d8 100644
--- a/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb
+++ b/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb
@@ -1,6 +1,7 @@
require gtkhtml.inc
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
+PR = "r2"
SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.1/gtkhtml-${PV}.tar.bz2"
FILES_${PN} += "${datadir}/gtkhtml-3.1"
diff --git a/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb b/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb
index cb2b8b2..e63bc4c 100644
--- a/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb
+++ b/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb
@@ -1,6 +1,7 @@
require gtkhtml.inc
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
+PR = "r2"
SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2 \
file://cross-includedir.patch;patch=1"
diff --git a/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb b/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb
index e8727bd..6a48e83 100644
--- a/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb
+++ b/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "HTML rendering/editing library"
SECTION = "x11/libs"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
+PR = "r2"
SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.12/gtkhtml-${PV}.tar.bz2 \
file://60_glib-2.15-g-gnuc-function.patch;patch=1"
diff --git a/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb b/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb
index e678bc3..6b8bffd 100644
--- a/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb
+++ b/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb
@@ -1,6 +1,7 @@
require gtkhtml.inc
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
+PR = "r2"
SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.18/gtkhtml-${PV}.tar.bz2"
FILES_${PN} += "${datadir}/gtkhtml-3.8"
diff --git a/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb b/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb
index cc177de..204d925 100644
--- a/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb
+++ b/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb
@@ -1,6 +1,7 @@
require gtkhtml.inc
-DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui"
+PR = "r2"
SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.8/gtkhtml-${PV}.tar.bz2"
FILES_${PN} += "${datadir}/gtkhtml-3.8"
diff --git a/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
index 44a96d6..cec898e 100644
--- a/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
+++ b/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
@@ -1,7 +1,7 @@
require gtkhtml.inc
-DEPENDS = "gtk+ gail libgnomeprint orbit2-native"
-PR = "r1"
+DEPENDS = "gtk+ virtual/gail libgnomeprint orbit2-native"
+PR = "r2"
SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2"
FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so"
diff --git a/recipes/nonworking/sword/gnomesword_2.1.2.bb b/recipes/nonworking/sword/gnomesword_2.1.2.bb
index a4ec60d..6fe172a 100644
--- a/recipes/nonworking/sword/gnomesword_2.1.2.bb
+++ b/recipes/nonworking/sword/gnomesword_2.1.2.bb
@@ -1,8 +1,8 @@
DESCRIPTION = "GUI frontend for sword"
HOMEPAGE = "http://gnomesword.sf.net"
LICENSE = "GPLv3"
-DEPENDS = "gail libgnomeui gtkhtml-3.6 gail sword"
-
+DEPENDS = "libgnomeui gtkhtml-3.6 virtual/gail sword"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
More information about the Openembedded-commits
mailing list