summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2014-10-28 08:22:08 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2014-11-13 10:15:57 +0100
commitc6468545e75962c2fc9a74342dfc2901947e00e0 (patch)
tree056d58552ecf9043d155be077e3e83b5c2fb1807
parent334ebf98fa09ff1fb536761fcd1458c2d0539560 (diff)
downloadptxdist-c6468545e75962c2fc9a74342dfc2901947e00e0.tar.gz
ptxdist-c6468545e75962c2fc9a74342dfc2901947e00e0.tar.xz
glib: version bump 2.40.0 -> 2.42.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/glib-2.42.0/0001-check-if-splice-takes-6-arguments.patch (renamed from patches/glib-2.40.0/0001-check-if-splice-takes-6-arguments.patch)0
l---------patches/glib-2.42.0/autogen.sh (renamed from patches/glib-2.40.0/autogen.sh)0
-rw-r--r--patches/glib-2.42.0/series (renamed from patches/glib-2.40.0/series)0
-rw-r--r--rules/glib.make4
4 files changed, 2 insertions, 2 deletions
diff --git a/patches/glib-2.40.0/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.42.0/0001-check-if-splice-takes-6-arguments.patch
index 01668cd13..01668cd13 100644
--- a/patches/glib-2.40.0/0001-check-if-splice-takes-6-arguments.patch
+++ b/patches/glib-2.42.0/0001-check-if-splice-takes-6-arguments.patch
diff --git a/patches/glib-2.40.0/autogen.sh b/patches/glib-2.42.0/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/glib-2.40.0/autogen.sh
+++ b/patches/glib-2.42.0/autogen.sh
diff --git a/patches/glib-2.40.0/series b/patches/glib-2.42.0/series
index d1f211b45..d1f211b45 100644
--- a/patches/glib-2.40.0/series
+++ b/patches/glib-2.42.0/series
diff --git a/rules/glib.make b/rules/glib.make
index 7d519f871..e0a7ebdf6 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.40.0
-GLIB_MD5 := 05fb7cb17eacbc718e90366a1eae60d9
+GLIB_VERSION := 2.42.0
+GLIB_MD5 := 71af99768063ac24033ac738e2832740
#endif
GLIB := glib-$(GLIB_VERSION)