glib: update to glib-2.46.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2015-10-12 23:41:17 +02:00
parent 615a7df96b
commit b0059be852
2 changed files with 2 additions and 56 deletions

View File

@ -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"

View File

@ -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