diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-11-13 15:05:55 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-11-14 09:39:48 +0100 |
| commit | 5fcd6c4a3aed1a7ef7e5f27fa4c2b59eef7374f9 (patch) | |
| tree | cdf1bedd4629fb6cccff7a357e0fda5338b70d3a /package/glibmm | |
| parent | 36862c71a82dd29db14508b5d37c816b33f9463b (diff) | |
glibmm: bump to version 2.46.1
Adjust pulseview/libsigrok for the gcc >= 4.8 dependency.
Line wrap comment depends for pulseview.
Drop redundant libsigrok depend on comment for libsigrok++.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/glibmm')
| -rw-r--r-- | package/glibmm/Config.in | 7 | ||||
| -rw-r--r-- | package/glibmm/glibmm.hash | 4 | ||||
| -rw-r--r-- | package/glibmm/glibmm.mk | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in index 6ac4be543..fdbb43812 100644 --- a/package/glibmm/Config.in +++ b/package/glibmm/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GLIBMM bool "glibmm" select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBSIGC + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 @@ -11,7 +12,7 @@ config BR2_PACKAGE_GLIBMM http://www.gtkmm.org/ -comment "glibmm needs a toolchain w/ C++, wchar, threads" +comment "glibmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/glibmm/glibmm.hash b/package/glibmm/glibmm.hash index 4fbde55a3..9a7a6c889 100644 --- a/package/glibmm/glibmm.hash +++ b/package/glibmm/glibmm.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.36/glibmm-2.36.1.sha256sum -sha256 d1f7dec2fd75ea95034ec143fcf2ff77a02e92aacf3e0cc110f9c67e7fe23766 glibmm-2.36.1.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.46/glibmm-2.46.1.sha256sum +sha256 9647e596c1081d2ea202bd3da2824ec2ea359498fa86eb59a55b1b307dd8c4aa glibmm-2.46.1.tar.xz diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk index 4081251da..66b357d40 100644 --- a/package/glibmm/glibmm.mk +++ b/package/glibmm/glibmm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLIBMM_VERSION_MAJOR = 2.36 +GLIBMM_VERSION_MAJOR = 2.46 GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).1 GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools) GLIBMM_LICENSE_FILES = COPYING COPYING.tools |