diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-31 09:23:23 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-31 09:23:23 +0200 |
commit | bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch) | |
tree | d6012109e704c5e9abc709c23a7133a3d4b4f779 /package/midori/midori.mk | |
parent | 5b11223fb6cd0469becf49b0986868832c076bfc (diff) | |
parent | 2105ecbd86d04e446effa11108f6bd755ed5f19a (diff) |
Merge branch 'next'
Conflicts:
toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/midori/midori.mk')
-rw-r--r-- | package/midori/midori.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/package/midori/midori.mk b/package/midori/midori.mk index 3e46b1aba..0b3439c53 100644 --- 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 |