diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | packages/webkit/webkit-gtk/GNUmakefile.am | 3 | ||||
| -rw-r--r-- | packages/webkit/webkit-gtk/configure.ac | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index eb2195df3e..8958b764af 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -177,7 +177,7 @@ SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" -SRCREV_pn-webkit-gtk ?= "35977" +SRCREV_pn-webkit-gtk ?= "36540" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am index 50149563ac..e274289672 100644 --- a/packages/webkit/webkit-gtk/GNUmakefile.am +++ b/packages/webkit/webkit-gtk/GNUmakefile.am @@ -448,7 +448,8 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile # Files that will be distributed EXTRA_DIST = \ $(javascriptcore_dist) \ - $(webcore_dist) + $(webcore_dist) \ + symbols.filter # Files that will be cleaned MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac index 21f72661ec..579891cbe0 100644 --- a/packages/webkit/webkit-gtk/configure.ac +++ b/packages/webkit/webkit-gtk/configure.ac @@ -6,7 +6,7 @@ m4_define([webkit_micro_version], [2]) AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) -AC_CONFIG_HEADERS([aconfig.h]) +AC_CONFIG_HEADERS([autotoolsconfig.h]) WEBKIT_MAJOR_VERSION=webkit_major_version WEBKIT_MINOR_VERSION=webkit_minor_version |