From 1aa816c1f6a824ea11a2b5c557b4bec4f0fbe997 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 23 May 2006 08:25:25 +0000 Subject: Upgrade glib 2.8.x to 2.8.6 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@412 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/conf/distro/poky.conf | 2 +- openembedded/packages/glib-2.0/glib-2.0_2.8.1.bb | 49 ------------------------ openembedded/packages/glib-2.0/glib-2.0_2.8.6.bb | 49 ++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 openembedded/packages/glib-2.0/glib-2.0_2.8.1.bb create mode 100644 openembedded/packages/glib-2.0/glib-2.0_2.8.6.bb (limited to 'openembedded') diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index 0c9e566b9a..165f3091ed 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf @@ -122,7 +122,7 @@ PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}" #PREFERRED_VERSION_atk ?= "1.10.0" #PREFERRED_VERSION_cairo ?= "1.0.0" -PREFERRED_VERSION_glib-2.0 ?= "2.8.1" +PREFERRED_VERSION_glib-2.0 ?= "2.8.6" #PREFERRED_VERSION_gtk+ ?= "2.8.9" #PREFERRED_VERSION_pango ?= "1.10.0" diff --git a/openembedded/packages/glib-2.0/glib-2.0_2.8.1.bb b/openembedded/packages/glib-2.0/glib-2.0_2.8.1.bb deleted file mode 100644 index e0f171ea4a..0000000000 --- a/openembedded/packages/glib-2.0/glib-2.0_2.8.1.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "GLib is a general-purpose utility library, \ -which provides many useful data types, macros, \ -type conversions, string utilities, file utilities, a main \ -loop abstraction, and so on. It works on many \ -UNIX-like platforms, Windows, OS/2 and BeOS." -LICENSE = "LGPL" -SECTION = "libs" -PRIORITY = "optional" -MAINTAINER = "Philip Blundell " -DEPENDS += "glib-2.0-native gtk-doc" -DEPENDS += "virtual/libiconv virtual/libintl" -PACKAGES =+ "glib-2.0-utils " -PR = "r1" - -LEAD_SONAME = "libglib-2.0.*" -FILES_glib-2.0-utils = "${bindir}/*" - -EXTRA_OECONF = "--disable-debug" -# --with-libiconv=gnu" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h" - -S = "${WORKDIR}/glib-${PV}" - -inherit autotools pkgconfig gettext - -python () { - if bb.data.getVar("USE_NLS", d, 1) == "no": - raise bb.parse.SkipPackage("${PN} requires native language support.") -} - -acpaths = "" -do_configure_prepend () { - install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . -} - -do_stage () { - oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} - autotools_stage_includes - install -d ${STAGING_INCDIR}/glib-2.0/glib - install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 - install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 -} diff --git a/openembedded/packages/glib-2.0/glib-2.0_2.8.6.bb b/openembedded/packages/glib-2.0/glib-2.0_2.8.6.bb new file mode 100644 index 0000000000..e0f171ea4a --- /dev/null +++ b/openembedded/packages/glib-2.0/glib-2.0_2.8.6.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "GLib is a general-purpose utility library, \ +which provides many useful data types, macros, \ +type conversions, string utilities, file utilities, a main \ +loop abstraction, and so on. It works on many \ +UNIX-like platforms, Windows, OS/2 and BeOS." +LICENSE = "LGPL" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell " +DEPENDS += "glib-2.0-native gtk-doc" +DEPENDS += "virtual/libiconv virtual/libintl" +PACKAGES =+ "glib-2.0-utils " +PR = "r1" + +LEAD_SONAME = "libglib-2.0.*" +FILES_glib-2.0-utils = "${bindir}/*" + +EXTRA_OECONF = "--disable-debug" +# --with-libiconv=gnu" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h" + +S = "${WORKDIR}/glib-${PV}" + +inherit autotools pkgconfig gettext + +python () { + if bb.data.getVar("USE_NLS", d, 1) == "no": + raise bb.parse.SkipPackage("${PN} requires native language support.") +} + +acpaths = "" +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . +} + +do_stage () { + oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} + autotools_stage_includes + install -d ${STAGING_INCDIR}/glib-2.0/glib + install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 + install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 +} -- cgit v1.2.3-54-g00ecf