glib: Update snapshot to 2.32.3

There doesn't appear to be any changes in the code pkg-config uses. Just
keeping in sync.
This commit is contained in:
Dan Nicholson 2012-06-04 09:00:07 -07:00
parent d11df7ffe0
commit c47c09177f
4 changed files with 30 additions and 8 deletions

View file

@ -1,5 +1,5 @@
diff --git a/glib/configure.ac b/glib/configure.ac
index 3bba0fd..d551832 100644
index 641c0a9..9d3eb6d 100644
--- a/glib/configure.ac
+++ b/glib/configure.ac
@@ -294,8 +294,6 @@ AC_PROG_INSTALL
@ -35,7 +35,7 @@ index 3bba0fd..d551832 100644
dnl gettext support
dnl
@@ -1799,28 +1780,6 @@ dnl failure. try libattr
@@ -1768,30 +1749,6 @@ dnl failure. try libattr
fi
AC_SUBST(XATTR_LIBS)
@ -46,14 +46,16 @@ index 3bba0fd..d551832 100644
-PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe])
-
-if test $have_libelf = maybe; then
- glib_save_LIBS=$LIBS
- AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no])
- AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no])
- AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no])
- AC_CHECK_HEADER([libelf.h], , [have_libelf=no])
- LIBS=$glib_save_LIBS
-
- if test $have_libelf != no; then
- LIBELF_LIBS=-lelf
- have_libelf = yes
- have_libelf=yes
- fi
-fi
-
@ -64,7 +66,7 @@ index 3bba0fd..d551832 100644
dnl ****************************************
dnl *** platform dependent source checks ***
dnl ****************************************
@@ -3355,12 +3314,7 @@ AC_CHECK_ALIGNOF([unsigned long])
@@ -3326,12 +3283,7 @@ AC_CHECK_ALIGNOF([unsigned long])
# Check for libdbus1 - Optional - is only used in the GDBus test cases
#
# 1.2.14 required for dbus_message_set_serial

View file

@ -4,7 +4,7 @@ GIT=${GIT-git}
PATCH=${PATCH-patch}
SED=${SED-sed}
repo=
tag=2.32.2
tag=2.32.3
commit=n
usage()

View file

@ -1,4 +1,24 @@
Overview of changes from GLib 2.32.2 to 2.32.2
Overview of changes from GLib 2.32.2 to 2.32.3
==============================================
* Bug fixes:
Correct a typo in the ELF configure check
Reset LIBS after the ELF configure check
Fix GIO/GObject Visual C++ projects
gio: fix error handling in async case of GProxy...
GConverterInputStream: fix an infinite loop...
* Translation updates:
Bulgarian
Catalan
Czech
German
Japanese
Slovenian
Telugu
Overview of changes from GLib 2.32.1 to 2.32.2
==============================================
* GApplication: can now have a NULL application ID

View file

@ -31,8 +31,8 @@ m4_define(glib_configure_ac)
m4_define([glib_major_version], [2])
m4_define([glib_minor_version], [32])
m4_define([glib_micro_version], [2])
m4_define([glib_interface_age], [2])
m4_define([glib_micro_version], [3])
m4_define([glib_interface_age], [3])
m4_define([glib_binary_age],
[m4_eval(100 * glib_minor_version + glib_micro_version)])
m4_define([glib_version],