webkit-gtk: Update to 1.3.2
* Update the following files with 1.3.2 version in upstream:
GNUmakefile.am
Makefile
Makefile.shared
autogen.sh
configure.ac
* Update the .bb with the one in openembeded(91eefa1e)
* inherit pkgconfig and remove dolt stuff according to RP's comments
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
This commit is contained in:
Zhai Edwin
Richard Purdie
parent
b0b3468b95
commit
3a1c456172
|
|
@ -119,7 +119,7 @@ SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
|
|||
SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
|
||||
SRCREV_pn-settings-daemon ??= "2059"
|
||||
SRCREV_pn-ubootchart ??= "10"
|
||||
SRCREV_pn-webkit-gtk ??= "31859"
|
||||
SRCREV_pn-webkit-gtk ??= "62027"
|
||||
SRCREV_pn-web-webkit ??= "110"
|
||||
SRCREV_pn-web ??= "97"
|
||||
SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
|||
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
|
||||
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
|
||||
|
||||
all:
|
||||
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
|
||||
|
|
@ -12,18 +12,6 @@ release r deployment dep deploy:
|
|||
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
|
||||
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
|
||||
|
||||
universal u:
|
||||
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
|
||||
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
|
||||
|
||||
64:
|
||||
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
|
||||
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
|
||||
|
||||
64u:
|
||||
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
|
||||
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
|
||||
|
||||
clean:
|
||||
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
|
||||
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
|
||||
|
|
|
|||
|
|
@ -12,15 +12,6 @@ release r deployment dep deploy: force
|
|||
$(SCRIPTS_PATH)/set-webkit-configuration --release
|
||||
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
|
||||
|
||||
universal u: force
|
||||
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
|
||||
|
||||
64: force
|
||||
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
|
||||
|
||||
64u: force
|
||||
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
|
||||
|
||||
clean:
|
||||
( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,11 @@ test -z "$srcdir" && srcdir=.
|
|||
ORIGDIR=`pwd`
|
||||
cd $srcdir
|
||||
|
||||
GTKDOCIZE_FLAGS="--copy"
|
||||
LIBTOOLIZE_FLAGS="--force --automake"
|
||||
ACLOCAL_FLAGS="-I autotools"
|
||||
AUTOMAKE_FLAGS="--foreign --add-missing"
|
||||
|
||||
DIE=0
|
||||
|
||||
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
|
||||
|
|
@ -46,10 +51,11 @@ rm -rf $top_srcdir/autom4te.cache
|
|||
|
||||
touch README INSTALL
|
||||
|
||||
aclocal || exit $?
|
||||
$LIBTOOLIZE --force || exit $?
|
||||
gtkdocize $GTKDOCIZE_FLAGS > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
|
||||
aclocal $ACLOCAL_FLAGS || exit $?
|
||||
$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?
|
||||
autoheader || exit $?
|
||||
automake --foreign --add-missing || exit $?
|
||||
automake $AUTOMAKE_FLAGS || exit $?
|
||||
autoconf || exit $?
|
||||
|
||||
cd $ORIGDIR || exit 1
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,173 @@
|
|||
# -*- mode: makefile -*-
|
||||
|
||||
####################################
|
||||
# Everything below here is generic #
|
||||
####################################
|
||||
|
||||
if GTK_DOC_USE_LIBTOOL
|
||||
GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
|
||||
else
|
||||
GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
|
||||
endif
|
||||
|
||||
# We set GPATH here; this gives us semantics for GNU make
|
||||
# which are more like other make's VPATH, when it comes to
|
||||
# whether a source that is a target of one rule is then
|
||||
# searched for in VPATH/GPATH.
|
||||
#
|
||||
GPATH = $(srcdir)
|
||||
|
||||
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(content_files) \
|
||||
$(HTML_IMAGES) \
|
||||
$(DOC_MAIN_SGML_FILE) \
|
||||
$(DOC_MODULE)-sections.txt \
|
||||
$(DOC_MODULE)-overrides.txt
|
||||
|
||||
DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
|
||||
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
|
||||
|
||||
SCANOBJ_FILES = \
|
||||
$(DOC_MODULE).args \
|
||||
$(DOC_MODULE).hierarchy \
|
||||
$(DOC_MODULE).interfaces \
|
||||
$(DOC_MODULE).prerequisites \
|
||||
$(DOC_MODULE).signals
|
||||
|
||||
REPORT_FILES = \
|
||||
$(DOC_MODULE)-undocumented.txt \
|
||||
$(DOC_MODULE)-undeclared.txt \
|
||||
$(DOC_MODULE)-unused.txt
|
||||
|
||||
CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
|
||||
|
||||
if ENABLE_GTK_DOC
|
||||
all-local: html-build.stamp
|
||||
else
|
||||
all-local:
|
||||
endif
|
||||
|
||||
docs: html-build.stamp
|
||||
|
||||
#### scan ####
|
||||
|
||||
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
|
||||
@echo 'gtk-doc: Scanning header files'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
cd $(srcdir) && \
|
||||
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
|
||||
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
|
||||
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
|
||||
else \
|
||||
cd $(srcdir) ; \
|
||||
for i in $(SCANOBJ_FILES) ; do \
|
||||
test -f $$i || touch $$i ; \
|
||||
done \
|
||||
fi
|
||||
touch scan-build.stamp
|
||||
|
||||
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
|
||||
@true
|
||||
|
||||
#### templates ####
|
||||
|
||||
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
|
||||
@echo 'gtk-doc: Rebuilding template files'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
|
||||
touch tmpl-build.stamp
|
||||
|
||||
tmpl.stamp: tmpl-build.stamp
|
||||
@true
|
||||
|
||||
tmpl/*.sgml:
|
||||
@true
|
||||
|
||||
|
||||
#### xml ####
|
||||
|
||||
sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
|
||||
@echo 'gtk-doc: Building XML'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
cd $(srcdir) && \
|
||||
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
|
||||
touch sgml-build.stamp
|
||||
|
||||
sgml.stamp: sgml-build.stamp
|
||||
@true
|
||||
|
||||
#### html ####
|
||||
|
||||
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
|
||||
@echo 'gtk-doc: Building HTML'
|
||||
@-chmod -R u+w $(srcdir)
|
||||
rm -rf $(srcdir)/html
|
||||
mkdir $(srcdir)/html
|
||||
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
|
||||
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
|
||||
@echo 'gtk-doc: Fixing cross-references'
|
||||
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
|
||||
touch html-build.stamp
|
||||
|
||||
##############
|
||||
|
||||
clean-local:
|
||||
rm -f *~ *.bak
|
||||
rm -rf .libs
|
||||
|
||||
distclean-local:
|
||||
cd $(srcdir) && \
|
||||
rm -rf xml $(REPORT_FILES) \
|
||||
$(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
|
||||
|
||||
maintainer-clean-local: clean
|
||||
cd $(srcdir) && rm -rf xml html
|
||||
|
||||
install-data-local:
|
||||
-installfiles=`echo $(srcdir)/html/*`; \
|
||||
if test "$$installfiles" = '$(srcdir)/html/*'; \
|
||||
then echo '-- Nothing to install' ; \
|
||||
else \
|
||||
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
|
||||
for i in $$installfiles; do \
|
||||
echo '-- Installing '$$i ; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
|
||||
done; \
|
||||
echo '-- Installing $(srcdir)/html/index.sgml' ; \
|
||||
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
|
||||
which gtkdoc-rebase >/dev/null && \
|
||||
gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
|
||||
fi
|
||||
|
||||
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(TARGET_DIR)/*
|
||||
|
||||
#
|
||||
# Require gtk-doc when making dist
|
||||
#
|
||||
if ENABLE_GTK_DOC
|
||||
dist-check-gtkdoc:
|
||||
else
|
||||
dist-check-gtkdoc:
|
||||
@echo "*** gtk-doc must be installed and enabled in order to make dist"
|
||||
@false
|
||||
endif
|
||||
|
||||
dist-hook: dist-check-gtkdoc dist-hook-local
|
||||
mkdir $(distdir)/tmpl
|
||||
mkdir $(distdir)/xml
|
||||
mkdir $(distdir)/html
|
||||
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
|
||||
-cp $(srcdir)/xml/*.xml $(distdir)/xml
|
||||
cp $(srcdir)/html/* $(distdir)/html
|
||||
-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
|
||||
-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
|
||||
cd $(distdir) && rm -f $(DISTCLEANFILES)
|
||||
-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
|
||||
|
||||
.PHONY : dist-hook-local docs
|
||||
|
|
@ -3,15 +3,17 @@ HOMEPAGE = "http://www.webkitgtk.org/"
|
|||
BUGTRACKER = "http://bugs.webkit.org/"
|
||||
|
||||
LICENSE = "BSD & LGPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
|
||||
file://WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
|
||||
file://JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
|
||||
|
||||
DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3"
|
||||
DEPENDS = "enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3"
|
||||
DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native sqlite3"
|
||||
|
||||
SRCREV_FORMAT = "webcore-rwebkit"
|
||||
|
||||
# Yes, this is wrong...
|
||||
PV = "0.1+svnr${SRCREV}"
|
||||
PR = "r7"
|
||||
PV = "1.3.2+svnr${SRCREV}"
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "\
|
||||
svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
|
||||
|
|
@ -20,16 +22,18 @@ SRC_URI = "\
|
|||
svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
|
||||
svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
|
||||
svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
|
||||
svn://svn.webkit.org/repository/webkit/trunk/;module=autotools;proto=http \
|
||||
file://Makefile \
|
||||
file://Makefile.shared \
|
||||
file://autogen.sh \
|
||||
file://configure.ac \
|
||||
file://GNUmakefile.am \
|
||||
file://gtk-doc.make \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
inherit autotools lib_package pkgconfig
|
||||
|
||||
EXTRA_OECONF = "\
|
||||
--enable-debug=no \
|
||||
|
|
@ -38,6 +42,8 @@ EXTRA_OECONF = "\
|
|||
--disable-fast-malloc \
|
||||
"
|
||||
|
||||
EXTRA_AUTORECONF = " -I autotools "
|
||||
|
||||
do_compile_prepend() {
|
||||
mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
|
||||
mkdir -p ${S}/Programs/
|
||||
|
|
@ -54,10 +60,12 @@ do_compile_prepend() {
|
|||
cd ${S}
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}launcher-dbg ${PN}launcher libjavascriptcore"
|
||||
PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
|
||||
FILES_${PN}launcher = "${bindir}/GtkLauncher"
|
||||
FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
|
||||
FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*"
|
||||
FILES_${PN}-webinspector = "${datadir}/webkit-1.0/webinspector/"
|
||||
FILES_${PN} += "${datadir}/webkit-1.0/resources/error.html ${datadir}/webkit-1.0/images"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue