webkit-gtk: remove svn recipe
(From OE-Core rev: ecb18e2b6a8fc16b323f93c62ed5ff5b080c5dd0) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
c9f855e040
commit
7765ad4d69
|
@ -1,280 +0,0 @@
|
|||
# Top-level Makefile rule for automake
|
||||
#
|
||||
# Variable conventions:
|
||||
#
|
||||
# _h_api = API headers that will be installed and included in the distribution
|
||||
# _cppflags = flags that will be passed to the C/CXX Preprocessor
|
||||
# _sources = sources that will be compiled and included in the distribution
|
||||
# _built_sources = files that will be autogenerated by the build system and
|
||||
# will be part of the _SOURCES primary
|
||||
# _built_nosources = files that are autogenerated but are not part of the
|
||||
# _SOURCES primary
|
||||
# _cleanfiles = files that will be removed by the clean target
|
||||
#
|
||||
# Sources, headers, flags, etc... should be added to the respective variables
|
||||
# with the above suffix, e.g, webcore-specific sources should go to
|
||||
# webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources,
|
||||
# etc... The only exceptions are the global variables. See Global Variables
|
||||
# below.
|
||||
|
||||
# Global Variables Reference
|
||||
# global_cppflags = CPPFLAGS that apply to all C/C++ files that are built for any project.
|
||||
# global_cflags = CFLAGS that apply to all C files that are built for any project.
|
||||
# global_cxxflags = CXXFLAGS that apply to all C++ files that are bult for any project.
|
||||
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
DISTCHECK_CONFIGURE_FLAGS = \
|
||||
--enable-introspection \
|
||||
--enable-gtk-doc \
|
||||
--enable-webkit2
|
||||
|
||||
# Directory for autogenerated sources
|
||||
GENSOURCES := $(top_builddir)/DerivedSources
|
||||
GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore
|
||||
GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
|
||||
GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
|
||||
GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2
|
||||
GENPROGRAMS := $(top_builddir)/Programs
|
||||
GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
|
||||
WebCore := $(srcdir)/Source/WebCore
|
||||
WebKit := $(srcdir)/Source/WebKit/gtk
|
||||
WebKit2 := $(srcdir)/Source/WebKit2
|
||||
pkgconfigdir := $(libdir)/pkgconfig
|
||||
libwebkitgtkincludedir := $(prefix)/include/webkitgtk-@WEBKITGTK_API_VERSION@
|
||||
|
||||
# Libraries and support components
|
||||
bin_PROGRAMS :=
|
||||
noinst_PROGRAMS :=
|
||||
libexec_PROGRAMS :=
|
||||
noinst_HEADERS :=
|
||||
noinst_LTLIBRARIES :=
|
||||
lib_LTLIBRARIES :=
|
||||
IDL_BINDINGS :=
|
||||
TEST_PROGS :=
|
||||
POFILES :=
|
||||
MOFILES :=
|
||||
javascriptcore_h_api :=
|
||||
javascriptcore_cppflags:=
|
||||
javascriptcore_cflags :=
|
||||
javascriptcore_sources :=
|
||||
javascriptcore_built_sources :=
|
||||
javascriptcore_built_nosources :=
|
||||
webcore_cppflags :=
|
||||
webcore_sources :=
|
||||
webcore_libadd :=
|
||||
webcore_built_sources :=
|
||||
webcore_built_nosources :=
|
||||
webcoregtk_sources :=
|
||||
webcoregtk_cppflags :=
|
||||
webkitgtk_built_h_api :=
|
||||
webkitgtk_static_h_api :=
|
||||
webkitgtk_h_api :=
|
||||
webkitgtk_sources :=
|
||||
webkitgtk_cppflags :=
|
||||
webkitgtk_gdom_built_sources :=
|
||||
webkitgtk_built_sources :=
|
||||
webkitgtk_built_nosources :=
|
||||
webkit2_built_sources :=
|
||||
webkit2_plugin_process_built_sources :=
|
||||
webkittestrunner_built_sources :=
|
||||
libwebcoreinternals_built_sources :=
|
||||
global_cppflags :=
|
||||
global_cflags :=
|
||||
global_cxxflags :=
|
||||
JSCORE_GIRSOURCES :=
|
||||
WEBKIT_GIRSOURCES :=
|
||||
FEATURE_DEFINES :=
|
||||
typelibsdir :=
|
||||
typelibs_DATA :=
|
||||
EXTRA_DIST :=
|
||||
BUILT_SOURCES :=
|
||||
CLEANFILES :=
|
||||
DOMAIN :=
|
||||
DISTCLEANFILES :=
|
||||
MAINTAINERCLEANFILES :=
|
||||
pkgconfig_DATA :=
|
||||
|
||||
# We do not care at all about this implicit built-in make rules,
|
||||
# disable them to save some build time
|
||||
%: %.c
|
||||
%: %.cpp
|
||||
%: %.o
|
||||
(%): %
|
||||
%.out: %
|
||||
%.c: %.w %.ch
|
||||
%.tex: %.w %.ch
|
||||
%:: %,v
|
||||
%:: RCS/%,v
|
||||
%:: RCS/%
|
||||
%:: s.%
|
||||
%:: SCCS/s.%
|
||||
|
||||
global_cppflags += \
|
||||
-Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
|
||||
-Wformat -Wformat-security -Wno-format-y2k -Wundef \
|
||||
-Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
|
||||
-Wno-unused-parameter -Wno-parentheses \
|
||||
-fno-exceptions -DENABLE_GLIB_SUPPORT=1
|
||||
|
||||
|
||||
global_cxxflags += \
|
||||
-fno-rtti
|
||||
|
||||
# -no-undefined required for building DLLs on Windows
|
||||
# It breaks the build on other platforms, so we use it conditionally
|
||||
if OS_WIN32
|
||||
no_undefined = -no-undefined
|
||||
version_script = -export-symbols-regex "^(webkit_|k?JS).*"
|
||||
endif
|
||||
|
||||
if OS_GNU
|
||||
version_script = -Wl,--version-script,$(srcdir)/Source/autotools/symbols.filter
|
||||
endif
|
||||
|
||||
# Extra checks and flags
|
||||
global_cppflags += \
|
||||
-DBUILDING_CAIRO__=1 \
|
||||
-DBUILDING_GTK__=1 \
|
||||
-DWTF_CHANGES
|
||||
|
||||
# For the Gtk port we want to use XP_UNIX both in X11 and Mac
|
||||
if !TARGET_WIN32
|
||||
global_cppflags += \
|
||||
-DXP_UNIX
|
||||
endif
|
||||
|
||||
if USE_ICU_UNICODE
|
||||
global_cppflags += \
|
||||
-DWTF_USE_ICU_UNICODE=1
|
||||
endif
|
||||
|
||||
if USE_GLIB_UNICODE
|
||||
global_cppflags += \
|
||||
-DWTF_USE_GLIB_UNICODE=1
|
||||
endif
|
||||
|
||||
if !ENABLE_FAST_MALLOC
|
||||
global_cppflags += \
|
||||
-DUSE_SYSTEM_MALLOC
|
||||
endif
|
||||
|
||||
if USE_GSTREAMER
|
||||
global_cppflags += \
|
||||
-DWTF_USE_GSTREAMER=1
|
||||
endif
|
||||
|
||||
# ----
|
||||
# GTK+ 2.x/3.x support
|
||||
# ----
|
||||
if GTK_API_VERSION_2
|
||||
global_cppflags += \
|
||||
-DGTK_API_VERSION_2=1
|
||||
endif
|
||||
|
||||
if !ENABLE_DEBUG
|
||||
global_cppflags += -DNDEBUG
|
||||
else
|
||||
global_cppflags += \
|
||||
-DG_DISABLE_DEPRECATED \
|
||||
-DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||
-DGDK_DISABLE_DEPRECATED \
|
||||
-DGTK_DISABLE_DEPRECATED \
|
||||
-DPANGO_DISABLE_DEPRECATED
|
||||
# Might be useful in the future
|
||||
# -DGDK_MULTIHEAD_SAFE \
|
||||
# -DGTK_MULTIHEAD_SAFE
|
||||
endif
|
||||
|
||||
if ENABLE_COVERAGE
|
||||
global_cppflags += \
|
||||
-DGCC_GENERATE_TEST_COVERAGE_FILES \
|
||||
-DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS
|
||||
endif
|
||||
|
||||
EXTRA_DIST += \
|
||||
$(srcdir)/Source/autotools/symbols.filter \
|
||||
$(srcdir)/Source/WebKit/LICENSE
|
||||
|
||||
# Include module makefiles
|
||||
if USE_JSC
|
||||
include Source/JavaScriptCore/GNUmakefile.am
|
||||
endif
|
||||
|
||||
include Source/WebCore/GNUmakefile.am
|
||||
include Source/WebKit/gtk/GNUmakefile.am
|
||||
include Source/WebCore/bindings/gobject/GNUmakefile.am
|
||||
include Tools/GNUmakefile.am
|
||||
include Source/WebKit/gtk/po/GNUmakefile.am
|
||||
include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
|
||||
|
||||
if ENABLE_WEBKIT2
|
||||
include Source/WebKit2/GNUmakefile.am
|
||||
include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
|
||||
include Tools/MiniBrowser/gtk/GNUmakefile.am
|
||||
include Tools/WebKitTestRunner/GNUmakefile.am
|
||||
# [GTK] Refactor the translations now that we have webkit2
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=55153
|
||||
endif
|
||||
|
||||
# Autogenerated sources
|
||||
BUILT_SOURCES += \
|
||||
$(webcore_built_sources) \
|
||||
$(webcore_built_nosources) \
|
||||
$(webkitgtk_built_sources) \
|
||||
$(webkitgtk_built_nosources)
|
||||
|
||||
if USE_JSC
|
||||
BUILT_SOURCES += \
|
||||
$(javascriptcore_built_sources) \
|
||||
$(javascriptcore_built_nosources)
|
||||
endif
|
||||
|
||||
DISTCLEANFILES += \
|
||||
$(CLEANFILES) \
|
||||
$(builddir)/doltcompile \
|
||||
$(builddir)/doltlibtool
|
||||
|
||||
MAINTAINERCLEANFILES += \
|
||||
$(CLEANFILES) \
|
||||
$(builddir)/doltcompile \
|
||||
$(builddir)/doltlibtool \
|
||||
$(srcdir)/aconfig.h.in \
|
||||
$(srcdir)/Source/autotools/config.* \
|
||||
$(srcdir)/Source/autotools/compile \
|
||||
$(srcdir)/Source/autotools/depcomp \
|
||||
$(srcdir)/Source/autotools/install-sh \
|
||||
$(srcdir)/Source/autotools/missing \
|
||||
$(srcdir)/configure \
|
||||
$(srcdir)/GNUmakefile.in \
|
||||
$(srcdir)/INSTALL \
|
||||
$(srcdir)/README \
|
||||
$(top_builddir)/config.*
|
||||
|
||||
# Older automake versions (1.7) place Plo files in a different place so we need
|
||||
# to create the output directory manually.
|
||||
all-local: stamp-po
|
||||
$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
|
||||
|
||||
# remove built sources and program directories
|
||||
clean-local:
|
||||
-rm -rf $(GENPROGRAMS)
|
||||
|
||||
maintainer-clean-local: distclean-local
|
||||
distclean-local:
|
||||
-rm -rf $(GENSOURCES) $(GENPROGRAMS)
|
||||
|
||||
dist-hook: doc-dist-hook
|
||||
doc-dist-hook: docs-build.stamp
|
||||
cp $(WebKit)/NEWS $(distdir)
|
||||
@mkdir -p $(distdir)/Documentation/webkitgtk/html
|
||||
@mkdir -p $(distdir)/Documentation/webkitgtk/tmpl
|
||||
@-cp ./Documentation/webkitgtk/tmpl/*.sgml $(distdir)/Documentation/webkitgtk/tmpl
|
||||
@cp ./Documentation/webkitgtk/html/* $(distdir)/Documentation/webkitgtk/html
|
||||
if ENABLE_WEBKIT2
|
||||
@mkdir -p $(distdir)/Documentation/webkit2gtk/html
|
||||
@mkdir -p $(distdir)/Documentation/webkit2gtk/tmpl
|
||||
@-cp ./Documentation/webkit2gtk/tmpl/*.sgml $(distdir)/Documentation/webkit2gtk/tmpl
|
||||
@cp ./Documentation/webkit2gtk/html/* $(distdir)/Documentation/webkit2gtk/html
|
||||
endif
|
|
@ -1,17 +0,0 @@
|
|||
MODULES = Source/JavaScriptCore Source/JavaScriptGlue Source/ThirdParty/ANGLE Source/WebCore Source/WebKit Source/WebKit2 Tools
|
||||
|
||||
all:
|
||||
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
|
||||
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
|
||||
|
||||
debug d development dev develop:
|
||||
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
|
||||
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
|
||||
|
||||
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
|
||||
|
||||
clean:
|
||||
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
|
||||
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
|
|
@ -1,18 +0,0 @@
|
|||
SCRIPTS_PATH ?= ../Tools/Scripts
|
||||
XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
|
||||
|
||||
all:
|
||||
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
|
||||
|
||||
debug d development dev develop: force
|
||||
$(SCRIPTS_PATH)/set-webkit-configuration --debug
|
||||
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
|
||||
|
||||
release r deployment dep deploy: force
|
||||
$(SCRIPTS_PATH)/set-webkit-configuration --release
|
||||
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
|
||||
|
||||
clean:
|
||||
( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
|
||||
|
||||
force: ;
|
|
@ -1,107 +0,0 @@
|
|||
# Include file to make it easy to include WebKit into Qt projects
|
||||
|
||||
|
||||
isEmpty(OUTPUT_DIR) {
|
||||
CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
|
||||
CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
|
||||
}
|
||||
|
||||
!gtk-port:CONFIG += qt-port
|
||||
qt-port:DEFINES += BUILDING_QT__=1
|
||||
qt-port:!building-libs {
|
||||
QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
|
||||
LIBS += -lQtWebKit
|
||||
DEPENDPATH += $$PWD/WebKit/qt/Api
|
||||
}
|
||||
|
||||
gtk-port:!building-libs {
|
||||
QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
|
||||
LIBS += -lWebKitGtk
|
||||
DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit
|
||||
}
|
||||
|
||||
gtk-port {
|
||||
CONFIG += link_pkgconfig
|
||||
|
||||
DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1
|
||||
|
||||
# We use FreeType directly with Cairo
|
||||
PKGCONFIG += cairo-ft
|
||||
|
||||
directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0
|
||||
else: PKGCONFIG += cairo gtk+-2.0
|
||||
|
||||
# Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb)
|
||||
CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG)
|
||||
|
||||
# We use the curl http backend on all platforms
|
||||
PKGCONFIG += libcurl
|
||||
DEFINES += WTF_USE_CURL=1
|
||||
|
||||
LIBS += -lWebKitGtk -ljpeg -lpng
|
||||
|
||||
QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
|
||||
QMAKE_LIBS += $$system(icu-config --ldflags)
|
||||
|
||||
# This set of warnings is borrowed from the Mac build
|
||||
QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef
|
||||
|
||||
# These flags are based on optimization experience from the Mac port:
|
||||
# Helps code size significantly and speed a little
|
||||
QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
|
||||
|
||||
DEPENDPATH += $$PWD/JavaScriptCore/API
|
||||
INCLUDEPATH += $$PWD
|
||||
}
|
||||
|
||||
DEFINES += USE_SYSTEM_MALLOC
|
||||
CONFIG(release) {
|
||||
DEFINES += NDEBUG
|
||||
}
|
||||
|
||||
gtk-port:CONFIG(debug) {
|
||||
DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED
|
||||
# maybe useful for debugging DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE
|
||||
}
|
||||
|
||||
BASE_DIR = $$PWD
|
||||
qt-port:INCLUDEPATH += \
|
||||
$$PWD/WebKit/qt/Api
|
||||
gtk-port:INCLUDEPATH += \
|
||||
$$BASE_DIR/WebCore/platform/gtk \
|
||||
$$BASE_DIR/WebCore/platform/network/curl \
|
||||
$$BASE_DIR/WebCore/platform/graphics/cairo \
|
||||
$$BASE_DIR/WebCore/loader/gtk \
|
||||
$$BASE_DIR/WebCore/page/gtk \
|
||||
$$BASE_DIR/WebKit/gtk \
|
||||
$$BASE_DIR/WebKit/gtk/WebCoreSupport \
|
||||
$$BASE_DIR/WebKit/gtk/webkit
|
||||
INCLUDEPATH += \
|
||||
$$BASE_DIR/JavaScriptCore/ \
|
||||
$$BASE_DIR/JavaScriptCore/kjs \
|
||||
$$BASE_DIR/JavaScriptCore/bindings \
|
||||
$$BASE_DIR/JavaScriptCore/bindings/c \
|
||||
$$BASE_DIR/JavaScriptCore/wtf \
|
||||
$$BASE_DIR/JavaScriptCore/ForwardingHeaders \
|
||||
$$BASE_DIR/WebCore \
|
||||
$$BASE_DIR/WebCore/ForwardingHeaders \
|
||||
$$BASE_DIR/WebCore/platform \
|
||||
$$BASE_DIR/WebCore/platform/network \
|
||||
$$BASE_DIR/WebCore/platform/graphics \
|
||||
$$BASE_DIR/WebCore/loader \
|
||||
$$BASE_DIR/WebCore/page \
|
||||
$$BASE_DIR/WebCore/css \
|
||||
$$BASE_DIR/WebCore/dom \
|
||||
$$BASE_DIR/WebCore/bridge \
|
||||
$$BASE_DIR/WebCore/editing \
|
||||
$$BASE_DIR/WebCore/rendering \
|
||||
$$BASE_DIR/WebCore/history \
|
||||
$$BASE_DIR/WebCore/xml \
|
||||
$$BASE_DIR/WebCore/html \
|
||||
$$BASE_DIR/WebCore/plugins
|
||||
|
||||
|
||||
macx {
|
||||
INCLUDEPATH += /usr/include/libxml2
|
||||
LIBS += -lxml2 -lxslt
|
||||
}
|
|
@ -1,21 +0,0 @@
|
|||
TEMPLATE = subdirs
|
||||
CONFIG += ordered
|
||||
!gtk-port:CONFIG += qt-port
|
||||
qt-port {
|
||||
lessThan(QT_MINOR_VERSION, 4) {
|
||||
!win32-*:SUBDIRS += WebKit/qt/Plugins
|
||||
}
|
||||
}
|
||||
SUBDIRS += \
|
||||
WebCore \
|
||||
JavaScriptCore/kjs/testkjs.pro
|
||||
|
||||
qt-port {
|
||||
SUBDIRS += WebKit/qt/QtLauncher
|
||||
|
||||
!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
|
||||
}
|
||||
|
||||
gtk-port:SUBDIRS += \
|
||||
WebKitTools/GtkLauncher \
|
||||
WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro
|
|
@ -1,23 +0,0 @@
|
|||
#! /bin/sh
|
||||
|
||||
# Allow invocation from a separate build directory; in that case, we change
|
||||
# to the source directory to run the auto*, then change back before running configure
|
||||
srcdir=`dirname $0`
|
||||
test -z "$srcdir" && srcdir=.
|
||||
|
||||
ORIGDIR=`pwd`
|
||||
cd $srcdir
|
||||
|
||||
rm -f $top_srcdir/autom4te.cache
|
||||
|
||||
touch README INSTALL
|
||||
|
||||
if test -z `which autoreconf`; then
|
||||
echo "Error: autoreconf not found, please install it."
|
||||
exit 1
|
||||
fi
|
||||
autoreconf --verbose --install -I Source/autotools $ACLOCAL_FLAGS|| exit $?
|
||||
|
||||
cd $ORIGDIR || exit 1
|
||||
|
||||
$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
|
File diff suppressed because it is too large
Load Diff
|
@ -1,21 +0,0 @@
|
|||
we need to include unistd.h on all linux platforms therefore
|
||||
extend the conditional inclusion accordingly
|
||||
|
||||
This gets proper declation of sleep() into the source file
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
Index: webkit-gtk-1.7.2+svnr101488-r3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
|
||||
===================================================================
|
||||
--- webkit-gtk-1.7.2+svnr101488-r3.orig/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-30 12:11:04.912613223 -0700
|
||||
+++ webkit-gtk-1.7.2+svnr101488-r3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-30 12:14:21.840622752 -0700
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
-#if defined(ANDROID)
|
||||
+#if defined(__linux__)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
|
@ -1,173 +0,0 @@
|
|||
# -*- 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
|
|
@ -1,8 +0,0 @@
|
|||
#!/bin/sh
|
||||
# usage: sh update-webkit.sh <revision>
|
||||
|
||||
export rev=$1
|
||||
|
||||
for i in autogen.sh configure.ac GNUmakefile.am Makefile Makefile.shared ; do
|
||||
wget "http://trac.webkit.org/browser/trunk/$i?rev=$rev&format=raw" -O $i
|
||||
done
|
|
@ -1,107 +0,0 @@
|
|||
DESCRIPTION = "WebKitGTK+ is the port of the portable web rendering engine WebKitK to the GTK+ platform."
|
||||
HOMEPAGE = "http://www.webkitgtk.org/"
|
||||
BUGTRACKER = "http://bugs.webkit.org/"
|
||||
|
||||
LICENSE = "BSD & LGPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
|
||||
file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
|
||||
file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
|
||||
|
||||
# Choice of language backends - icu has issues on Big Endian machines so use pango
|
||||
ICU_LIB = "icu"
|
||||
ICU_LIB_powerpc = "pango"
|
||||
|
||||
DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
|
||||
gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}"
|
||||
DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
|
||||
|
||||
SRCREV_FORMAT = "source"
|
||||
|
||||
SRCREV = "101488"
|
||||
PV = "1.7.2+svnr${SRCPV}"
|
||||
PR = "r6"
|
||||
|
||||
SRC_URI = "\
|
||||
svn://svn.webkit.org/repository/webkit/trunk/;module=Source;protocol=http;name=source \
|
||||
svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http \
|
||||
svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http \
|
||||
file://Makefile \
|
||||
file://Makefile.shared \
|
||||
file://autogen.sh \
|
||||
file://configure.ac \
|
||||
file://GNUmakefile.am \
|
||||
file://gtk-doc.make \
|
||||
file://nodolt.patch \
|
||||
file://function-scope.patch \
|
||||
file://webgit-gtk_fix_build_with_automake_1.12.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/"
|
||||
|
||||
inherit autotools lib_package pkgconfig
|
||||
|
||||
EXTRA_OECONF = "\
|
||||
--enable-debug=no \
|
||||
--enable-svg \
|
||||
--enable-icon-database=yes \
|
||||
--enable-fullscreen-api \
|
||||
--enable-image-resizer \
|
||||
--enable-link-prefetch \
|
||||
--with-gtk=2.0 \
|
||||
${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
|
||||
UNICODE_CFLAGS=-D_REENTRANT \
|
||||
"
|
||||
|
||||
#default unicode backend icu breaks in cross-compile when target and host are different endian type
|
||||
EXTRA_OECONF_append_powerpc += "--with-unicode-backend=glib"
|
||||
|
||||
CPPFLAGS_append_powerpc += "-I${STAGING_INCDIR}/pango-1.0 \
|
||||
-I${STAGING_LIBDIR}/glib-2.0/include \
|
||||
-I${STAGING_INCDIR}/glib-2.0"
|
||||
|
||||
EXTRA_AUTORECONF = " -I Source/autotools "
|
||||
|
||||
|
||||
#| ./Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes<T>::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes<T>::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]':
|
||||
#| ./Source/JavaScriptCore/heap/Handle.h:141:79: instantiated from 'JSC::Handle<T>::ExternalType JSC::Handle<T>::get() const [with T = JSC::Structure, JSC::Handle<T>::ExternalType = JSC::Structure*]'
|
||||
#| ./Source/JavaScriptCore/runtime/ScopeChain.h:39:75: instantiated from here
|
||||
#| ./Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes<JSC::Structure>::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align]
|
||||
#| {standard input}: Assembler messages:
|
||||
#| {standard input}:28873: Error: invalid immediate: 983040 is out of range
|
||||
#| {standard input}:28873: Error: value of 983040 too large for field of 2 bytes at 15110
|
||||
#| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819
|
||||
#| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as)
|
||||
#| Please submit a full bug report,
|
||||
#| with preprocessed source if appropriate.
|
||||
#| See <http://gcc.gnu.org/bugs.html> for instructions.
|
||||
#| make[1]: *** [Source/JavaScriptCore/jit/libjavascriptcoregtk_1_0_la-JIT.lo] Error 1
|
||||
#| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0'
|
||||
ARM_INSTRUCTION_SET = "arm"
|
||||
|
||||
CONFIGUREOPT_DEPTRACK = ""
|
||||
|
||||
do_configure_append() {
|
||||
# somethings wrong with icu, fix it up manually
|
||||
for makefile in $(find ${S} -name "GNUmakefile") ; do
|
||||
sed -i s:-I/usr/include::g $makefile
|
||||
done
|
||||
}
|
||||
|
||||
do_install_prepend() {
|
||||
cp ${S}/Programs/.libs/jsc ${S}/Programs/jsc-1 || true
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
rmdir ${D}${libexecdir}
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
|
||||
FILES_${PN}launcher = "${bindir}/GtkLauncher"
|
||||
FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
|
||||
FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*"
|
||||
FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/"
|
||||
FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \
|
||||
${datadir}/webkitgtk-*/images \
|
||||
${datadir}/glib-2.0/schemas"
|
||||
|
||||
|
Loading…
Reference in New Issue