From f364836768440e062f7886f19e6d34d691796538 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sun, 13 Jan 2008 16:43:09 +0000 Subject: glib-2.0-native: upgrade from 2.12.4 to 2.12.13 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3475 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky.conf | 2 +- .../glib-gettextize-dir.patch | 11 +++++ .../glib-gettextize-dir.patch | 11 ----- meta/packages/glib-2.0/glib-2.0-native_2.12.13.bb | 47 ++++++++++++++++++++++ meta/packages/glib-2.0/glib-2.0-native_2.12.4.bb | 47 ---------------------- 5 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 meta/packages/glib-2.0/glib-2.0-native-2.12.13/glib-gettextize-dir.patch delete mode 100644 meta/packages/glib-2.0/glib-2.0-native-2.12.4/glib-gettextize-dir.patch create mode 100644 meta/packages/glib-2.0/glib-2.0-native_2.12.13.bb delete mode 100644 meta/packages/glib-2.0/glib-2.0-native_2.12.4.bb diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 93bd1e734..50d7e1bbe 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -192,7 +192,7 @@ PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" PREFERRED_VERSION_sato-icon-theme ?= "0.1" PREFERRED_VERSION_glib-2.0 ?= "2.14.5" -PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" +PREFERRED_VERSION_glib-2.0-native ?= "2.12.13" PREFERRED_VERSION_atk ?= "1.20.0" PREFERRED_VERSION_cairo ?= "1.4.10" PREFERRED_VERSION_pango ?= "1.18.3" diff --git a/meta/packages/glib-2.0/glib-2.0-native-2.12.13/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-native-2.12.13/glib-gettextize-dir.patch new file mode 100644 index 000000000..efe332557 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-native-2.12.13/glib-gettextize-dir.patch @@ -0,0 +1,11 @@ +--- glib-2.10.3/glib-gettextize.in.old 2006-06-21 12:46:45.000000000 +0100 ++++ glib-2.10.3/glib-gettextize.in 2006-06-21 12:48:14.000000000 +0100 +@@ -49,7 +49,7 @@ + ;; + esac + +-gettext_dir=$prefix/share/glib-2.0/gettext ++gettext_dir=@datadir@/glib-2.0/gettext + + while test $# -gt 0; do + case "$1" in diff --git a/meta/packages/glib-2.0/glib-2.0-native-2.12.4/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-native-2.12.4/glib-gettextize-dir.patch deleted file mode 100644 index efe332557..000000000 --- a/meta/packages/glib-2.0/glib-2.0-native-2.12.4/glib-gettextize-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glib-2.10.3/glib-gettextize.in.old 2006-06-21 12:46:45.000000000 +0100 -+++ glib-2.10.3/glib-gettextize.in 2006-06-21 12:48:14.000000000 +0100 -@@ -49,7 +49,7 @@ - ;; - esac - --gettext_dir=$prefix/share/glib-2.0/gettext -+gettext_dir=@datadir@/glib-2.0/gettext - - while test $# -gt 0; do - case "$1" in diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.12.13.bb b/meta/packages/glib-2.0/glib-2.0-native_2.12.13.bb new file mode 100644 index 000000000..e2c54e631 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-native_2.12.13.bb @@ -0,0 +1,47 @@ +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" +DEPENDS += "gtk-doc-native" +PR="r2" + +SRC_URI = "http://download.gnome.org/sources/glib/2.12/glib-${PV}.tar.bz2 \ + file://glib-gettextize-dir.patch;patch=1 \ + file://glibconfig-sysdefs.h" + +S = "${WORKDIR}/glib-${PV}" + +inherit autotools pkgconfig native gettext + +acpaths = "" +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . +} + +do_stage () { + install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/ + install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/ + install -m 0755 glib-gettextize ${STAGING_BINDIR}/ + 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 + install -d ${STAGING_DATADIR}/glib-2.0/gettext/po + install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/ + install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/ +} + +do_install () { + : +} + diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.12.4.bb b/meta/packages/glib-2.0/glib-2.0-native_2.12.4.bb deleted file mode 100644 index e2c54e631..000000000 --- a/meta/packages/glib-2.0/glib-2.0-native_2.12.4.bb +++ /dev/null @@ -1,47 +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" -DEPENDS += "gtk-doc-native" -PR="r2" - -SRC_URI = "http://download.gnome.org/sources/glib/2.12/glib-${PV}.tar.bz2 \ - file://glib-gettextize-dir.patch;patch=1 \ - file://glibconfig-sysdefs.h" - -S = "${WORKDIR}/glib-${PV}" - -inherit autotools pkgconfig native gettext - -acpaths = "" -do_configure_prepend () { - install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . -} - -do_stage () { - install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/ - install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/ - install -m 0755 glib-gettextize ${STAGING_BINDIR}/ - 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 - install -d ${STAGING_DATADIR}/glib-2.0/gettext/po - install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/ - install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/ -} - -do_install () { - : -} - -- cgit v1.2.3