summaryrefslogtreecommitdiffstats
path: root/package/webkit/webkit.mk
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-19 09:12:15 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-27 22:48:08 +0200
commit760c2d172628fbc03c6e0cd06c831d141907b223 (patch)
tree4505d14c4e171c8bad272306e785044fc0f6df74 /package/webkit/webkit.mk
parent4e9424088bc1a7300a5e613cba30d8e662508274 (diff)
downloadbuildroot-novena-760c2d172628fbc03c6e0cd06c831d141907b223.tar.gz
buildroot-novena-760c2d172628fbc03c6e0cd06c831d141907b223.zip
webkit: bump to webkitgtk 1.2.3
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/webkit/webkit.mk')
-rw-r--r--package/webkit/webkit.mk20
1 files changed, 4 insertions, 16 deletions
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index fc355ceec..648ba3129 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -3,16 +3,15 @@
# 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
@@ -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))