introduction of virtual/gail
PATCH 1/1 introduction of virtual/gail
gtk+ >= 2.13.0 already includes gail. However build of gail package may be still triggered by a number of package that require it explicitly. It causes runtime problems having two different packages providing the same library.
This patch introduces virtual/gail, which can be satisfied by gtk+ >= 2.13.0 or gail, depending on preferred version of gtk+ of a particular distro.
recipes/eel/eel_2.12.2.bb +1 -1
@@ -7,7 +7,7 @@ inherit gnome 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"
recipes/eel/eel_2.22.2.bb +1 -1
@@ -8,7 +8,7 @@ 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() {
recipes/eel/eel_2.24.1.bb +1 -1
@@ -8,7 +8,7 @@ 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() {
recipes/eel/eel_2.6.1.bb +1 -1
@@ -7,7 +7,7 @@ inherit gnome 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"
recipes/gnome/gail_1.20.0.bb +1 -0
@@ -3,6 +3,7 @@ SECTION = "x11/libs" PR = "r0" DESCRIPTION = "GNOME Accessibility Implementation Library" DEPENDS = "gtk+" +PROVIDES = "virtual/gail" inherit gnome
recipes/gnome/libgnomecanvas_2.20.0.bb +1 -1
@@ -4,7 +4,7 @@ DESCRIPTION = "A powerful object-oriented display" inherit gnome -DEPENDS = "libglade libart-lgpl gail" +DEPENDS = "libglade libart-lgpl virtual/gail" EXTRA_OECONF = "--disable-gtk-doc"
recipes/gtk+/gtk+.inc +3 -0
@@ -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
recipes/gtk+/gtk+_2.14.2.bb +2 -0
@@ -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"
recipes/gtk+/gtk+_2.16.0.bb +2 -0
@@ -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"
recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb +1 -1
@@ -1,6 +1,6 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui gal-2.0" PR = "r0" SRC_URI = "http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz"
recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb +1 -1
@@ -1,6 +1,6 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui gal-2.0" PR = "r2" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \
recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb +1 -1
@@ -1,6 +1,6 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.1/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.1"
recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb +1 -1
@@ -1,6 +1,6 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2 \ file://cross-includedir.patch;patch=1"
recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb +1 -1
@@ -2,7 +2,7 @@ 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" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.12/gtkhtml-${PV}.tar.bz2 \ file://60_glib-2.15-g-gnuc-function.patch;patch=1"
recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb +1 -1
@@ -1,6 +1,6 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.18/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.8"
recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb +1 -1
@@ -1,6 +1,6 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.8/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.8"
recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb +1 -1
@@ -1,6 +1,6 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libgnomeprint orbit2-native" +DEPENDS = "gtk+ virtual/gail libgnomeprint orbit2-native" PR = "r1" SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2"
recipes/nonworking/sword/gnomesword_2.1.2.bb +1 -1
@@ -1,7 +1,7 @@ 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" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
Signature · 2 lines
Stanislav Brabec http://www.penguin.cz/~utx/zaurus
Dnia czwartek, 2 kwietnia 2009 o 15:23:07 Stanislav Brabec napisał(a):
Quoted 8 lines
gtk+ >= 2.13.0 already includes gail. However build of gail package may be still triggered by a number of package that require it explicitly. It causes runtime problems having two different packages providing the same library.
This patch introduces virtual/gail, which can be satisfied by gtk+ >= 2.13.0 or gail, depending on preferred version of gtk+ of a particular distro.
Please bump PR of affected GTK+ recipes and I will Ack it.
Regards,
Signature · 3 lines
JID: [email protected] Website: http://marcin.juszkiewicz.com.pl/ LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
Quoted 11 lines · Marcin Juszkiewicz
Dnia czwartek, 2 kwietnia 2009 o 15:23:07 Stanislav Brabec napisał(a):
Quoted 8 lines
gtk+ >= 2.13.0 already includes gail. However build of gail package may be still triggered by a number of package that require it explicitly. It causes runtime problems having two different packages providing the same library.
This patch introduces virtual/gail, which can be satisfied by gtk+ >= 2.13.0 or gail, depending on preferred version of gtk+ of a particular distro.
Please bump PR of affected GTK+ recipes and I will Ack it.
OK, I will do.
There is one remaining problem: How to create correct RREPLACES for all locale packages?
Signature · 2 lines
Stanislav Brabec http://www.penguin.cz/~utx/zaurus