pango: needs C++ for freetype handling

Pango was recently updated to v1.28 as a dependency of webkit, but its
freetype support has unfortunately been rewritten with parts in C++
(since pango 1.25), so adjust dependencies of pango and users of it to
require C++ support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 7ab4aa4dcc4adf57e163f9ffdd8bd61841a92069..b6e58acf9771099ac7196a59278880925d21006d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,9 +17,10 @@
 
        fs: old-style squashfs for big endian archs fixed.
 
-       Updated/fixed packages: busybox, imagemagick, libglib2, lua,
-       luafilesystem, lzo, netcat, php, pppd, proftpd, qt, samba,
-       startup-notification, sysvinit, util-linux
+       Updated/fixed packages: busybox, gst-plugins-base,
+       imagemagick, libgail, libglib2, libgtk2, lua, luafilesystem,
+       lzo, netcat, pango, php, pppd, proftpd, qt, samba,
+       startup-notification, swfdec, sysvinit, util-linux
 
        Removed packages: stunnel
 

diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 3d15f4c93716a5d09a081028da02c70f2cece760..bc4ca9d768ed3a566329b342adaf671e00f9fb6a 100644 (file)
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -13,10 +13,11 @@ config BR2_PACKAGE_LIBGTK2
        # time.
        depends on BR2_PACKAGE_XORG7||(BR2_PACKAGE_DIRECTFB && BR2_DEPRECATED)
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_INSTALL_LIBSTDCPP # pango
        help
          The GTK+ version 2 graphical user interface library
 
          http://www.gtk.org/
 
-comment "libgtk2 requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "libgtk2 requires a toolchain with WCHAR and C++ support"
+       depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP

diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index f08be7eb7685d9bcf8a5864105614ca39237f598..0f552fe2b6187dc4cc9f83db1a0804c4f2871293 100644 (file)
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -74,8 +74,12 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG
 
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO
        bool "pango font renderer"
+       depends on BR2_INSTALL_LIBSTDCPP
        select BR2_PACKAGE_PANGO
 
+comment "pango plugin requires a toolchain with C++ support"
+       depends on !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA
        bool "theora (*.ogg video)"
        select BR2_PACKAGE_LIBTHEORA

diff --git a/package/multimedia/swfdec/Config.in b/package/multimedia/swfdec/Config.in
index 2a79756d1b25d427cb6c5a7e24de57eb15aa40ad..bc1c73af93c8a51dbdbf46759f046a2c9e61d80d 100644 (file)
--- a/package/multimedia/swfdec/Config.in
+++ b/package/multimedia/swfdec/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SWFDEC
        bool "swfdec"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_INSTALL_LIBSTDCPP # pango
        select BR2_PACKAGE_LIBOIL
        select BR2_PACKAGE_ALSA_LIB
        select BR2_PACKAGE_PANGO
@@ -30,5 +31,5 @@ config BR2_PACKAGE_SWFDEC_GSTREAMER
        help
          Enables GStreamer support
 
-comment "swfdec requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "swfdec requires a toolchain with WCHAR and C++ support"
+       depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP

diff --git a/package/pango/Config.in b/package/pango/Config.in
index e4c084d0c5eb8fa8f2efb7650afced5647abc02f..923c3d4ac2c59bae8423af9d717106c14a380d5e 100644 (file)
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PANGO
        bool "pango"
        depends on BR2_USE_WCHAR # glib2
+       depends on BR2_INSTALL_LIBSTDCPP # freetype support
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_EXPAT
        select BR2_PACKAGE_CAIRO
@@ -15,5 +16,5 @@ config BR2_PACKAGE_PANGO
 
          http://www.pango.org/
 
-comment "pango requires a toolchain with WCHAR support"
-       depends on !BR2_USE_WCHAR
+comment "pango requires a toolchain with WCHAR and C++ support"
+       depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP