Ver código fonte

package/gtkmm3: use correct versions of mm packages

Many of the C++ wrapper packages had API changes. These changes where
never introduced in gtkmm3, meaning that older, but still maintained
versions are needed to build gtkmm3.

Fixes:
 - http://autobuild.buildroot.net/results/172/17263ac51f197031106eb7fd595126a2720f0397

Signed-off-by: Daniel Lang <d.lang@abatec.at>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
Lang Daniel 2 anos atrás
pai
commit
6e817622b8
3 arquivos alterados com 10 adições e 9 exclusões
  1. 1 0
      DEVELOPERS
  2. 8 8
      package/gtkmm3/Config.in
  3. 1 1
      package/gtkmm3/gtkmm3.mk

+ 1 - 0
DEVELOPERS

@@ -647,6 +647,7 @@ F:	package/cairomm1_14/
 F:	package/dbus-cxx/
 F:	package/glibmm/
 F:	package/glibmm2_66/
+F:	package/gtkmm3/
 F:	package/libsigc/
 F:	package/libsigc2/
 F:	package/paho-mqtt-cpp/

+ 8 - 8
package/gtkmm3/Config.in

@@ -1,7 +1,7 @@
-comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 7"
+comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9"
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \
 		|| !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \
 		|| !BR2_TOOLCHAIN_HAS_THREADS
 
@@ -14,16 +14,16 @@ config BR2_PACKAGE_GTKMM3
 	depends on !BR2_nios2
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pangomm, libgtk3 -> pango -> harfbuzz
 	depends on BR2_INSTALL_LIBSTDCPP # glibmm, libpangomm -> glibmm/pango
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
 	depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/libgtk3 -> libglib2
 	depends on BR2_USE_MMU # *mm/libgtk3 -> libglib2
 	depends on BR2_USE_WCHAR # *mm/libgtk3 -> libglib2
 	depends on BR2_PACKAGE_LIBGTK3
-	select BR2_PACKAGE_ATKMM
-	select BR2_PACKAGE_CAIROMM
-	select BR2_PACKAGE_GLIBMM
-	select BR2_PACKAGE_LIBSIGC
-	select BR2_PACKAGE_PANGOMM
+	select BR2_PACKAGE_ATKMM2_28
+	select BR2_PACKAGE_CAIROMM1_14
+	select BR2_PACKAGE_GLIBMM2_66
+	select BR2_PACKAGE_LIBSIGC2
+	select BR2_PACKAGE_PANGOMM2_46
 	help
 	  The gtkmm3 package is a set of C++ bindings for GTK 3.
 

+ 1 - 1
package/gtkmm3/gtkmm3.mk

@@ -11,6 +11,6 @@ GTKMM3_SITE = https://download.gnome.org/sources/gtkmm/$(GTKMM3_VERSION_MAJOR)
 GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
 GTKMM3_LICENSE_FILES = COPYING COPYING.tools
 GTKMM3_INSTALL_STAGING = YES
-GTKMM3_DEPENDENCIES = atkmm cairomm glibmm libgtk3 libsigc pangomm host-pkgconf
+GTKMM3_DEPENDENCIES = atkmm2_28 cairomm1_14 glibmm2_66 libgtk3 libsigc2 pangomm2_46 host-pkgconf
 
 $(eval $(autotools-package))