From e9e66a4f6a692265b8ef0d710642722d3b4270c9 Mon Sep 17 00:00:00 2001 From: Robert Schwebel Date: Fri, 18 Feb 2011 09:52:06 +0100 Subject: glib: version bump 2.26.1 -> 2.28.0 There is a new stable series out there, so this patch bumps to 2.28. As this is almost identical with the former 2.27.93 beta version, remove the experimental version for now. The result was build-tested with the AllYes BSP. We leave the experimental mechanism in the rules file: there is currently no experimental series released yet, but this will happen again in the future. Signed-off-by: Robert Schwebel --- .../0001-check-if-splice-takes-6-arguments.patch | 46 ---------------------- patches/glib-2.26.1/autogen.sh | 1 - patches/glib-2.26.1/series | 3 -- .../0001-check-if-splice-takes-6-arguments.patch | 42 ++++++++++++++++++++ patches/glib-2.28.0/autogen.sh | 1 + patches/glib-2.28.0/series | 3 ++ rules/dconf.in | 1 - rules/glib.in | 6 +-- rules/glib.make | 10 ++--- 9 files changed, 54 insertions(+), 59 deletions(-) delete mode 100644 patches/glib-2.26.1/0001-check-if-splice-takes-6-arguments.patch delete mode 120000 patches/glib-2.26.1/autogen.sh delete mode 100644 patches/glib-2.26.1/series create mode 100644 patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch create mode 120000 patches/glib-2.28.0/autogen.sh create mode 100644 patches/glib-2.28.0/series diff --git a/patches/glib-2.26.1/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.26.1/0001-check-if-splice-takes-6-arguments.patch deleted file mode 100644 index bfaf4e810..000000000 --- a/patches/glib-2.26.1/0001-check-if-splice-takes-6-arguments.patch +++ /dev/null @@ -1,46 +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 | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ea73394..b86a785 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -956,7 +956,22 @@ AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getg - AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getmntinfo) - # Check for high-resolution sleep functions - AC_CHECK_FUNCS(nanosleep nsleep) --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) --- -1.7.2.3 - diff --git a/patches/glib-2.26.1/autogen.sh b/patches/glib-2.26.1/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/glib-2.26.1/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/glib-2.26.1/series b/patches/glib-2.26.1/series deleted file mode 100644 index 8c17b0eb2..000000000 --- a/patches/glib-2.26.1/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.0/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.28.0/0001-check-if-splice-takes-6-arguments.patch new file mode 100644 index 000000000..4a10daa39 --- /dev/null +++ b/patches/glib-2.28.0/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.0/autogen.sh b/patches/glib-2.28.0/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/glib-2.28.0/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/glib-2.28.0/series b/patches/glib-2.28.0/series new file mode 100644 index 000000000..8c17b0eb2 --- /dev/null +++ b/patches/glib-2.28.0/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/dconf.in b/rules/dconf.in index 8e60bb95f..2da990783 100644 --- a/rules/dconf.in +++ b/rules/dconf.in @@ -3,7 +3,6 @@ config DCONF tristate select GLIB - select GLIB_EXPERIMENTAL select LIBC_RT select LIBC_RESOLV select DBUS diff --git a/rules/glib.in b/rules/glib.in index 3893d2c96..80a761a22 100644 --- a/rules/glib.in +++ b/rules/glib.in @@ -22,9 +22,9 @@ menuconfig GLIB if GLIB -config GLIB_EXPERIMENTAL - bool - prompt "experimental version" +#config GLIB_EXPERIMENTAL +# bool +# prompt "experimental version" choice diff --git a/rules/glib.make b/rules/glib.make index c4aaae186..38e3b9530 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_GLIB) += glib # # Paths and names # -ifdef PTXCONF_GLIB_EXPERIMENTAL -GLIB_VERSION := 2.27.93 -else -GLIB_VERSION := 2.26.1 -endif +#ifdef PTXCONF_GLIB_EXPERIMENTAL +#GLIB_VERSION := 2.27.93 +#else +GLIB_VERSION := 2.28.0 +#endif GLIB := glib-$(GLIB_VERSION) GLIB_SUFFIX := tar.bz2 -- cgit v1.2.3