From b0059be8520b93c401ff0ac04837aca2d8fec90c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 12 Oct 2015 23:41:17 +0200
Subject: [PATCH] glib: update to glib-2.46.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/devel/glib/package.mk                |  4 +-
 .../patches/glib-01-dont-build-tests.patch    | 54 -------------------
 2 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 packages/devel/glib/patches/glib-01-dont-build-tests.patch

diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk
index e341884a84..8aed878837 100644
--- a/packages/devel/glib/package.mk
+++ b/packages/devel/glib/package.mk
@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="glib"
-PKG_VERSION="2.44.1"
+PKG_VERSION="2.46.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.44/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.46/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain zlib libffi pcre Python:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
diff --git a/packages/devel/glib/patches/glib-01-dont-build-tests.patch b/packages/devel/glib/patches/glib-01-dont-build-tests.patch
deleted file mode 100644
index 49b59ac520..0000000000
--- a/packages/devel/glib/patches/glib-01-dont-build-tests.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 68cbd635036fe04cd07bbb1a4829eebab2d7dc03 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Wed, 20 Aug 2014 22:46:35 +0300
-Subject: [PATCH] dont build tests
-
----
- Makefile.am  |    2 +-
- configure.ac |   17 -----------------
- 2 files changed, 1 insertions(+), 18 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 40e5cd5..db7bfc8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk
- 
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
- 
--SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
- DIST_SUBDIRS = $(SUBDIRS) build
- 
- bin_SCRIPTS = glib-gettextize
-diff --git a/configure.ac b/configure.ac
-index a01e58d..f310615 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2559,23 +2559,6 @@ dnl ******************************************************************
- 
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
- 
--AS_IF([ test $cross_compiling = yes ], [
--  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
--  if test x$GLIB_GENMARSHAL = xno; then
--    AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
--  fi
--
--  AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
--  if test x$GLIB_COMPILE_SCHEMAS = xno; then
--    AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH)
--  fi
--
--  AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources, no)
--  if test x$GLIB_COMPILE_RESOURCES = xno; then
--    AC_MSG_ERROR(Could not find a glib-compile-resources in your PATH)
--  fi
--])
--
- dnl **************************
- dnl *** Checks for gtk-doc ***
- dnl **************************
--- 
-1.7.2.5
-