From 3ae863880df3e9d7d989e3fa43902c575b724319 Mon Sep 17 00:00:00 2001 From: Robert Schwebel Date: Wed, 8 Jun 2011 23:15:33 +0200 Subject: glib: version bump 2.28.7 -> 2.28.8 Signed-off-by: Robert Schwebel --- .../0001-check-if-splice-takes-6-arguments.patch | 42 ---------------------- patches/glib-2.28.7/autogen.sh | 1 - patches/glib-2.28.7/series | 3 -- .../0001-check-if-splice-takes-6-arguments.patch | 42 ++++++++++++++++++++++ patches/glib-2.28.8/autogen.sh | 1 + patches/glib-2.28.8/series | 3 ++ rules/glib.make | 4 +-- 7 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 patches/glib-2.28.7/0001-check-if-splice-takes-6-arguments.patch delete mode 120000 patches/glib-2.28.7/autogen.sh delete mode 100644 patches/glib-2.28.7/series create mode 100644 patches/glib-2.28.8/0001-check-if-splice-takes-6-arguments.patch create mode 120000 patches/glib-2.28.8/autogen.sh create mode 100644 patches/glib-2.28.8/series diff --git a/patches/glib-2.28.7/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.28.7/0001-check-if-splice-takes-6-arguments.patch deleted file mode 100644 index 4a10daa39..000000000 --- a/patches/glib-2.28.7/0001-check-if-splice-takes-6-arguments.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: George McCollister -Date: Thu, 2 Dec 2010 09:31:38 -0600 -Subject: [PATCH] check if splice() takes 6 arguments - -checking for the presence of splice() isn't sufficient. Older -implimentations only accept 4 arguments while this version of glib -assumes that it takes 6. - -Signed-off-by: George McCollister -[mol: configure.in -> configure.ac] -Signed-off-by: Michael Olbrich ---- - configure.ac | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -Index: glib-2.27.93/configure.ac -=================================================================== ---- glib-2.27.93.orig/configure.ac -+++ glib-2.27.93/configure.ac -@@ -948,7 +948,21 @@ AC_CHECK_FUNCS(lstat strerror strsignal - AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid) - AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getmntinfo) - # Check for high-resolution sleep functions --AC_CHECK_FUNCS(splice) -+AC_CACHE_CHECK([for splice()], -+ [ac_cv_func_splice], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -+#define _GNU_SOURCE -+#include -+#include -+ ]],[[ -+ splice(0, NULL, 0, NULL, (size_t)0, (unsigned int)0); -+ ]])], -+ [ac_cv_func_splice=yes], -+ [ac_cv_func_splice=no])]) -+ -+AS_IF([test "x$ac_cv_func_splice" = "xyes"],[ -+ AC_DEFINE([HAVE_SPLICE],[1],[If we have splice]) -+]) - - AC_CHECK_HEADERS(crt_externs.h) - AC_CHECK_FUNCS(_NSGetEnviron) diff --git a/patches/glib-2.28.7/autogen.sh b/patches/glib-2.28.7/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/glib-2.28.7/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/glib-2.28.7/series b/patches/glib-2.28.7/series deleted file mode 100644 index 8c17b0eb2..000000000 --- a/patches/glib-2.28.7/series +++ /dev/null @@ -1,3 +0,0 @@ -# generated by git-ptx-patches -0001-check-if-splice-takes-6-arguments.patch -# a8e6adf65dc08f9d7bf6d30b40f67641 - git-ptx-patches magic diff --git a/patches/glib-2.28.8/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.28.8/0001-check-if-splice-takes-6-arguments.patch new file mode 100644 index 000000000..4a10daa39 --- /dev/null +++ b/patches/glib-2.28.8/0001-check-if-splice-takes-6-arguments.patch @@ -0,0 +1,42 @@ +From: George McCollister +Date: Thu, 2 Dec 2010 09:31:38 -0600 +Subject: [PATCH] check if splice() takes 6 arguments + +checking for the presence of splice() isn't sufficient. Older +implimentations only accept 4 arguments while this version of glib +assumes that it takes 6. + +Signed-off-by: George McCollister +[mol: configure.in -> configure.ac] +Signed-off-by: Michael Olbrich +--- + configure.ac | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +Index: glib-2.27.93/configure.ac +=================================================================== +--- glib-2.27.93.orig/configure.ac ++++ glib-2.27.93/configure.ac +@@ -948,7 +948,21 @@ AC_CHECK_FUNCS(lstat strerror strsignal + AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid) + AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getmntinfo) + # Check for high-resolution sleep functions +-AC_CHECK_FUNCS(splice) ++AC_CACHE_CHECK([for splice()], ++ [ac_cv_func_splice], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ++#define _GNU_SOURCE ++#include ++#include ++ ]],[[ ++ splice(0, NULL, 0, NULL, (size_t)0, (unsigned int)0); ++ ]])], ++ [ac_cv_func_splice=yes], ++ [ac_cv_func_splice=no])]) ++ ++AS_IF([test "x$ac_cv_func_splice" = "xyes"],[ ++ AC_DEFINE([HAVE_SPLICE],[1],[If we have splice]) ++]) + + AC_CHECK_HEADERS(crt_externs.h) + AC_CHECK_FUNCS(_NSGetEnviron) diff --git a/patches/glib-2.28.8/autogen.sh b/patches/glib-2.28.8/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/glib-2.28.8/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/glib-2.28.8/series b/patches/glib-2.28.8/series new file mode 100644 index 000000000..8c17b0eb2 --- /dev/null +++ b/patches/glib-2.28.8/series @@ -0,0 +1,3 @@ +# generated by git-ptx-patches +0001-check-if-splice-takes-6-arguments.patch +# a8e6adf65dc08f9d7bf6d30b40f67641 - git-ptx-patches magic diff --git a/rules/glib.make b/rules/glib.make index 0c06b0a35..b9d16bd83 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -21,8 +21,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib #GLIB_VERSION := 2.27.93 #GLIB_MD5 := #else -GLIB_VERSION := 2.28.7 -GLIB_MD5 := feda1650c8646ad39c7b01d95b03766b +GLIB_VERSION := 2.28.8 +GLIB_MD5 := 789e7520f71c6a4bf08bc683ec764d24 #endif GLIB := glib-$(GLIB_VERSION) -- cgit v1.2.3