diff -crN ./glib/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/configure.in *** ./glib/configure.in Tue Jan 28 23:00:02 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/configure.in Thu May 15 16:12:50 2003 *************** *** 960,965 **** --- 960,972 ---- *-*-mingw*|*-*-cygwin*) G_MODULE_IMPL=G_MODULE_IMPL_WIN32 ;; esac fi + dnl *** force native AIX library loader + dnl *** dlopen() filepath must be of the form /path/libname.a(libname.so) + if test -z "$G_MODULE_IMPL"; then + case "$host" in + *-*-aix*) G_MODULE_IMPL=G_MODULE_IMPL_AR ;; + esac + fi dnl *** dlopen() and dlsym() in system libraries if test -z "$G_MODULE_IMPL"; then AC_CHECK_FUNC(dlopen, *************** *** 1082,1087 **** --- 1089,1097 ---- cygwin* | mingw*) glib_gmodule_suffix='dll' ;; + aix*) + glib_gmodule_suffix='a' + ;; *) glib_gmodule_suffix='so' ;; *************** *** 1106,1119 **** AC_MSG_CHECKING(for gspawn implementation) case "$host" in *-*-mingw*) ! GSPAWN=gspawn-win32.lo ;; *) ! GSPAWN=gspawn.lo ;; esac ! AC_MSG_RESULT($GSPAWN) ! AC_SUBST(GSPAWN) dnl ************************* dnl *** GIOChannel checks *** --- 1116,1128 ---- AC_MSG_CHECKING(for gspawn implementation) case "$host" in *-*-mingw*) ! use_gspawn_win32=true ;; *) ! use_gspawn_win32=false ;; esac ! AM_CONDITIONAL(USE_GSPAWN_WIN32, test x$use_gspawn_win32 = xtrue) dnl ************************* dnl *** GIOChannel checks *** *************** *** 1122,1135 **** AC_MSG_CHECKING(for GIOChannel implementation) case "$host" in *-*-mingw*) ! GIO=giowin32.lo ;; *) ! GIO=giounix.lo ;; esac ! AC_MSG_RESULT($GIO) ! AC_SUBST(GIO) dnl **************************************** dnl *** platform dependent source checks *** --- 1131,1143 ---- AC_MSG_CHECKING(for GIOChannel implementation) case "$host" in *-*-mingw*) ! use_gio_win32=true ;; *) ! use_gio_win32=false ;; esac ! AM_CONDITIONAL(USE_GIO_WIN32, test x$use_gio_win32 = xtrue) dnl **************************************** dnl *** platform dependent source checks *** *************** *** 1969,1977 **** #define G_MAXLONG $glib_Ml #define G_MAXULONG $glib_Mul ! #define G_MININT64 ((gint64) 0x8000000000000000) ! #define G_MAXINT64 ((gint64) 0x7fffffffffffffff) ! #define G_MAXUINT64 ((guint64) 0xffffffffffffffff) _______EOF --- 1977,1985 ---- #define G_MAXLONG $glib_Ml #define G_MAXULONG $glib_Mul ! #define G_MININT64 ((gint64) G_GINT64_CONSTANT(0x8000000000000000)) ! #define G_MAXINT64 ((gint64) G_GINT64_CONSTANT(0x7fffffffffffffff)) ! #define G_MAXUINT64 ((guint64) G_GINT64_CONSTANT(0xffffffffffffffffU)) _______EOF 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 Tue Jan 28 21:15:24 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/docs/reference/glib/Makefile.am Mon Feb 24 11:42:35 2003 *************** *** 159,164 **** --- 159,169 ---- @echo '-- Fixing Crossreferences' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp + + else + + all-local: + endif ############## diff -crN ./glib/docs/reference/gobject/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/docs/reference/gobject/Makefile.am *** ./glib/docs/reference/gobject/Makefile.am Tue Jan 28 21:15:41 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/docs/reference/gobject/Makefile.am Mon Feb 24 13:39:45 2003 *************** *** 133,138 **** --- 133,143 ---- @echo '-- Fixing Crossreferences' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp + + else + + all-local: + endif ############## diff -crN ./glib/glib/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/Makefile.am *** ./glib/glib/Makefile.am Tue Jan 28 21:15:43 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/Makefile.am Mon Apr 7 18:19:00 2003 *************** *** 41,46 **** --- 41,62 ---- uninstall-ms-lib: endif + if USE_GIO_WIN32 + GIO_SOURCES = giowin32.c + EXTRA_GIO_SOURCES = giounix.c + else + GIO_SOURCES = giounix.c + EXTRA_GIO_SOURCES = giowin32.c + endif + + if USE_GSPAWN_WIN32 + GSPAWN_SOURCES = gspawn-win32.c + EXTRA_GSPAWN_SOURCES = gspawn.c + else + GSPAWN_SOURCES = gspawn.c + EXTRA_GSPAWN_SOURCES = gspawn-win32.c + endif + libglib_2_0_la_SOURCES = \ garray.c \ gasyncqueue.c \ *************** *** 92,104 **** gutils.c \ gdebug.h \ gprintf.c \ ! gprintfint.h ! ! EXTRA_libglib_2_0_la_SOURCES = \ ! giounix.c \ ! giowin32.c \ ! gspawn.c \ ! gspawn-win32.c \ gwin32.c glibincludedir=$(includedir)/glib-2.0 --- 108,120 ---- gutils.c \ gdebug.h \ gprintf.c \ ! gprintfint.h \ ! $(GIO_SOURCES) \ ! $(GSPAWN_SOURCES) ! ! EXTRA_libglib_2_0_la_SOURCES = \ ! $(EXTRA_GIO_SOURCES) \ ! $(EXTRA_GSPAWN_SOURCES) \ gwin32.c glibincludedir=$(includedir)/glib-2.0 *************** *** 181,188 **** uninstall-libtool-import-lib: endif ! libglib_2_0_la_LIBADD = libcharset/libcharset.la $(trio_libtrio_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @ICONV_LIBS@ @G_LIBS_EXTRA@ ! libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(trio_libtrio_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@ libglib_2_0_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ --- 197,204 ---- uninstall-libtool-import-lib: endif ! libglib_2_0_la_LIBADD = libcharset/libcharset.la $(trio_libtrio_la) @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @ICONV_LIBS@ @G_LIBS_EXTRA@ ! libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(trio_libtrio_la) @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@ libglib_2_0_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ 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 Tue Jan 28 21:16:04 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/Makefile.am Mon Feb 24 13:41:52 2003 *************** *** 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 Tue Jan 28 21:16:05 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/config.charset Wed Apr 30 13:51:27 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 Tue Jan 28 22:50:23 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/libcharset/localcharset.c Mon Apr 7 18:16:17 2003 *************** *** 117,122 **** --- 117,125 ---- 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); *************** *** 204,210 **** 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 ---- *************** *** 220,226 **** "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/glib/trio/trio.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/trio/trio.c *** ./glib/glib/trio/trio.c Sun Dec 15 01:03:45 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/glib/trio/trio.c Fri Mar 14 11:07:31 2003 *************** *** 1,6 **** /************************************************************************* * ! * $Id: trio.c,v 1.2 2002/12/15 00:03:45 matthiasc Exp $ * * Copyright (C) 1998 Bjorn Reese and Daniel Stenberg. * --- 1,6 ---- /************************************************************************* * ! * $Id: trio.c,v 1.1.4.2 2003/03/14 10:07:29 vivierl Exp $ * * Copyright (C) 1998 Bjorn Reese and Daniel Stenberg. * *************** *** 116,121 **** --- 116,122 ---- * Platform specific definitions */ #if defined(TRIO_PLATFORM_UNIX) + #undef _LARGE_FILE_API # include # include # include *************** *** 718,724 **** * *************************************************************************/ ! static TRIO_CONST char rcsid[] = "@(#)$Id: trio.c,v 1.2 2002/12/15 00:03:45 matthiasc Exp $"; /* * Need this to workaround a parser bug in HP C/iX compiler that fails --- 719,725 ---- * *************************************************************************/ ! static TRIO_CONST char rcsid[] = "@(#)$Id: trio.c,v 1.1.4.2 2003/03/14 10:07:29 vivierl Exp $"; /* * Need this to workaround a parser bug in HP C/iX compiler that fails 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 Jan 1 01:00:00 1970 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/gmodule/gmodule-ar.c Thu Jun 20 11:23:37 2002 *************** *** 0 **** --- 1,184 ---- + /* GMODULE - GLIB wrapper code for dynamic module loading + * Copyright (C) 1998, 2000 Tim Janik + * + * AIX GMODULE implementation: + * (C) COPYRIGHT International Business Machines Corp. 2002 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + + /* + * MT safe + */ + + /* because we are compatible with archive format only since AIX 4.3 */ + + #define __AR_BIG__ + #include + + #include + + /* --- functions --- */ + static gchar* + fetch_dlerror (gboolean replace_null) + { + gchar *msg = dlerror (); + + /* make sure we always return an error message != NULL, if + * expected to do so. */ + + if (!msg && replace_null) + return "unknown dl-error"; + + return msg; + } + + static gchar* _g_module_get_member(const gchar* file_name) + { + gchar* member = NULL; + struct fl_hdr file_header; + struct ar_hdr ar_header; + long first_member; + long name_len; + int fd; + + fd = open(file_name, O_RDONLY); + if (fd == -1) + return NULL; + + if (read(fd, (void*)&file_header, FL_HSZ) != FL_HSZ) + goto exit; + + if (strncmp(file_header.fl_magic, AIAMAGBIG, SAIAMAG) != 0) + goto exit; + + /* read first archive file member header */ + + first_member = atol(file_header.fl_fstmoff); + + if (lseek(fd, first_member, SEEK_SET) != first_member) + goto exit; + + if (read(fd, (void*)&ar_header, AR_HSZ - 2) != AR_HSZ - 2) + goto exit; + + /* read member name */ + + name_len = atol(ar_header.ar_namlen); + + member = g_malloc(name_len+1); + if (!member) + goto exit; + + if (read(fd, (void*)member, name_len) != name_len) + { + g_free(member); + member = NULL; + goto exit; + } + + member[name_len] = 0; + + exit: + close(fd); + + return member; + } + + static gpointer + _g_module_open (const gchar *file_name, + gboolean bind_lazy) + { + gpointer handle; + gchar* member; + gchar* full_name; + + /* extract name of first member of archive */ + + member = _g_module_get_member(file_name); + if (member != NULL) + { + full_name = g_strconcat(file_name, "(", member, ")", NULL); + g_free(member); + } + else + full_name = g_strdup(file_name); + + handle = dlopen (full_name, RTLD_GLOBAL | RTLD_MEMBER | (bind_lazy ? RTLD_LAZY : RTLD_NOW)); + + g_free(full_name); + + if (!handle) + g_module_set_error (fetch_dlerror (TRUE)); + + return handle; + } + + static gpointer + _g_module_self (void) + { + gpointer handle; + + handle = dlopen (NULL, RTLD_GLOBAL | RTLD_LAZY); + if (!handle) + g_module_set_error (fetch_dlerror (TRUE)); + + return handle; + } + + static void + _g_module_close (gpointer handle, + gboolean is_unref) + { + /* are there any systems out there that have dlopen()/dlclose() + * without a reference count implementation? + */ + is_unref |= 1; + + if (is_unref) + { + if (dlclose (handle) != 0) + g_module_set_error (fetch_dlerror (TRUE)); + } + } + + static gpointer + _g_module_symbol (gpointer handle, + const gchar *symbol_name) + { + gpointer p; + + p = dlsym (handle, symbol_name); + if (!p) + g_module_set_error (fetch_dlerror (FALSE)); + + return p; + } + + static gchar* + _g_module_build_path (const gchar *directory, + const gchar *module_name) + { + if (directory && *directory) { + if (strncmp (module_name, "lib", 3) == 0) + return g_strconcat (directory, "/", module_name, NULL); + else + return g_strconcat (directory, "/lib", module_name, "." G_MODULE_SUFFIX, NULL); + } else if (strncmp (module_name, "lib", 3) == 0) + return g_strdup (module_name); + else + return g_strconcat ("lib", module_name, "." G_MODULE_SUFFIX, NULL); + } diff -crN ./glib/gmodule/gmodule.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/gmodule/gmodule.c *** ./glib/gmodule/gmodule.c Tue Jan 28 21:16:08 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/gmodule/gmodule.c Mon Feb 24 13:45:10 2003 *************** *** 147,152 **** --- 147,154 ---- #include "gmodule-win32.c" #elif (G_MODULE_IMPL == G_MODULE_IMPL_DYLD) #include "gmodule-dyld.c" + #elif (G_MODULE_IMPL == G_MODULE_IMPL_AR) + #include "gmodule-ar.c" #else #undef SUPPORT_OR_RETURN #define SUPPORT_OR_RETURN(rv) { g_module_set_error ("dynamic modules are " \ diff -crN ./glib/gmodule/gmoduleconf.h.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/gmodule/gmoduleconf.h.in *** ./glib/gmodule/gmoduleconf.h.in Fri Apr 20 19:05:38 2001 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/gmodule/gmoduleconf.h.in Fri Jun 28 15:26:49 2002 *************** *** 32,37 **** --- 32,38 ---- #define G_MODULE_IMPL_OS2 4 #define G_MODULE_IMPL_BEOS 5 #define G_MODULE_IMPL_DYLD 6 + #define G_MODULE_IMPL_AR 7 #define G_MODULE_IMPL @G_MODULE_IMPL@ #undef G_MODULE_HAVE_DLERROR 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 Jan 28 21:16:22 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./glib/tests/Makefile.am Mon Feb 24 13:49:13 2003 *************** *** 7,15 **** 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 --- 7,16 ---- 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