diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | package/midori/midori.mk | 19 |
2 files changed, 14 insertions, 7 deletions
@@ -2,7 +2,7 @@ Fixes all over the tree. - Updated/fixed packages: libglib2, module-init-tools, + Updated/fixed packages: libglib2, midori, module-init-tools, mtd-utils, openssh, qt, sqlite, webkit Issues resolved (http://bugs.uclibc.org): diff --git a/package/midori/midori.mk b/package/midori/midori.mk index ffee596fb..af227d4eb 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -4,19 +4,26 @@ # ############################################################# -MIDORI_VERSION = 0.2.6 +MIDORI_VERSION = 0.2.9 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2 MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.2/ -MIDORI_INSTALL_STAGING = NO MIDORI_INSTALL_TARGET = YES MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2 +ifneq ($(BR2_PACKAGE_XORG7),y) +define MIDORI_WITHOUT_X11 + $(SED) "s/check_pkg ('x11')/#check_pkg ('x11')/" $(@D)/wscript +endef +endif + define MIDORI_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - ./waf configure \ - --prefix=/usr \ + $(MIDORI_WITHOUT_X11) + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + ./waf configure \ + --prefix=/usr \ + --disable-vala \ ) endef |