Merge branch 'master' of git://git.pengutronix.de/git/ptxdist

6 files changed, 0 insertions, 50 deletions

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 <george.mccollister@gmail.com>
-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 <george.mccollister@gmail.com>
-[mol: configure.in -> configure.ac]
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- 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 <stdlib.h>
-+#include <fcntl.h>
-+  ]],[[
-+    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.27.93/autogen.sh b/patches/glib-2.27.93/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/glib-2.27.93/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/glib-2.27.93/series b/patches/glib-2.27.93/series
deleted file mode 100644
index 8c17b0eb2..000000000
--- a/patches/glib-2.27.93/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.27.93/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.28.1/0001-check-if-splice-takes-6-arguments.patch
index 4a10daa39..4a10daa39 100644
--- a/patches/glib-2.27.93/0001-check-if-splice-takes-6-arguments.patch
+++ b/patches/glib-2.28.1/0001-check-if-splice-takes-6-arguments.patch
diff --git a/patches/glib-2.26.1/autogen.sh b/patches/glib-2.28.1/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/glib-2.26.1/autogen.sh
+++ b/patches/glib-2.28.1/autogen.sh
diff --git a/patches/glib-2.26.1/series b/patches/glib-2.28.1/series
index 8c17b0eb2..8c17b0eb2 100644
--- a/patches/glib-2.26.1/series
+++ b/patches/glib-2.28.1/series