diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-08-22 05:49:02 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-08-22 05:53:32 -0700 |
| commit | 617963c55e128eb182868c8a21782d2b65ea8110 (patch) | |
| tree | 23735b27f6213785e6aaa8ac78b615993966f46f /glib-patches | |
| parent | f8978af7bf5b45287181df05f5c3b0bed2804544 (diff) | |
| download | pkg-config-617963c55e128eb182868c8a21782d2b65ea8110.tar.gz | |
glib: Update snapshot to 2.32.4
This gets us to the latest stable release for glib and probably a good
stopping point for a while since the 2.32 series seems to be slowing
down.
Diffstat (limited to 'glib-patches')
| -rw-r--r-- | glib-patches/no-pkg-config.patch | 8 | ||||
| -rwxr-xr-x | glib-patches/update-glib.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/glib-patches/no-pkg-config.patch b/glib-patches/no-pkg-config.patch index bfa4374..07a6712 100644 --- a/glib-patches/no-pkg-config.patch +++ b/glib-patches/no-pkg-config.patch @@ -1,5 +1,5 @@ diff --git a/glib/configure.ac b/glib/configure.ac -index 641c0a9..9d3eb6d 100644 +index 99de9f7..e582232 100644 --- a/glib/configure.ac +++ b/glib/configure.ac @@ -294,8 +294,6 @@ AC_PROG_INSTALL @@ -35,7 +35,7 @@ index 641c0a9..9d3eb6d 100644 dnl gettext support dnl -@@ -1768,30 +1749,6 @@ dnl failure. try libattr +@@ -1779,30 +1760,6 @@ dnl failure. try libattr fi AC_SUBST(XATTR_LIBS) @@ -43,7 +43,7 @@ index 641c0a9..9d3eb6d 100644 -dnl *** check for libelf *** -dnl ************************ - --PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe]) +-PKG_CHECK_MODULES([LIBELF], [libelf >= 0.8.12], [have_libelf=yes], [have_libelf=maybe]) - -if test $have_libelf = maybe; then - glib_save_LIBS=$LIBS @@ -66,7 +66,7 @@ index 641c0a9..9d3eb6d 100644 dnl **************************************** dnl *** platform dependent source checks *** dnl **************************************** -@@ -3326,12 +3283,7 @@ AC_CHECK_ALIGNOF([unsigned long]) +@@ -3280,12 +3237,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 diff --git a/glib-patches/update-glib.sh b/glib-patches/update-glib.sh index db83b63..1b80a2c 100755 --- a/glib-patches/update-glib.sh +++ b/glib-patches/update-glib.sh @@ -4,7 +4,7 @@ GIT=${GIT-git} PATCH=${PATCH-patch} SED=${SED-sed} repo= -tag=2.32.3 +tag=2.32.4 commit=n usage() |