diff options
author | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
commit | b2f192faabe412adce79534e22efe9fb69ee40e2 (patch) | |
tree | 7076c49d4286f8a1733650bd8fbc7161af200d57 /openembedded/packages/glib-2.0 | |
parent | 2cf0eadf9f730027833af802d7e6c90b44248f80 (diff) | |
download | openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.bz2 openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.zip |
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/glib-2.0')
12 files changed, 0 insertions, 413 deletions
diff --git a/openembedded/packages/glib-2.0/files/atomic_fix.patch b/openembedded/packages/glib-2.0/files/atomic_fix.patch deleted file mode 100644 index ddc7ada778..0000000000 --- a/openembedded/packages/glib-2.0/files/atomic_fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: glib-2.10.3/glib/gthread.c -=================================================================== ---- glib-2.10.3.orig/glib/gthread.c 2005-12-01 16:34:26.000000000 +0000 -+++ glib-2.10.3/glib/gthread.c 2006-07-06 08:17:18.000000000 +0100 -@@ -164,10 +164,10 @@ - _g_messages_thread_init_nomessage (); - - /* we may run full-fledged initializers from here */ -+ _g_atomic_thread_init (); - _g_convert_thread_init (); - _g_rand_thread_init (); - _g_main_thread_init (); -- _g_atomic_thread_init (); - _g_utils_thread_init (); - #ifdef G_OS_WIN32 - _g_win32_thread_init (); diff --git a/openembedded/packages/glib-2.0/files/glib-gettextize-dir.patch b/openembedded/packages/glib-2.0/files/glib-gettextize-dir.patch deleted file mode 100644 index 989211c927..0000000000 --- a/openembedded/packages/glib-2.0/files/glib-gettextize-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glib-2.6.2/glib-gettextize.in.old 2005-02-15 02:43:17.000000000 +0000 -+++ glib-2.6.2/glib-gettextize.in 2005-02-15 02:43:18.000000000 +0000 -@@ -43,7 +43,7 @@ - - # Directory where the sources are stored. - prefix=@prefix@ --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/openembedded/packages/glib-2.0/files/glibconfig-sysdefs.h b/openembedded/packages/glib-2.0/files/glibconfig-sysdefs.h deleted file mode 100644 index 1329e7f21c..0000000000 --- a/openembedded/packages/glib-2.0/files/glibconfig-sysdefs.h +++ /dev/null @@ -1,6 +0,0 @@ -#define GLIB_SYSDEF_POLLIN =1 -#define GLIB_SYSDEF_POLLOUT =4 -#define GLIB_SYSDEF_POLLPRI =2 -#define GLIB_SYSDEF_POLLERR =8 -#define GLIB_SYSDEF_POLLHUP =16 -#define GLIB_SYSDEF_POLLNVAL =32 diff --git a/openembedded/packages/glib-2.0/files/glibinclude.patch b/openembedded/packages/glib-2.0/files/glibinclude.patch deleted file mode 100644 index 5413e50e00..0000000000 --- a/openembedded/packages/glib-2.0/files/glibinclude.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- glib-2.0-2.4.6-r1/glib-2.4.6/glib/Makefile.am~glibinclude.patch -+++ glib-2.0-2.4.6-r1/glib-2.4.6/glib/Makefile.am -@@ -157,8 +157,8 @@ - gprintf.h - - install-data-local: install-ms-lib install-libtool-import-lib -- @if test -f $(glibincludedir)/glist.h ; then \ -- echo "*** Old headers found in $(glibincludedir). You should remove the" ; \ -+ @if test -f $(DESTDIR)$(glibincludedir)/glist.h ; then \ -+ echo "*** Old headers found in $(DESTDIR)$(glibincludedir). You should remove the" ; \ - echo "*** contents of this directory and type 'make install' again." ; \ - false ; \ - fi diff --git a/openembedded/packages/glib-2.0/glib-2.0-native-2.10.3/glib-gettextize-dir.patch b/openembedded/packages/glib-2.0/glib-2.0-native-2.10.3/glib-gettextize-dir.patch deleted file mode 100644 index efe3325578..0000000000 --- a/openembedded/packages/glib-2.0/glib-2.0-native-2.10.3/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/openembedded/packages/glib-2.0/glib-2.0-native_2.10.3.bb b/openembedded/packages/glib-2.0/glib-2.0-native_2.10.3.bb deleted file mode 100644 index 402ec2d390..0000000000 --- a/openembedded/packages/glib-2.0/glib-2.0-native_2.10.3.bb +++ /dev/null @@ -1,55 +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="r1" - -EXTRA_OECONF = "--disable-debug" - -SRC_URI = "http://download.gnome.org/sources/glib/2.10//glib-${PV}.tar.bz2 \ - file://glib-gettextize-dir.patch;patch=1 \ - file://atomic_fix.patch;patch=1 \ - file://glibconfig-sysdefs.h" - -S = "${WORKDIR}/glib-${PV}" - -inherit autotools pkgconfig native 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 () { - 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/openembedded/packages/glib-2.0/glib-2.0-native_2.12.0.bb b/openembedded/packages/glib-2.0/glib-2.0-native_2.12.0.bb deleted file mode 100644 index 768f2777d8..0000000000 --- a/openembedded/packages/glib-2.0/glib-2.0-native_2.12.0.bb +++ /dev/null @@ -1,54 +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="r1" - -EXTRA_OECONF = "--disable-debug" - -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 - -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 () { - 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/openembedded/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/openembedded/packages/glib-2.0/glib-2.0-native_2.6.5.bb deleted file mode 100644 index 785261e7cf..0000000000 --- a/openembedded/packages/glib-2.0/glib-2.0-native_2.6.5.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 <pb@handhelds.org>" -DEPENDS = "gtk-doc-native" -PR = "r3" - -EXTRA_OECONF = "--disable-debug" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/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/openembedded/packages/glib-2.0/glib-2.0_2.10.3.bb b/openembedded/packages/glib-2.0/glib-2.0_2.10.3.bb deleted file mode 100644 index df0f3bd82c..0000000000 --- a/openembedded/packages/glib-2.0/glib-2.0_2.10.3.bb +++ /dev/null @@ -1,48 +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 += "glib-2.0-native gtk-doc" -DEPENDS += "virtual/libiconv virtual/libintl" -PACKAGES =+ "glib-2.0-utils " -PR = "r3" - -LEAD_SONAME = "libglib-2.0.*" -FILES_glib-2.0-utils = "${bindir}/*" - -EXTRA_OECONF = "--disable-debug" - -SRC_URI = "http://download.gnome.org/sources/glib/2.10//glib-${PV}.tar.bz2 \ - file://atomic_fix.patch;patch=1 \ - 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.12.0.bb b/openembedded/packages/glib-2.0/glib-2.0_2.12.0.bb deleted file mode 100644 index 31d7347a06..0000000000 --- a/openembedded/packages/glib-2.0/glib-2.0_2.12.0.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 += "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" - -SRC_URI = "http://download.gnome.org/sources/glib/2.12/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.6.4.bb b/openembedded/packages/glib-2.0/glib-2.0_2.6.4.bb deleted file mode 100644 index 2765cc0a63..0000000000 --- a/openembedded/packages/glib-2.0/glib-2.0_2.6.4.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 <pb@handhelds.org>" -DEPENDS += "glib-2.0-native gtk-doc" -DEPENDS += "virtual/libiconv virtual/libintl" -PACKAGES =+ "glib-2.0-utils " -PR = "r0" - -LEAD_SONAME = "libglib-2.0.*" -FILES_glib-2.0-utils = "${bindir}/*" - -EXTRA_OECONF = "--disable-debug" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ - file://glibinclude.patch;patch=1;pnum=2 \ - 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 deleted file mode 100644 index e0f171ea4a..0000000000 --- a/openembedded/packages/glib-2.0/glib-2.0_2.8.6.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 <pb@handhelds.org>" -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 -} |