diff -crN ./glib/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/Makefile.am *** ./glib/Makefile.am Thu Mar 9 06:31:52 2006 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/Makefile.am Thu Oct 12 08:06:10 2006 *************** *** 78,84 **** # install mkinstalldirs for glib-gettextize's benefit gettextdir = $(datadir)/glib-2.0/gettext ! gettext_SCRIPTS = mkinstalldirs # build documentation when doing distcheck DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --- 78,85 ---- # install mkinstalldirs for glib-gettextize's benefit gettextdir = $(datadir)/glib-2.0/gettext ! #gettext_SCRIPTS = mkinstalldirs ! gettext_SCRIPTS = # build documentation when doing distcheck DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc diff -crN ./glib/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/configure.in *** ./glib/configure.in Sun Oct 1 07:51:15 2006 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/configure.in Fri Oct 13 13:00:26 2006 *************** *** 1595,1601 **** if test x"$have_threads" != xno; then ! if test x"$have_threads" = xposix; then # First we test for posix, whether -pthread or -pthreads do the trick as # both CPPFLAG and LIBS. # One of them does for most gcc versions and some other platforms/compilers --- 1595,1604 ---- if test x"$have_threads" != xno; then ! case $host in ! *-aix*) ! if test x"$GCC" = xyes; then ! # GCC 3.0 and above needs -pthread. # First we test for posix, whether -pthread or -pthreads do the trick as # both CPPFLAG and LIBS. # One of them does for most gcc versions and some other platforms/compilers *************** *** 1695,1700 **** --- 1698,1707 ---- AC_MSG_CHECKING(thread related cflags) AC_MSG_RESULT($G_THREAD_CFLAGS) CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS" + + ;; + esac + fi dnl determination of G_THREAD_LIBS *************** *** 2278,2309 **** cat >>$outfile <<_______EOF #define G_HAVE_GINT64 1 /* deprecated, always true */ ! ${glib_extension}typedef signed $gint64 gint64; ! ${glib_extension}typedef unsigned $gint64 guint64; ! #define G_GINT64_CONSTANT(val) $gint64_constant ! #define G_GUINT64_CONSTANT(val) $guint64_constant _______EOF ! if test x$gint64_format != x ; then ! cat >>$outfile <<_______EOF ! #define G_GINT64_MODIFIER $gint64_modifier #define G_GINT64_FORMAT $gint64_format ! #define G_GUINT64_FORMAT $guint64_format ! _______EOF ! else ! cat >>$outfile <<_______EOF ! #undef G_GINT64_MODIFIER #undef G_GINT64_FORMAT ! #undef G_GUINT64_FORMAT ! _______EOF ! fi cat >>$outfile <<_______EOF ! ! #define GLIB_SIZEOF_VOID_P $glib_void_p ! #define GLIB_SIZEOF_LONG $glib_long ! #define GLIB_SIZEOF_SIZE_T $glib_size_t _______EOF --- 2285,2341 ---- cat >>$outfile <<_______EOF #define G_HAVE_GINT64 1 /* deprecated, always true */ ! #ifdef __64BIT__ ! typedef signed long gint64; ! typedef unsigned long guint64; ! #else ! G_GNUC_EXTENSION typedef signed long long gint64; ! G_GNUC_EXTENSION typedef unsigned long long guint64; ! #endif ! /*${glib_extension}typedef signed $gint64 gint64; ! ${glib_extension}typedef unsigned $gint64 guint64;*/ ! ! /*#define G_GINT64_CONSTANT(val) $gint64_constant ! #define G_GUINT64_CONSTANT(val) $guint64_constant*/ _______EOF ! # if test x$gint64_format != x ; then ! # cat >>$outfile <<_______EOF ! /*#define G_GINT64_MODIFIER $gint64_modifier #define G_GINT64_FORMAT $gint64_format ! #define G_GUINT64_FORMAT $guint64_format */ ! #_______EOF ! # else ! # cat >>$outfile <<_______EOF ! /*#undef G_GINT64_MODIFIER #undef G_GINT64_FORMAT ! #undef G_GUINT64_FORMAT*/ ! #_______EOF ! # fi cat >>$outfile <<_______EOF ! #ifdef __64BIT__ ! #define G_GINT64_CONSTANT(val) (val##L) ! #define G_GUINT64_CONSTANT(val) (val##UL) ! #define G_GINT64_MODIFIER "l" ! #define G_GINT64_FORMAT "li" ! #define G_GUINT64_FORMAT "lu" ! ! #define GLIB_SIZEOF_VOID_P 8 ! #define GLIB_SIZEOF_LONG 8 ! #define GLIB_SIZEOF_SIZE_T 8 ! #else ! #define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL)) ! #define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL)) ! #define G_GINT64_MODIFIER "ll" ! #define G_GINT64_FORMAT "lli" ! #define G_GUINT64_FORMAT "llu" ! ! #define GLIB_SIZEOF_VOID_P 4 ! #define GLIB_SIZEOF_LONG 4 ! #define GLIB_SIZEOF_SIZE_T 4 ! #endif _______EOF *************** *** 2320,2330 **** if test -z "$glib_unknown_void_p"; then cat >>$outfile <<_______EOF ! #define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p)) #define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p)) #define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i)) ! #define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u)) _______EOF else echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile --- 2352,2378 ---- if test -z "$glib_unknown_void_p"; then cat >>$outfile <<_______EOF ! #ifdef __64BIT__ ! #define GPOINTER_TO_INT(p) ((gint) (glong) (p)) ! #define GPOINTER_TO_UINT(p) ((guint) (gulong) (p)) ! #else ! #define GPOINTER_TO_INT(p) ((gint) (p)) ! #define GPOINTER_TO_UINT(p) ((guint) (p)) ! #endif ! ! #ifdef __64BIT__ ! #define GINT_TO_POINTER(i) ((gpointer) (glong) (i)) ! #define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u)) ! #else ! #define GINT_TO_POINTER(i) ((gpointer) (i)) ! #define GUINT_TO_POINTER(u) ((gpointer) (u)) ! #endif ! ! /*#define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p)) #define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p)) #define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i)) ! #define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u))*/ _______EOF else echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile *************** *** 2433,2445 **** { struct _GMutex *runtime_mutex; union { ! char pad[[$g_mutex_sizeof]]; double dummy_double; void *dummy_pointer; long dummy_long; } static_mutex; }; ! #define G_STATIC_MUTEX_INIT { NULL, { { $g_mutex_contents} } } #define g_static_mutex_get_mutex(mutex) \\ (g_thread_use_default_impl ? ((GMutex*) ((mutex)->static_mutex.pad)) : \\ g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex))) --- 2481,2503 ---- { struct _GMutex *runtime_mutex; union { ! /* char pad[[$g_mutex_sizeof]];*/ ! #ifdef __64BIT__ ! char pad[[64]]; ! #else ! char pad[[52]]; ! #endif double dummy_double; void *dummy_pointer; long dummy_long; } static_mutex; }; ! /*#define G_STATIC_MUTEX_INIT { NULL, { { $g_mutex_contents} } }*/ ! #ifdef __64BIT__ ! #define G_STATIC_MUTEX_INIT { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } } ! #else ! #define G_STATIC_MUTEX_INIT { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } } ! #endif #define g_static_mutex_get_mutex(mutex) \\ (g_thread_use_default_impl ? ((GMutex*) ((mutex)->static_mutex.pad)) : \\ g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex))) *************** *** 2486,2495 **** done cat >>$outfile <<_______EOF ! #define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val)) ! #define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val)) ! #define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val)) ! #define GULONG_TO_BE(val) ((gulong) GUINT${glongbits}_TO_BE (val)) #define GINT_TO_LE(val) ((gint) GINT${gintbits}_TO_LE (val)) #define GUINT_TO_LE(val) ((guint) GUINT${gintbits}_TO_LE (val)) #define GINT_TO_BE(val) ((gint) GINT${gintbits}_TO_BE (val)) --- 2544,2560 ---- done cat >>$outfile <<_______EOF ! #ifdef __64BIT__ ! #define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val)) ! #define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val)) ! #define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val)) ! #define GULONG_TO_BE(val) ((gulong) GUINT64_TO_BE (val)) ! #else ! #define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val)) ! #define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val)) ! #define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val)) ! #define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val)) ! #endif #define GINT_TO_LE(val) ((gint) GINT${gintbits}_TO_LE (val)) #define GUINT_TO_LE(val) ((guint) GUINT${gintbits}_TO_LE (val)) #define GINT_TO_BE(val) ((gint) GINT${gintbits}_TO_BE (val)) *************** *** 2526,2531 **** --- 2591,2597 ---- # on variable expansion in case labels. Look at the generated config.status # for a hint. + if test "x${ac_cv_working_alloca_h+set}" = xset ; then glib_header_alloca_h="$ac_cv_working_alloca_h" else diff -crN ./glib/docs/reference/glib/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/docs/reference/glib/Makefile.am *** ./glib/docs/reference/glib/Makefile.am Mon Dec 19 22:22:29 2005 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/docs/reference/glib/Makefile.am Tue Feb 28 10:30:29 2006 *************** *** 43,49 **** # Images to copy into HTML directory HTML_IMAGES = \ - file-name-encodings.png \ mainloop-states.gif # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE) --- 43,48 ---- *************** *** 65,72 **** # Other files to distribute EXTRA_DIST += \ - file-name-encodings.png \ - file-name-encodings.sxd \ mainloop-states.fig \ mainloop-states.png \ mainloop-states.eps \ --- 64,69 ---- diff -crN ./glib/glib/gconvert.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/gconvert.c *** ./glib/glib/gconvert.c Sat Aug 26 05:48:35 2006 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/gconvert.c Thu Oct 12 08:06:26 2006 *************** *** 554,566 **** gchar *dest; gchar *outp; const gchar *p; - const gchar *shift_p = NULL; gsize inbytes_remaining; gsize outbytes_remaining; gsize err; gsize outbuf_size; gboolean have_error = FALSE; gboolean done = FALSE; g_return_val_if_fail (converter != (GIConv) -1, NULL); --- 554,566 ---- gchar *dest; gchar *outp; const gchar *p; gsize inbytes_remaining; gsize outbytes_remaining; gsize err; gsize outbuf_size; gboolean have_error = FALSE; gboolean done = FALSE; + const gchar *shift_p = NULL; g_return_val_if_fail (converter != (GIConv) -1, NULL); *************** *** 574,579 **** --- 574,580 ---- outbytes_remaining = outbuf_size - 1; /* -1 for nul */ outp = dest = g_malloc (outbuf_size); + while (!done && !have_error) { err = g_iconv (converter, (char **)&p, &inbytes_remaining, &outp, &outbytes_remaining); *************** *** 614,627 **** } else { ! if (!shift_p) ! { ! /* call g_iconv with NULL inbuf to cleanup shift state */ ! shift_p = p; ! p = NULL; ! inbytes_remaining = 0; ! } ! else done = TRUE; } } --- 615,623 ---- } else { ! /* call g_iconv with NULL inbuf to cleanup shift state */ ! err = g_iconv (converter, NULL, &inbytes_remaining, &outp, &outbytes_remaining); ! inbytes_remaining = 0; done = TRUE; } } diff -crN ./glib/glib/gi18n-lib.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/gi18n-lib.h *** ./glib/glib/gi18n-lib.h Mon Jul 12 06:03:50 2004 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/gi18n-lib.h Thu Oct 20 08:47:37 2005 *************** *** 27,32 **** --- 27,35 ---- #error You must define GETTEXT_PACKAGE before including gi18n-lib.h. #endif + #ifdef _ + # undef _ + #endif #define _(String) dgettext (GETTEXT_PACKAGE, String) #define Q_(String) g_strip_context ((String), dgettext (GETTEXT_PACKAGE, String)) #ifdef gettext_noop diff -crN ./glib/glib/gmain.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/gmain.c *** ./glib/glib/gmain.c Sun Oct 1 07:34:06 2006 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/gmain.c Thu Oct 12 08:06:31 2006 *************** *** 212,219 **** #endif #define SOURCE_DESTROYED(source) (((source)->flags & G_HOOK_FLAG_ACTIVE) == 0) - #define SOURCE_BLOCKED(source) (((source)->flags & G_HOOK_FLAG_IN_CALL) != 0 && \ - ((source)->flags & G_SOURCE_CAN_RECURSE) == 0) #define SOURCE_UNREF(source, context) \ G_STMT_START { \ --- 212,217 ---- *************** *** 281,286 **** --- 279,287 ---- G_LOCK_DEFINE_STATIC (main_context_list); static GSList *main_context_list = NULL; + #if defined(G_PLATFORM_WIN32) && defined(__GNUC__) + __declspec(dllexport) + #endif GSourceFuncs g_timeout_funcs = { g_timeout_prepare, *************** *** 297,302 **** --- 298,306 ---- NULL }; + #if defined(G_PLATFORM_WIN32) && defined(__GNUC__) + __declspec(dllexport) + #endif GSourceFuncs g_idle_funcs = { g_idle_prepare, *************** *** 957,973 **** old_cb_funcs->unref (old_cb_data); LOCK_CONTEXT (context); } ! ! if (!SOURCE_BLOCKED (source)) { ! tmp_list = source->poll_fds; ! while (tmp_list) ! { ! g_main_context_remove_poll_unlocked (context, tmp_list->data); ! tmp_list = tmp_list->next; ! } } ! g_source_unref_internal (source, context, TRUE); } --- 961,974 ---- old_cb_funcs->unref (old_cb_data); LOCK_CONTEXT (context); } ! ! tmp_list = source->poll_fds; ! while (tmp_list) { ! g_main_context_remove_poll_unlocked (context, tmp_list->data); ! tmp_list = tmp_list->next; } ! g_source_unref_internal (source, context, TRUE); } *************** *** 1074,1081 **** if (context) { ! if (!SOURCE_BLOCKED (source)) ! g_main_context_add_poll_unlocked (context, source->priority, fd); UNLOCK_CONTEXT (context); } } --- 1075,1081 ---- if (context) { ! g_main_context_add_poll_unlocked (context, source->priority, fd); UNLOCK_CONTEXT (context); } } *************** *** 1107,1114 **** if (context) { ! if (!SOURCE_BLOCKED (source)) ! g_main_context_remove_poll_unlocked (context, fd); UNLOCK_CONTEXT (context); } } --- 1107,1113 ---- if (context) { ! g_main_context_remove_poll_unlocked (context, fd); UNLOCK_CONTEXT (context); } } *************** *** 1285,1306 **** if (context) { ! /* Remove the source from the context's source and then ! * add it back so it is sorted in the correct plcae ! */ ! g_source_list_remove (source, source->context); ! g_source_list_add (source, source->context); ! ! if (!SOURCE_BLOCKED (source)) { ! tmp_list = source->poll_fds; ! while (tmp_list) ! { ! g_main_context_remove_poll_unlocked (context, tmp_list->data); ! g_main_context_add_poll_unlocked (context, priority, tmp_list->data); ! ! tmp_list = tmp_list->next; ! } } UNLOCK_CONTEXT (source->context); --- 1284,1299 ---- if (context) { ! source->next = NULL; ! source->prev = NULL; ! ! tmp_list = source->poll_fds; ! while (tmp_list) { ! g_main_context_remove_poll_unlocked (context, tmp_list->data); ! g_main_context_add_poll_unlocked (context, priority, tmp_list->data); ! ! tmp_list = tmp_list->next; } UNLOCK_CONTEXT (source->context); *************** *** 2029,2037 **** if (cb_funcs) cb_funcs->ref (cb_data); - if ((source->flags & G_SOURCE_CAN_RECURSE) == 0) - block_source (source); - was_in_call = source->flags & G_HOOK_FLAG_IN_CALL; source->flags |= G_HOOK_FLAG_IN_CALL; --- 2022,2027 ---- *************** *** 2056,2065 **** if (!was_in_call) source->flags &= ~G_HOOK_FLAG_IN_CALL; - if ((source->flags & G_SOURCE_CAN_RECURSE) == 0 && - !SOURCE_DESTROYED (source)) - unblock_source (source); - /* Note: this depends on the fact that we can't switch * sources from one main context to another */ --- 2046,2051 ---- *************** *** 2348,2354 **** SOURCE_UNREF (source, context); break; } ! if (SOURCE_BLOCKED (source)) goto next; if (!(source->flags & G_SOURCE_READY)) --- 2334,2340 ---- SOURCE_UNREF (source, context); break; } ! if ((source->flags & G_HOOK_FLAG_IN_CALL) && !(source->flags & G_SOURCE_CAN_RECURSE)) goto next; if (!(source->flags & G_SOURCE_READY)) *************** *** 2453,2459 **** if (timeout) { *timeout = context->timeout; ! if (*timeout != 0) context->time_is_current = FALSE; } --- 2439,2445 ---- if (timeout) { *timeout = context->timeout; ! if (timeout != 0) context->time_is_current = FALSE; } *************** *** 2536,2542 **** SOURCE_UNREF (source, context); break; } ! if (SOURCE_BLOCKED (source)) goto next; if (!(source->flags & G_SOURCE_READY)) --- 2522,2528 ---- SOURCE_UNREF (source, context); break; } ! if ((source->flags & G_HOOK_FLAG_IN_CALL) && !(source->flags & G_SOURCE_CAN_RECURSE)) goto next; if (!(source->flags & G_SOURCE_READY)) *************** *** 3771,3778 **** /** * g_child_watch_source_new: ! * @pid: process id of a child process to watch. On Windows, a HANDLE ! * for the process to watch (which actually doesn't have to be a child). * * Creates a new child_watch source. * --- 3757,3763 ---- /** * g_child_watch_source_new: ! * @pid: process id of a child process to watch * * Creates a new child_watch source. * diff -crN ./glib/glib/gtimer.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/gtimer.c *** ./glib/glib/gtimer.c Sun Oct 1 07:51:15 2006 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/gtimer.c Fri Oct 13 14:11:19 2006 *************** *** 257,263 **** if (microseconds) *microseconds = (elapsed / 10) % 1000000; ! #elif HAVE_CLOCK_GETTIME if (timer->active) GETTIME (timer->end); --- 257,264 ---- if (microseconds) *microseconds = (elapsed / 10) % 1000000; ! /* #elif HAVE_CLOCK_GETTIME */ ! #elif USE_CLOCK_GETTIME if (timer->active) GETTIME (timer->end); diff -crN ./glib/glib/gutils.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/gutils.c *** ./glib/glib/gutils.c Thu Jul 6 22:30:16 2006 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/gutils.c Thu Oct 12 08:06:36 2006 *************** *** 976,982 **** gchar *buffer = NULL; gchar *dir = NULL; ! static gulong max_len = 0; if (max_len == 0) max_len = (G_PATH_LENGTH == -1) ? 2048 : G_PATH_LENGTH; --- 976,982 ---- gchar *buffer = NULL; gchar *dir = NULL; ! static guint max_len = 0; if (max_len == 0) max_len = (G_PATH_LENGTH == -1) ? 2048 : G_PATH_LENGTH; *************** *** 989,995 **** *buffer = 0; dir = getwd (buffer); #else /* !sun || !HAVE_GETCWD */ ! while (max_len < G_MAXULONG / 2) { buffer = g_new (gchar, max_len + 1); *buffer = 0; --- 989,995 ---- *buffer = 0; dir = getwd (buffer); #else /* !sun || !HAVE_GETCWD */ ! while (max_len < G_MAXUINT / 2) { buffer = g_new (gchar, max_len + 1); *buffer = 0; diff -crN ./glib/glib/libcharset/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/Makefile.am *** ./glib/glib/libcharset/Makefile.am Fri Apr 30 16:45:13 2004 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/Makefile.am Fri Oct 29 14:06:13 2004 *************** *** 1,7 **** ## Process this file with automake to produce Makefile.in INCLUDES = \ ! -DLIBDIR=\"$(libdir)\" -I$(top_srcdir) noinst_LTLIBRARIES = libcharset.la --- 1,7 ---- ## Process this file with automake to produce Makefile.in INCLUDES = \ ! -DLIBDIR=\"$(libdir)\" noinst_LTLIBRARIES = libcharset.la *************** *** 24,35 **** install-exec-local: all-local $(mkinstalldirs) $(DESTDIR)$(libdir) if test -f $(charset_alias); then \ ! sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ else \ if test @GLIBC21@ = no; then \ ! sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ fi ; \ --- 24,35 ---- install-exec-local: all-local $(mkinstalldirs) $(DESTDIR)$(libdir) if test -f $(charset_alias); then \ ! sed -f $(srcdir)/ref-add.sed $(charset_alias) > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ else \ if test @GLIBC21@ = no; then \ ! sed -f $(srcdir)/ref-add.sed charset.alias > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ fi ; \ *************** *** 37,43 **** uninstall-local: all-local if test -f $(charset_alias); then \ ! sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \ if grep '^# Packages using this file: $$' $(charset_tmp) \ > /dev/null; then \ rm -f $(charset_alias); \ --- 37,43 ---- uninstall-local: all-local if test -f $(charset_alias); then \ ! sed -f $(srcdir)/ref-del.sed $(charset_alias) > $(charset_tmp); \ if grep '^# Packages using this file: $$' $(charset_tmp) \ > /dev/null; then \ rm -f $(charset_alias); \ diff -crN ./glib/glib/libcharset/config.charset /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/config.charset *** ./glib/glib/libcharset/config.charset Sun Mar 30 23:29:26 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/config.charset Thu Oct 16 13:59:00 2003 *************** *** 132,147 **** --- 132,178 ---- aix*) echo "ISO8859-1 ISO-8859-1" echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-3 ISO-8859-3" + echo "ISO8859-4 ISO-8859-4" echo "ISO8859-5 ISO-8859-5" echo "ISO8859-6 ISO-8859-6" echo "ISO8859-7 ISO-8859-7" echo "ISO8859-8 ISO-8859-8" echo "ISO8859-9 ISO-8859-9" echo "ISO8859-15 ISO-8859-15" + echo "IBM-037 CP037" + echo "IBM-1026 CP1026" + echo "IBM-1046 CP1046" + echo "IBM-1124 CP1124" + echo "IBM-1129 CP1129" + echo "IBM-1252 CP1252" + echo "IBM-273 CP273" + echo "IBM-278 CP278" + echo "IBM-280 CP280" + echo "IBM-284 CP284" + echo "IBM-285 CP285" + echo "IBM-290 CP290" + echo "IBM-297 CP297" + echo "IBM-437 CP437" + echo "IBM-500 CP500" echo "IBM-850 CP850" + echo "IBM-852 CP852" echo "IBM-856 CP856" + echo "IBM-857 CP857" + echo "IBM-860 CP860" + echo "IBM-861 CP861" + echo "IBM-863 CP863" + echo "IBM-865 CP865" + echo "IBM-869 CP869" + echo "IBM-875 CP875" echo "IBM-921 ISO-8859-13" echo "IBM-922 CP922" + echo "IBM-930 CP930" + echo "IBM-932 CP932" + echo "IBM-933 CP933" + echo "IBM-935 CP935" + echo "IBM-936 CP936" + echo "IBM-922 CP922" echo "IBM-932 CP932" echo "IBM-943 CP943" echo "IBM-1046 CP1046" *************** *** 153,161 **** --- 184,194 ---- echo "IBM-eucKR EUC-KR" echo "IBM-eucTW EUC-TW" echo "big5 BIG5" + echo "unicode UNICODE" echo "GBK GBK" echo "TIS-620 TIS-620" echo "UTF-8 UTF-8" + echo "UCS-2 UCS-2" ;; hpux*) echo "iso88591 ISO-8859-1" diff -crN ./glib/glib/libcharset/localcharset.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/localcharset.c *** ./glib/glib/libcharset/localcharset.c Sun Oct 24 03:37:42 2004 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/localcharset.c Thu Apr 7 11:50:07 2005 *************** *** 23,35 **** # include #endif - #include - - #if defined G_PLATFORM_WIN32 - /* Want to use Win32-specific code in this file also on Cygwin */ - # define _WIN32 1 - #endif - #if HAVE_STDDEF_H # include #endif --- 23,28 ---- *************** *** 119,132 **** { #if !defined WIN32 FILE *fp; ! const char *dir = getenv ("LIBCHARSET_ALIAS_DIR"); const char *base = "charset.alias"; char *file_name; - if (dir == NULL) - dir = LIBDIR; - /* Concatenate dir and base into freshly allocated file_name. */ { size_t dir_len = strlen (dir); size_t base_len = strlen (base); --- 112,125 ---- { #if !defined WIN32 FILE *fp; ! const char *dir = LIBDIR; const char *base = "charset.alias"; char *file_name; /* Concatenate dir and base into freshly allocated file_name. */ + + file_name = getenv("G_CHARSET_ALIAS"); + if (!file_name) { size_t dir_len = strlen (dir); size_t base_len = strlen (base); *************** *** 214,220 **** directory as the DLL and of retrieving the DLL's directory at runtime, simply inline the aliases here. */ - # if defined WIN32 cp = "CP936" "\0" "GBK" "\0" "CP1361" "\0" "JOHAB" "\0" "CP20127" "\0" "ASCII" "\0" --- 207,212 ---- *************** *** 230,236 **** "CP28598" "\0" "ISO-8859-8" "\0" "CP28599" "\0" "ISO-8859-9" "\0" "CP28605" "\0" "ISO-8859-15" "\0"; - # endif #endif charset_aliases = cp; --- 222,227 ---- diff -crN ./glib/glib/libcharset/ref-add.sed /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/ref-add.sed *** ./glib/glib/libcharset/ref-add.sed Thu Jan 1 01:00:00 1970 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/ref-add.sed Tue May 6 16:49:28 2003 *************** *** 0 **** --- 1,10 ---- + /^# Packages using this file: / { + s/# Packages using this file:// + ta + :a + s/ glib / glib / + tb + s/ $/ glib / + :b + s/^/# Packages using this file:/ + } diff -crN ./glib/gmodule/gmodule-ar.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/gmodule/gmodule-ar.c *** ./glib/gmodule/gmodule-ar.c Thu Jun 30 21:32:33 2005 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/gmodule/gmodule-ar.c Tue Sep 27 16:32:09 2005 *************** *** 163,169 **** p = dlsym (handle, symbol_name); if (!p) ! g_module_set_error (fetch_dlerror (FALSE)); return p; } --- 163,169 ---- p = dlsym (handle, symbol_name); if (!p) ! g_module_set_error (fetch_dlerror (TRUE)); return p; } diff -crN ./glib/mkinstalldirs /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/mkinstalldirs *** ./glib/mkinstalldirs Sun Aug 20 07:15:21 2006 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/mkinstalldirs Wed Oct 12 09:36:10 2005 *************** *** 1,21 **** #! /bin/sh # mkinstalldirs --- make directory hierarchy ! # Author: Noah Friedman # Created: 1993-05-16 ! # Public domain errstatus=0 ! dirmode="" usage="\ ! Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." # process command line arguments while test $# -gt 0 ; do case $1 in -h | --help | --h*) # -h for help ! echo "$usage" 1>&2 ! exit 0 ;; -m) # -m PERM arg shift --- 1,33 ---- #! /bin/sh # mkinstalldirs --- make directory hierarchy ! ! scriptversion=2005-06-29.22 ! ! # Original author: Noah Friedman # Created: 1993-05-16 ! # Public domain. ! # ! # This file is maintained in Automake, please report ! # bugs to or send patches to ! # . errstatus=0 ! dirmode= usage="\ ! Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... ! ! Create each directory DIR (with mode MODE, if specified), including all ! leading file name components. ! ! Report bugs to ." # process command line arguments while test $# -gt 0 ; do case $1 in -h | --help | --h*) # -h for help ! echo "$usage" ! exit $? ;; -m) # -m PERM arg shift *************** *** 23,28 **** --- 35,44 ---- dirmode=$1 shift ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; --) # stop option processing shift break *************** *** 50,79 **** 0) exit 0 ;; esac case $dirmode in '') ! if mkdir -p -- . 2>/dev/null; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" fi ;; *) ! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" fi ;; esac for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift - pathcomp= for d do ! pathcomp="$pathcomp$d" case $pathcomp in -*) pathcomp=./$pathcomp ;; esac --- 66,123 ---- 0) exit 0 ;; esac + # Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and + # mkdir -p a/c at the same time, both will detect that a is missing, + # one will create a, then the other will try to create a and die with + # a "File exists" error. This is a problem when calling mkinstalldirs + # from a parallel make. We use --version in the probe to restrict + # ourselves to GNU mkdir, which is thread-safe. case $dirmode in '') ! if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version fi ;; *) ! if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && ! test ! -d ./--version; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done fi ;; esac for file do ! case $file in ! /*) pathcomp=/ ;; ! *) pathcomp= ;; ! esac ! oIFS=$IFS ! IFS=/ ! set fnord $file shift + IFS=$oIFS for d do ! test "x$d" = x && continue ! ! pathcomp=$pathcomp$d case $pathcomp in -*) pathcomp=./$pathcomp ;; esac *************** *** 84,104 **** mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then ! errstatus=$lasterr else ! if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" ! lasterr="" ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi fi fi ! pathcomp="$pathcomp/" done done --- 128,148 ---- mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then ! errstatus=$lasterr else ! if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" ! lasterr= ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi fi fi ! pathcomp=$pathcomp/ done done *************** *** 107,111 **** # Local Variables: # mode: shell-script # sh-indentation: 2 # End: - # mkinstalldirs ends here --- 151,158 ---- # Local Variables: # mode: shell-script # sh-indentation: 2 + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" # End: diff -crN ./glib/tests/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/tests/Makefile.am *** ./glib/tests/Makefile.am Tue May 16 07:47:23 2006 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/tests/Makefile.am Thu Oct 12 08:06:41 2006 *************** *** 9,17 **** libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la libgobject = $(top_builddir)/gobject/libgobject-2.0.la - if PLATFORM_WIN32 libadd_libgmodule = $(libgmodule) libadd_libglib = $(libglib) no_undefined = -no-undefined module_test_exp = module-test.exp --- 9,18 ---- libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la libgobject = $(top_builddir)/gobject/libgobject-2.0.la libadd_libgmodule = $(libgmodule) libadd_libglib = $(libglib) + + if PLATFORM_WIN32 no_undefined = -no-undefined module_test_exp = module-test.exp