midori: bump version to 0.4.6

[Peter: sort/indent dependencies]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Simon Dawson 2012-05-25 02:47:31 +00:00 committed by Peter Korsgaard
parent d287f129c8
commit ece64bf188
2 changed files with 15 additions and 4 deletions

View File

@ -2,6 +2,9 @@ config BR2_PACKAGE_MIDORI
bool "midori"
select BR2_PACKAGE_WEBKIT
select BR2_PACKAGE_LIBSEXY
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
depends on BR2_PACKAGE_LIBGTK2
depends on BR2_INSTALL_LIBSTDCPP # webkit
depends on BR2_USE_WCHAR # webkit

View File

@ -4,10 +4,18 @@
#
#############################################################
MIDORI_VERSION = 0.3.6
MIDORI_VERSION = 0.4.6
MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.3/
MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2
MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.4/
MIDORI_DEPENDENCIES = \
host-intltool \
host-pkg-config \
host-vala \
libgtk2 \
libsexy \
webkit \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
ifneq ($(BR2_PACKAGE_XORG7),y)
define MIDORI_WITHOUT_X11
@ -21,7 +29,7 @@ define MIDORI_CONFIGURE_CMDS
$(TARGET_CONFIGURE_OPTS) \
./waf configure \
--prefix=/usr \
--disable-vala \
--disable-libnotify \
)
endef