diff options
| -rw-r--r-- | AUTHORS | 32 | ||||
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 23 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 23 | ||||
| -rw-r--r-- | INSTALL.in | 35 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | README.in | 41 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | glib/gutils.c | 7 |
15 files changed, 261 insertions, 43 deletions
@@ -1,14 +1,21 @@ -Original Authors ----------------- -Peter Mattis <petm@xcf.berkeley.edu> -Spencer Kimball <spencer@xcf.berkeley.edu> -Josh MacDonald <jmacd@xcf.berkeley.edu> +Below are just a few of the people who have contributed +to GLib. Please don't mail these people about problems you +have with GTK+; see the README file for information about +filing bugs and submitting patches. -Please do not mail the original authors asking questions about this -version of GLib. +GLib-2.0 Team +------------- +Hans Breuer <hans@breuer.org> +Matthias Clasen <maclas@gmx.de> +Tor Lillqvist <tml@iki.fi> +Tim Janik <timj@gtk.org> +Havoc Pennington <hp@redhat.com> +Ron Steinke <rsteinke@w-link.net> +Owen Taylor <otaylor@redhat.com> +Sebastian Wilhelmi <wilhelmi@ira.uka.de> -GLib Team ---------- +GLib-1.2 Team +------------- Shawn T. Amundson <amundson@gimp.org> Jeff Garzik <jgarzik@pobox.com> Raja R Harinath <harinath@cs.umn.edu> @@ -26,5 +33,8 @@ was developed and originally coded by: Makoto Matsumoto <matumoto@math.keio.ac.jp> Takuji Nishimura <nisimura@math.keio.ac.jp> -There are also many others who have contributed patches and fixes; -we thank them, for helping us in advancing GLIB. +Original Authors +---------------- +Peter Mattis <petm@xcf.berkeley.edu> +Spencer Kimball <spencer@xcf.berkeley.edu> +Josh MacDonald <jmacd@xcf.berkeley.edu> @@ -1,3 +1,24 @@ +Fri Mar 8 00:15:29 2002 Owen Taylor <otaylor@redhat.com> + + * README.in: Updates. + + * README.in: Add warnings about current encoding problems with .po + files and error logging functions. + + * configure.in: Check for bind_textdomain_codeset(). + + * glib/gutils.c (_glib_gettext): Call + bind_textdomain_codeset, if present. + + * INSTALL.in: Some updates. + + * AUTHORS: Updates. + + * Makefile.am (EXTRA_DIST): Remove TODO.xml from EXTRA_DIST. + + * docs/Makefile.am (EXTRA_DIST): Remove Changes-2.0.txt + from EXTRA_DIST. + 2002-03-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Fixed recognition of dce. Do not use -lc_r on @@ -5636,7 +5657,7 @@ Wed May 10 19:52:44 2000 Owen Taylor <otaylor@redhat.com> * makefile.{cygwin,msc}.in (glib_OBJECTS): Add new object files. - * tests/makefile.{cygwin,msc}.in: Add threadpool-test. + * tests/makefile.{cygwin,msc}.in: Add thread pool-test. 2000-04-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5c93f1b6c..109fb6313 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,24 @@ +Fri Mar 8 00:15:29 2002 Owen Taylor <otaylor@redhat.com> + + * README.in: Updates. + + * README.in: Add warnings about current encoding problems with .po + files and error logging functions. + + * configure.in: Check for bind_textdomain_codeset(). + + * glib/gutils.c (_glib_gettext): Call + bind_textdomain_codeset, if present. + + * INSTALL.in: Some updates. + + * AUTHORS: Updates. + + * Makefile.am (EXTRA_DIST): Remove TODO.xml from EXTRA_DIST. + + * docs/Makefile.am (EXTRA_DIST): Remove Changes-2.0.txt + from EXTRA_DIST. + 2002-03-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Fixed recognition of dce. Do not use -lc_r on @@ -5636,7 +5657,7 @@ Wed May 10 19:52:44 2000 Owen Taylor <otaylor@redhat.com> * makefile.{cygwin,msc}.in (glib_OBJECTS): Add new object files. - * tests/makefile.{cygwin,msc}.in: Add threadpool-test. + * tests/makefile.{cygwin,msc}.in: Add thread pool-test. 2000-04-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5c93f1b6c..109fb6313 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,24 @@ +Fri Mar 8 00:15:29 2002 Owen Taylor <otaylor@redhat.com> + + * README.in: Updates. + + * README.in: Add warnings about current encoding problems with .po + files and error logging functions. + + * configure.in: Check for bind_textdomain_codeset(). + + * glib/gutils.c (_glib_gettext): Call + bind_textdomain_codeset, if present. + + * INSTALL.in: Some updates. + + * AUTHORS: Updates. + + * Makefile.am (EXTRA_DIST): Remove TODO.xml from EXTRA_DIST. + + * docs/Makefile.am (EXTRA_DIST): Remove Changes-2.0.txt + from EXTRA_DIST. + 2002-03-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Fixed recognition of dce. Do not use -lc_r on @@ -5636,7 +5657,7 @@ Wed May 10 19:52:44 2000 Owen Taylor <otaylor@redhat.com> * makefile.{cygwin,msc}.in (glib_OBJECTS): Add new object files. - * tests/makefile.{cygwin,msc}.in: Add threadpool-test. + * tests/makefile.{cygwin,msc}.in: Add thread pool-test. 2000-04-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 5c93f1b6c..109fb6313 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,24 @@ +Fri Mar 8 00:15:29 2002 Owen Taylor <otaylor@redhat.com> + + * README.in: Updates. + + * README.in: Add warnings about current encoding problems with .po + files and error logging functions. + + * configure.in: Check for bind_textdomain_codeset(). + + * glib/gutils.c (_glib_gettext): Call + bind_textdomain_codeset, if present. + + * INSTALL.in: Some updates. + + * AUTHORS: Updates. + + * Makefile.am (EXTRA_DIST): Remove TODO.xml from EXTRA_DIST. + + * docs/Makefile.am (EXTRA_DIST): Remove Changes-2.0.txt + from EXTRA_DIST. + 2002-03-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Fixed recognition of dce. Do not use -lc_r on @@ -5636,7 +5657,7 @@ Wed May 10 19:52:44 2000 Owen Taylor <otaylor@redhat.com> * makefile.{cygwin,msc}.in (glib_OBJECTS): Add new object files. - * tests/makefile.{cygwin,msc}.in: Add threadpool-test. + * tests/makefile.{cygwin,msc}.in: Add thread pool-test. 2000-04-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5c93f1b6c..109fb6313 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,24 @@ +Fri Mar 8 00:15:29 2002 Owen Taylor <otaylor@redhat.com> + + * README.in: Updates. + + * README.in: Add warnings about current encoding problems with .po + files and error logging functions. + + * configure.in: Check for bind_textdomain_codeset(). + + * glib/gutils.c (_glib_gettext): Call + bind_textdomain_codeset, if present. + + * INSTALL.in: Some updates. + + * AUTHORS: Updates. + + * Makefile.am (EXTRA_DIST): Remove TODO.xml from EXTRA_DIST. + + * docs/Makefile.am (EXTRA_DIST): Remove Changes-2.0.txt + from EXTRA_DIST. + 2002-03-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Fixed recognition of dce. Do not use -lc_r on @@ -5636,7 +5657,7 @@ Wed May 10 19:52:44 2000 Owen Taylor <otaylor@redhat.com> * makefile.{cygwin,msc}.in (glib_OBJECTS): Add new object files. - * tests/makefile.{cygwin,msc}.in: Add threadpool-test. + * tests/makefile.{cygwin,msc}.in: Add thread pool-test. 2000-04-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5c93f1b6c..109fb6313 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,24 @@ +Fri Mar 8 00:15:29 2002 Owen Taylor <otaylor@redhat.com> + + * README.in: Updates. + + * README.in: Add warnings about current encoding problems with .po + files and error logging functions. + + * configure.in: Check for bind_textdomain_codeset(). + + * glib/gutils.c (_glib_gettext): Call + bind_textdomain_codeset, if present. + + * INSTALL.in: Some updates. + + * AUTHORS: Updates. + + * Makefile.am (EXTRA_DIST): Remove TODO.xml from EXTRA_DIST. + + * docs/Makefile.am (EXTRA_DIST): Remove Changes-2.0.txt + from EXTRA_DIST. + 2002-03-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Fixed recognition of dce. Do not use -lc_r on @@ -5636,7 +5657,7 @@ Wed May 10 19:52:44 2000 Owen Taylor <otaylor@redhat.com> * makefile.{cygwin,msc}.in (glib_OBJECTS): Add new object files. - * tests/makefile.{cygwin,msc}.in: Add threadpool-test. + * tests/makefile.{cygwin,msc}.in: Add thread pool-test. 2000-04-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5c93f1b6c..109fb6313 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,24 @@ +Fri Mar 8 00:15:29 2002 Owen Taylor <otaylor@redhat.com> + + * README.in: Updates. + + * README.in: Add warnings about current encoding problems with .po + files and error logging functions. + + * configure.in: Check for bind_textdomain_codeset(). + + * glib/gutils.c (_glib_gettext): Call + bind_textdomain_codeset, if present. + + * INSTALL.in: Some updates. + + * AUTHORS: Updates. + + * Makefile.am (EXTRA_DIST): Remove TODO.xml from EXTRA_DIST. + + * docs/Makefile.am (EXTRA_DIST): Remove Changes-2.0.txt + from EXTRA_DIST. + 2002-03-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Fixed recognition of dce. Do not use -lc_r on @@ -5636,7 +5657,7 @@ Wed May 10 19:52:44 2000 Owen Taylor <otaylor@redhat.com> * makefile.{cygwin,msc}.in (glib_OBJECTS): Add new object files. - * tests/makefile.{cygwin,msc}.in: Add threadpool-test. + * tests/makefile.{cygwin,msc}.in: Add thread pool-test. 2000-04-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5c93f1b6c..109fb6313 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,24 @@ +Fri Mar 8 00:15:29 2002 Owen Taylor <otaylor@redhat.com> + + * README.in: Updates. + + * README.in: Add warnings about current encoding problems with .po + files and error logging functions. + + * configure.in: Check for bind_textdomain_codeset(). + + * glib/gutils.c (_glib_gettext): Call + bind_textdomain_codeset, if present. + + * INSTALL.in: Some updates. + + * AUTHORS: Updates. + + * Makefile.am (EXTRA_DIST): Remove TODO.xml from EXTRA_DIST. + + * docs/Makefile.am (EXTRA_DIST): Remove Changes-2.0.txt + from EXTRA_DIST. + 2002-03-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Fixed recognition of dce. Do not use -lc_r on @@ -5636,7 +5657,7 @@ Wed May 10 19:52:44 2000 Owen Taylor <otaylor@redhat.com> * makefile.{cygwin,msc}.in (glib_OBJECTS): Add new object files. - * tests/makefile.{cygwin,msc}.in: Add threadpool-test. + * tests/makefile.{cygwin,msc}.in: Add thread pool-test. 2000-04-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> diff --git a/INSTALL.in b/INSTALL.in index 58067f7c5..2c09152f4 100644 --- a/INSTALL.in +++ b/INSTALL.in @@ -13,13 +13,23 @@ Simple install procedure Requirements ============ +GLib-2.0 requires pkg-config, which is tool for tracking the +compilation flags needed for libraries. (For each library, a small .pc +text file is installed in a standard location that contains the +compilation flags needed for that library along with version number +information.) Information about pkg-config can be found at: + + http://www.freedesktop.org/software/pkgconfig/ + +GNU make (http://www.gnu.org/software/make) is also recommended. + In order to implement conversions between character sets, GLib requires an implementation of the standard iconv() routine. Most modern systems will have a suitable implementation, however many older systems lack an iconv() implementation. On such systems, you must install the libiconv library. This can be found at: - http://clisp.cons.org/~haible/packages-libiconv.html + http://www.gnu.org/software/libiconv/ If your system has an iconv implementation but you want to use libiconv instead, you can pass the --with-libiconv option to @@ -30,6 +40,13 @@ search path (for instance, in /usr/local/), but don't enable it, you will get an error while compiling GTK+ because the iconv.h that libiconv installs hides the system iconv. +Finally, for message catalog handling, GTK+ requires an implementation +of gettext(). If your system doesn't provide this functionality, +you should use the libintl library from the GNU gettext package, +available from: + + http://www.gnu.org/software/gettext/ + The Nitty-Gritty ================ @@ -104,14 +121,18 @@ use of these flags is not tested. One particular detail to note, is that the architecture-dependent include file glibconfig.h is installed in: - $exec_pref/lib/glib/include/ + $exec_prefix/lib/glib/include/ if you have a version in $prefix/include, this is out of date and should be deleted. -A shell script glib-config is created during the configure -process, and installed in the bin/ directory -($exec_prefix/bin). This is used to determine the location of glib -when building applications. If you move glib after installation, -it will be necessary to edit this file. +.pc files for the various libraries are installed in +$exec_prefix/lib/pkgconfig to provide information when compiling +other packages that depend on GTK+. If you set PKG_CONFIG_PATH +so that it points to this directory, then you can get the +correct include flags and library flags for compiling a GLib +application with: + + pkg-config --cflags glib-2.0 + pkg-config --libs glib-2.0 diff --git a/Makefile.am b/Makefile.am index ce5344541..76768e614 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ EXTRA_DIST = \ README.in \ INSTALL.in \ README.win32 \ - TODO.xml \ makefile.msc \ makefile.mingw \ glibconfig.h.win32.in \ @@ -1,21 +1,11 @@ - *** IMPORTANT *** - -This is a development version of GLib. You should be using a stable -version, which is available at ftp://ftp.gtk.org/pub/gtk/v1.2/. This -version is meant for developers of GLib only: - - * You should not base stable software on this version of GLib. - * GNOME developers should use a stable version of GLib. - -*** You should be using GLib 1.2 instead. *** - - General Information =================== -This is GLib version @GLIB_VERSION@. GLib is a library which includes support -routines for C such as lists, trees, hashes, memory allocation, and -many other things. +This is GLib version @GLIB_VERSION@. GLib is the low-level core +library that forms the basis for projects such as GTK+ and GNOME. It +provides data structure handling for C, portability wrappers, and +interfaces for such runtime functionality as an event loop, threads, +dynamic loading, and an object system. The official ftp site is: ftp://ftp.gtk.org/pub/gtk @@ -34,6 +24,27 @@ Installation See the file 'INSTALL' +Notes about GLib-2.0.0 +====================== + +* On systems without the libintl from GNU gettext() or a recent version + of the GNU C library, the encoding of translated error messages will be + incorrect (they should be in UTF-8). A workaround for this is to install + GNU gettext and use that libintl. This is expected to be fixed in GLib-2.0.1. + Application programmers should not call g_locale_to_utf8() on these + strings. + +* The results of g_strerror() are currently in the encoding of the locale + rather than in UTF-8. Again, this is a bug, and not behavior that + should be relied upon. + +* Similarly, the GLib error logging functions such as g_print(), g_warning(), + g_error(), currently do not convert the strings they are passed from + UTF-8 to the encoding of the locale, or check that the strings they + are passed are valid UTF-8. They should, despite this, be assumed to take + UTF-8 arguments. + + How to report bugs ================== diff --git a/configure.in b/configure.in index b10482666..2f3334723 100644 --- a/configure.in +++ b/configure.in @@ -291,6 +291,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE") GLIB_LOCALE_DIR="${prefix}/${DATADIRNAME}/locale" AC_DEFINE_UNQUOTED(GLIB_LOCALE_DIR,"$GLIB_LOCALE_DIR") +AC_CHECK_FUNCS(bind_textdomain_codeset) + dnl Initialize libtool AM_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL diff --git a/docs/Makefile.am b/docs/Makefile.am index c31163aa9..c44793630 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = reference -EXTRA_DIST = debugging.txt macros.txt Changes-2.0.txt +EXTRA_DIST = debugging.txt macros.txt files: @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \ diff --git a/glib/gutils.c b/glib/gutils.c index f0a938aa7..1688dccf3 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -80,6 +80,10 @@ #include <langinfo.h> #endif +#ifdef HAVE_BIND_TEXTDOMAIN_CODESET +#include <libintl.h> +#endif + const guint glib_major_version = GLIB_MAJOR_VERSION; const guint glib_minor_version = GLIB_MINOR_VERSION; const guint glib_micro_version = GLIB_MICRO_VERSION; @@ -1090,6 +1094,9 @@ _glib_gettext (const gchar *str) if (!_glib_gettext_initialized) { bindtextdomain(GETTEXT_PACKAGE, GLIB_LOCALE_DIR); +# ifdef HAVE_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +# endif _glib_gettext_initialized = TRUE; } |