diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-27 22:52:19 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-27 22:52:19 +0200 |
| commit | 3fdf280568b01a7fa971ddc63e84fdbea11e691b (patch) | |
| tree | eb3a20ab1e5fbe9bec5e863d68b28edc6e71550b /package/webkit/webkit.mk | |
| parent | f2860bbc8ea6ff959b91eaa8919177d273ee4497 (diff) | |
| parent | 3c77bab2eeace3ee675bd745ca335fa3dd1630bb (diff) | |
Merge branch 'various-bumps' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/webkit/webkit.mk')
| -rw-r--r-- | package/webkit/webkit.mk | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk index fc355ceec..247ce77bb 100644 --- a/package/webkit/webkit.mk +++ b/package/webkit/webkit.mk @@ -3,22 +3,21 @@ # webkit # ############################################################# -WEBKIT_VERSION = r44552 -WEBKIT_SOURCE = WebKit-$(WEBKIT_VERSION).tar.bz2 -WEBKIT_SITE = http://nightly.webkit.org/files/trunk/src/ +WEBKIT_VERSION = 1.2.3 +WEBKIT_SOURCE = webkit-$(WEBKIT_VERSION).tar.gz +WEBKIT_SITE = http://www.webkitgtk.org WEBKIT_INSTALL_STAGING = YES -WEBKIT_INSTALL_TARGET = YES WEBKIT_LIBTOOL_PATCH = NO WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt \ - libgtk2 sqlite enchant libsoup jpeg + libgtk2 sqlite enchant libsoup jpeg libgail WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config ifeq ($(BR2_PACKAGE_XORG7),y) WEBKIT_CONF_OPT += --with-target=x11 - WEBKIT_DEPENDENCIES += xserver_xorg-server + WEBKIT_DEPENDENCIES += xserver_xorg-server xlib_libXt endif ifeq ($(BR2_PACKAGE_DIRECTFB),y) @@ -28,15 +27,4 @@ endif WEBKIT_CONF_OPT += --disable-video -define WEBKIT_AUTOGEN_PATCH -$(SED) 's%ACLOCAL_FLAGS=.*%ACLOCAL_FLAGS="-I autotools -I $(STAGING_DIR)/usr/share/aclocal"%' $(WEBKIT_DIR)/autogen.sh -$(SED) 's/AUTOMAKE_FLAGS=.*/AUTOMAKE_FLAGS="--foreign --add-missing --copy"/' $(WEBKIT_DIR)/autogen.sh -$(SED) 's/LIBTOOLIZE_FLAGS=.*/LIBTOOLIZE_FLAGS="--force --automake --copy"/' $(WEBKIT_DIR)/autogen.sh -cp package/webkit/gtk-doc.make $(WEBKIT_DIR)/ -# Don't run the configure step yet -cd $(WEBKIT_DIR); $(HOST_CONFIGURE_OPTS) AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh -endef - -WEBKIT_POST_EXTRACT_HOOKS += WEBKIT_AUTOGEN_PATCH - $(eval $(call AUTOTARGETS,package,webkit)) |