diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-27 22:52:19 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-27 22:52:19 +0200 |
| commit | 3fdf280568b01a7fa971ddc63e84fdbea11e691b (patch) | |
| tree | eb3a20ab1e5fbe9bec5e863d68b28edc6e71550b /package/libglib2 | |
| parent | f2860bbc8ea6ff959b91eaa8919177d273ee4497 (diff) | |
| parent | 3c77bab2eeace3ee675bd745ca335fa3dd1630bb (diff) | |
Merge branch 'various-bumps' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/libglib2')
| -rw-r--r-- | package/libglib2/Config.in | 1 | ||||
| -rw-r--r-- | package/libglib2/libglib2.mk | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 43ca7c007..3d4243073 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_ZLIB depends on BR2_USE_WCHAR # gettext help Low-level core library that forms the basis of GTK+ and GNOME. diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 43b1a8900..622092d94 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -3,8 +3,8 @@ # libglib2 # ############################################################# -LIBGLIB2_VERSION_MAJOR = 2.22 -LIBGLIB2_VERSION_MINOR = 5 +LIBGLIB2_VERSION_MAJOR = 2.24 +LIBGLIB2_VERSION_MINOR = 0 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) @@ -55,9 +55,9 @@ HOST_LIBGLIB2_CONF_OPT = \ --disable-gtk-doc \ --enable-debug=no \ -LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 $(if $(BR2_NEEDS_GETTEXT),gettext libintl) +LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl) -HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config +HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-zlib ifneq ($(BR2_ENABLE_LOCALE),y) LIBGLIB2_DEPENDENCIES+=libiconv |