Commit 1c4dbb5f authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 8e32ec9a

CHANGES

+4 −3
Original line number Diff line number Diff line
@@ -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

package/libgtk2/Config.in

+3 −2
Original line number Diff line number Diff line
@@ -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

package/multimedia/gst-plugins-base/Config.in

+4 −0
Original line number Diff line number Diff line
@@ -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

package/multimedia/swfdec/Config.in

+3 −2
Original line number Diff line number Diff line 
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

package/pango/Config.in

+3 −2
Original line number Diff line number Diff line 
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