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>

diff --git a/package/midori/Config.in b/package/midori/Config.in
index 95a0afbd64d3860f165173f6975959b3839237ac..49867e42779d1a4c19a1e3fb82dbbab3d00e270e 100644 (file)
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -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

diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 3e46b1aba161a7ccf5dc5433028ebdc71d0b0b35..0b3439c53ce14152e7fd9d63fa3e033d2543dd45 100644 (file)
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -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