diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-02-01 10:52:20 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-08 14:24:11 +0100 |
commit | 9d3bc50a5ec12241eff062e9adf46ae82f11f82f (patch) | |
tree | 8d7e836f4e15753adbde0e77df57158cb08a396c /patches | |
parent | d35384a1e21b4b2922dda29229d79af98f3ccdc9 (diff) | |
download | ptxdist-9d3bc50a5ec12241eff062e9adf46ae82f11f82f.tar.gz ptxdist-9d3bc50a5ec12241eff062e9adf46ae82f11f82f.tar.xz |
glib: version bump 2.26.0 -> 2.27.93, 2.24.1 -> 2.26.1
This reflects the current state of "stable" and "experimental" branches
for glib.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/glib-2.24.1/series | 1 | ||||
-rw-r--r-- | patches/glib-2.26.1/0001-check-if-splice-takes-6-arguments.patch (renamed from patches/glib-2.26.0/0001-check-if-splice-takes-6-arguments.patch) | 0 | ||||
l--------- | patches/glib-2.26.1/autogen.sh (renamed from patches/glib-2.24.1/autogen.sh) | 0 | ||||
-rw-r--r-- | patches/glib-2.26.1/series (renamed from patches/glib-2.26.0/series) | 0 | ||||
-rw-r--r-- | patches/glib-2.27.93/0001-check-if-splice-takes-6-arguments.patch (renamed from patches/glib-2.24.1/0001-check-if-splice-takes-6-arguments.patch) | 23 | ||||
l--------- | patches/glib-2.27.93/autogen.sh (renamed from patches/glib-2.26.0/autogen.sh) | 0 | ||||
-rw-r--r-- | patches/glib-2.27.93/series | 3 |
7 files changed, 13 insertions, 14 deletions
diff --git a/patches/glib-2.24.1/series b/patches/glib-2.24.1/series deleted file mode 100644 index e9a9196c2..000000000 --- a/patches/glib-2.24.1/series +++ /dev/null @@ -1 +0,0 @@ -0001-check-if-splice-takes-6-arguments.patch diff --git a/patches/glib-2.26.0/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.26.1/0001-check-if-splice-takes-6-arguments.patch index bfaf4e810..bfaf4e810 100644 --- a/patches/glib-2.26.0/0001-check-if-splice-takes-6-arguments.patch +++ b/patches/glib-2.26.1/0001-check-if-splice-takes-6-arguments.patch diff --git a/patches/glib-2.24.1/autogen.sh b/patches/glib-2.26.1/autogen.sh index 9f8a4cb7d..9f8a4cb7d 120000 --- a/patches/glib-2.24.1/autogen.sh +++ b/patches/glib-2.26.1/autogen.sh diff --git a/patches/glib-2.26.0/series b/patches/glib-2.26.1/series index 8c17b0eb2..8c17b0eb2 100644 --- a/patches/glib-2.26.0/series +++ b/patches/glib-2.26.1/series diff --git a/patches/glib-2.24.1/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.27.93/0001-check-if-splice-takes-6-arguments.patch index 58e0fc633..4a10daa39 100644 --- a/patches/glib-2.24.1/0001-check-if-splice-takes-6-arguments.patch +++ b/patches/glib-2.27.93/0001-check-if-splice-takes-6-arguments.patch @@ -1,4 +1,3 @@ -From f032da4a05d63b57c9c7659185a64d4e2f4240d7 Mon Sep 17 00:00:00 2001 From: George McCollister <george.mccollister@gmail.com> Date: Thu, 2 Dec 2010 09:31:38 -0600 Subject: [PATCH] check if splice() takes 6 arguments @@ -8,20 +7,21 @@ implimentations only accept 4 arguments while this version of glib assumes that it takes 6. Signed-off-by: George McCollister <george.mccollister@gmail.com> +[mol: configure.in -> configure.ac] +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - configure.in | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) + configure.ac | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index f6d80fb..bb7266c 100644 ---- a/configure.in -+++ b/configure.in -@@ -969,7 +969,22 @@ AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link statvfs statfs utimes getg +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(nanosleep nsleep) -AC_CHECK_FUNCS(splice) -+ +AC_CACHE_CHECK([for splice()], + [ac_cv_func_splice], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ @@ -40,6 +40,3 @@ index f6d80fb..bb7266c 100644 AC_CHECK_HEADERS(crt_externs.h) AC_CHECK_FUNCS(_NSGetEnviron) --- -1.7.1 - diff --git a/patches/glib-2.26.0/autogen.sh b/patches/glib-2.27.93/autogen.sh index 9f8a4cb7d..9f8a4cb7d 120000 --- a/patches/glib-2.26.0/autogen.sh +++ b/patches/glib-2.27.93/autogen.sh diff --git a/patches/glib-2.27.93/series b/patches/glib-2.27.93/series new file mode 100644 index 000000000..8c17b0eb2 --- /dev/null +++ b/patches/glib-2.27.93/series @@ -0,0 +1,3 @@ +# generated by git-ptx-patches +0001-check-if-splice-takes-6-arguments.patch +# a8e6adf65dc08f9d7bf6d30b40f67641 - git-ptx-patches magic |