summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2013-09-06 17:46:54 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2013-09-09 18:20:34 +0200
commitab296bcc286b3340798d033592bd30cfac06e312 (patch)
tree95f0dc09db5ead8f8c886fd6cb145842d0efd16a
parent39e4f54ed6730da25ea85d31f220436c2653d7a7 (diff)
downloadptxdist-ab296bcc286b3340798d033592bd30cfac06e312.tar.gz
ptxdist-ab296bcc286b3340798d033592bd30cfac06e312.tar.xz
glib: version bump 2.36.3 -> 2.36.4
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/glib-2.36.4/0001-check-if-splice-takes-6-arguments.patch (renamed from patches/glib-2.36.3/0001-check-if-splice-takes-6-arguments.patch)0
l---------patches/glib-2.36.4/autogen.sh (renamed from patches/glib-2.36.3/autogen.sh)0
-rw-r--r--patches/glib-2.36.4/series (renamed from patches/glib-2.36.3/series)0
-rw-r--r--rules/glib.make4
4 files changed, 2 insertions, 2 deletions
diff --git a/patches/glib-2.36.3/0001-check-if-splice-takes-6-arguments.patch b/patches/glib-2.36.4/0001-check-if-splice-takes-6-arguments.patch
index a63a219d2..a63a219d2 100644
--- a/patches/glib-2.36.3/0001-check-if-splice-takes-6-arguments.patch
+++ b/patches/glib-2.36.4/0001-check-if-splice-takes-6-arguments.patch
diff --git a/patches/glib-2.36.3/autogen.sh b/patches/glib-2.36.4/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/glib-2.36.3/autogen.sh
+++ b/patches/glib-2.36.4/autogen.sh
diff --git a/patches/glib-2.36.3/series b/patches/glib-2.36.4/series
index d1f211b45..d1f211b45 100644
--- a/patches/glib-2.36.3/series
+++ b/patches/glib-2.36.4/series
diff --git a/rules/glib.make b/rules/glib.make
index 483a8c8bf..c9a35787f 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.36.3
-GLIB_MD5 := 89180c7354b0acd3efb0a36ac05ca39c
+GLIB_VERSION := 2.36.4
+GLIB_MD5 := 2f4b15f7ef43d8702d067ab987bf7aba
#endif
GLIB := glib-$(GLIB_VERSION)