Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update to a new webkit version

Old source snapshot had link-time problems and I couldn't
backport fixes for that.
  • Loading branch information...
commit a4409fdedaa4316b024e461d578e84a17407b1d0 1 parent 1092e29
@tea tea authored
View
8 external/build_externals_linux.sh
@@ -5,6 +5,7 @@ if [ x"variant" == x"release" ] ; then
echo "Building release binaries"
output=`pwd`/out.release
cfg_switches=--disable-debug
+ webkit_output="Release.linux"
tinyxml_switches="DEBUG=YES"
CPPFLAGS="-O2"
LDFLAGS="-g"
@@ -12,6 +13,7 @@ elif [ x"$variant" == x"debug" ] ; then
echo "Building debug binaries"
output=`pwd`/out.debug
tinyxml_switches=
+ webkit_output="Debug.linux"
cfg_switches=--enable-debug
CPPFLAGS="-O0 -g"
LDFLAGS="-g"
@@ -98,10 +100,10 @@ popd
# wxwebkit
pushd webkit
-make clean
PATH="$output/bin:${PATH}" ./WebKitTools/Scripts/build-webkit --wx --wx-args=wxgc,ENABLE_OFFLINE_WEB_APPLICATIONS=0,ENABLE_DOM_STORAGE=1,ENABLE_DATABASE=0,ENABLE_ICONDATABASE=0,ENABLE_XPATH=1,ENABLE_XSLT=1,ENABLE_VIDEO=0,ENABLE_SVG=0,ENABLE_COVERAGE=0,ENABLE_WML=0,ENABLE_WORKERS=0 &&
- mv ./WebKitBuild/Release/*.a $output/lib &&
- cp ./WebKit/wx/*.h $output/include/wx-2.8/wx ||
+ mv ./WebKitBuild/$webkit_output/*.a $output/lib &&
+ cp ./WebKit/wx/*.h $output/include/wx-2.8/wx &&
+ strip -g $output/lib/libwxwebkit.a ||
( echo "Cannot compile WebKit" ; exit 1 )
popd
View
11 external/get_externals_linux.sh
@@ -22,7 +22,7 @@ _download()
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.9.tar.gz \
http://kent.dl.sourceforge.net/sourceforge/tinyxml/tinyxml_2_5_3.tar.gz \
http://biolpc22.york.ac.uk/pub/2.8.10/wxWidgets-2.8.10.tar.bz2 \
- http://builds.nightly.webkit.org/files/trunk/src/WebKit-r43163.tar.bz2 \
+ http://builds.nightly.webkit.org/files/trunk/src/WebKit-r68833.tar.bz2 \
http://downloads.sourceforge.net/project/boost/boost/1.44.0/boost_1_44_0.tar.gz
do
if [[ ! -e `basename $url` ]]; then
@@ -82,13 +82,10 @@ _extract_and_patch()
echo "---- Applying wxwidget patches ----"
patch -Np1 -d wxwidgets < patches/wxWidgets-gsock.patch
echo "---- Applying webkit patches ----"
- patch -Np1 -d webkit < patches/webkit/remove-targets.patch
+ patch -Np1 -d webkit < patches/webkit/webkit_688833_to_git_trunk.diff
patch -Np1 -d webkit < patches/webkit/fully-static.patch
- patch -Np0 -d webkit < patches/webkit/vis_hidden.patch
- patch -Np1 -d webkit < patches/webkit/cancelledError.patch
- patch -Np1 -d webkit < patches/webkit/local_sec.patch
- patch -Np1 -d webkit < patches/webkit/icu-fix-56345.diff
- patch -Np1 -d webkit < patches/webkit/wxtimerfix-gcc-4.5.diff
+ patch -Np1 -d webkit < patches/webkit/fix_warning.patch
+ patch -Np1 -d webkit < patches/webkit/fix_wxwidgets_clash.diff
}
_next_steps()
View
15 external/patches/webkit/cancelledError.patch
@@ -1,15 +0,0 @@
---- WebKit/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp 2009-05-02 17:17:33.000000000 +0400
-+++ webkit/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp 2009-05-02 17:59:52.000000000 +0400
-@@ -559,10 +559,9 @@ void FrameLoaderClientWx::committedLoad(
- fl->addData(data, length);
- }
-
--WebCore::ResourceError FrameLoaderClientWx::cancelledError(const WebCore::ResourceRequest&)
-+WebCore::ResourceError FrameLoaderClientWx::cancelledError(const WebCore::ResourceRequest& request)
- {
-- notImplemented();
-- return ResourceError();
-+ return ResourceError("Error", -999, request.url().string(), "Load request cancelled");
- }
-
- WebCore::ResourceError FrameLoaderClientWx::blockedError(const ResourceRequest&)
View
14 external/patches/webkit/fix_warning.patch
@@ -0,0 +1,14 @@
+--- WebKit-r68833/WebKit/wx/WebView.h 2010-08-29 14:09:58.000000000 +0400
++++ webkit/WebKit/wx/WebView.h 2010-10-23 22:55:26.783000071 +0400
+@@ -60,9 +60,9 @@ class WXDLLIMPEXP_WEBKIT wxWebViewCacheP
+ {
+ public:
+ wxWebViewCachePolicy(unsigned minDead = 0, unsigned maxDead = defaultCacheCapacity, unsigned totalCapacity = defaultCacheCapacity)
+- : m_minDeadCapacity(minDead)
++ : m_capacity(totalCapacity)
++ , m_minDeadCapacity(minDead)
+ , m_maxDeadCapacity(maxDead)
+- , m_capacity(totalCapacity)
+ {}
+
+ ~wxWebViewCachePolicy() {}
View
20 external/patches/webkit/fix_wxwidgets_clash.diff
@@ -0,0 +1,20 @@
+--- ./webkit/WebCore/platform/wx/wxcode/gtk/scrollbar_render.cpp.orig 2010-10-24 01:49:03.999000077 +0400
++++ ./webkit/WebCore/platform/wx/wxcode/gtk/scrollbar_render.cpp 2010-10-24 01:49:20.773000078 +0400
+@@ -73,7 +73,7 @@ GtkWidget* GetButtonWidget()
+ }
+
+
+-GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
++GdkWindow* wxWebKitGetGdkWindowForDC(wxWindow* win, wxDC& dc)
+ {
+ GdkWindow* gdk_window = NULL;
+ #if wxCHECK_VERSION(2, 9, 0)
+@@ -134,7 +134,7 @@ void wxRenderer_DrawScrollbar(wxWindow*
+ renderer.DrawPushButton(window, dc, wxRect(x,y,buttonLength,buttonLength), wxStyleForPart(wxSCROLLPART_BACKBTNSTART, focusPart, hoverPart, flags));
+
+ GtkWidget* button = GetButtonWidget();
+- GdkWindow* gdk_window = wxGetGdkWindowForDC(window, dc);
++ GdkWindow* gdk_window = wxWebKitGetGdkWindowForDC(window, dc);
+
+ GtkArrowType arrowType = GTK_ARROW_UP;
+ if (horiz)
View
133 external/patches/webkit/fully-static.patch
@@ -1,88 +1,51 @@
-diff -Naurp WebKit-r43110/WebKit/wx/wxwebkit.bkl webkit/WebKit/wx/wxwebkit.bkl
---- WebKit-r43110/WebKit/wx/wxwebkit.bkl 2009-05-01 08:15:10.000000000 +0400
-+++ webkit/WebKit/wx/wxwebkit.bkl 2009-05-02 12:40:46.000000000 +0400
-@@ -34,7 +34,7 @@ This file builds the wxWebKit library.
- <makefile>
- <include file="wxwk-settings.bkl"/>
-
-- <dll id="wxwebkit-dynamic" template="wxwk,jscore,webcore,xml2,iconv,xslt,icu,curl,sqlite3,gtk,pthreads">
-+ <lib id="wxwebkit-static" template="wxwk,jscore,webcore,xml2,iconv,xslt,icu,curl,sqlite3,gtk,pthreads">
- <!-- make sure we relink wxwebkit if either webcore or jscore change -->
- <if cond="FORMAT=='gnu'">
- <depends-on-file>$(WKOUTPUTDIR)/libjscore.a</depends-on-file>
-@@ -44,8 +44,6 @@ This file builds the wxWebKit library.
- <depends-on-file>$(WKOUTPUTDIR)/jscore.lib</depends-on-file>
- <depends-on-file>$(WKOUTPUTDIR)/webcore-wx.lib</depends-on-file>
- </if>
-- <runtime-libs>dynamic</runtime-libs>
-- <dllname>wxwebkit</dllname>
- <libname>wxwebkit</libname>
-
- <include>$(WK_ROOT)/WebCore/platform/graphics/wx</include>
-@@ -59,13 +57,6 @@ This file builds the wxWebKit library.
- <sys-lib>webcore-wx</sys-lib>
- <sys-lib>jscore</sys-lib>
-
-- <if cond="FORMAT in ['msvc','msvs2005prj']">
-- <sys-lib>winmm</sys-lib> <!-- for timeGetTime -->
-- <sys-lib>gdiplus</sys-lib>
-- <sys-lib>libpng</sys-lib>
-- <sys-lib>libjpeg</sys-lib>
-- </if>
--
- <sources>
- WebKitSupport/ChromeClientWx.cpp
- WebKitSupport/ContextMenuClientWx.cpp
-@@ -78,6 +69,6 @@ This file builds the wxWebKit library.
- WebView.cpp
- WebBrowserShell.cpp
- </sources>
-- </dll>
-+ </lib>
-
- </makefile>
-diff -Naurp WebKit-r43110/WebKit/wx/wxwk-settings.bkl webkit/WebKit/wx/wxwk-settings.bkl
---- WebKit-r43110/WebKit/wx/wxwk-settings.bkl 2009-04-30 04:34:15.000000000 +0400
-+++ webkit/WebKit/wx/wxwk-settings.bkl 2009-05-02 12:40:46.000000000 +0400
-@@ -31,7 +31,7 @@ JavaScriptCore Bakefile project file.
-
- <makefile>
- <set var="WX_UNICODE">1</set>
-- <set var="WX_SHARED">1</set>
-+ <set var="WX_SHARED">0</set>
+--- WebKit-r68833/WebKit/wx/wscript 2010-07-29 04:31:09.000000000 +0400
++++ webkit/WebKit/wx/wscript 2010-10-23 20:47:42.779000070 +0400
+@@ -98,7 +98,7 @@ def build(bld):
+ bld.env.LIBDIR = output_dir
- <include file="presets/wx.bkl"/>
- <include file="presets/wxwebkit.bkl"/>
-@@ -99,8 +99,6 @@ JavaScriptCore Bakefile project file.
- </if>
- </set>
- <sys-lib>$(WEBCORE_LIBS)</sys-lib>
-- <wx-lib>core</wx-lib>
-- <wx-lib>base</wx-lib>
- <if cond="PLATFORM_WIN32=='1'">
- <define>WXUSINGDLL=1</define>
- </if>
-diff -Naurp WebKit-r43110/WebCore/webcore-base.bkl webkit/WebCore/webcore-base.bkl
---- WebKit-r43110/WebCore/webcore-base.bkl 2009-04-30 04:04:21.000000000 +0400
-+++ webkit/WebCore/webcore-base.bkl 2009-05-02 12:40:46.000000000 +0400
-@@ -60,7 +60,7 @@ wxWebCore port Bakefile project file.
- $(WEBCORE_SOURCES_JPEG)
- </set>
+ obj = bld.new_task_gen(
+- features = 'cxx cshlib implib',
++ features = 'cxx cstaticlib implib',
+ includes = ' '.join(include_paths + js_include_dirs),
+ target = 'wxwebkit',
+ defines = ['WXMAKINGDLL_WEBKIT'],
+--- WebKit-r68833/JavaScriptCore/wscript 2010-10-01 01:57:41.000000000 +0400
++++ webkit/JavaScriptCore/wscript 2010-10-23 21:59:07.018000070 +0400
+@@ -65,20 +65,4 @@ def build(bld):
-- <template id="webcore_base" template="xml2,iconv,xslt,icu,jscore,curl,sqlite3">
-+ <template id="webcore_base" template="jscore,xslt,xml2,sqlite3,iconv,icu,curl">
- <include>$(SRCDIR)</include>
- <include>$(SRCDIR)/bindings/js</include>
- <include>$(SRCDIR)/bridge</include>
-diff -Naurp WebKit-r43110/WebCore/webcore-wx.bkl webkit/WebCore/webcore-wx.bkl
---- WebKit-r43110/WebCore/webcore-wx.bkl 2009-04-30 04:34:15.000000000 +0400
-+++ webkit/WebCore/webcore-wx.bkl 2009-05-02 12:40:46.000000000 +0400
-@@ -34,7 +34,7 @@ wxWebCore port Bakefile project file.
- <makefile>
- <include file="webcore-base.bkl"/>
+ jscore.find_sources_in_dirs(full_dirs, excludes = jscore_excludes)
+
+- obj = bld.new_task_gen(
+- features = 'cxx cprogram',
+- includes = '. .. assembler DerivedSources ForwardingHeaders ' + ' '.join(includes),
+- source = 'jsc.cpp',
+- target = 'jsc',
+- uselib = 'WX ICU ' + get_config(),
+- uselib_local = 'jscore',
+- install_path = output_dir,
+- )
+-
+- if building_on_win32:
+- myenv = obj.env.copy()
+- myenv.CXXFLAGS = myenv.CXXFLAGS[:]
+- myenv.CXXFLAGS.remove('/EHsc')
+- obj.env = myenv
+-
+ bld.install_files(os.path.join(output_dir, 'JavaScriptCore'), 'API/*.h')
+--- WebKit-r68833/wscript 2010-10-01 01:57:42.000000000 +0400
++++ webkit/wscript 2010-10-23 22:19:56.455000071 +0400
+@@ -233,7 +233,7 @@ def build(bld):
+ cxxflags.extend(['-include', 'WebCorePrefix.h'])
-- <template id="webcore-wx" template="wxwk_build_settings,webcore_base,curl,gtk,pthreads">
-+ <template id="webcore-wx" template="webcore_base,wxwk_build_settings,curl,gtk,pthreads">
- <pic>on</pic>
- <threading>multi</threading>
-
+ webcore = bld.new_task_gen(
+- features = 'cc cxx cshlib',
++ features = 'cc cxx cstaticlib',
+ includes = ' '.join(wk_includes),
+ source = ' '.join(flattenSources(webcore_sources.values())),
+ cxxflags = cxxflags,
+@@ -324,4 +324,4 @@ def build(bld):
+ bld.add_group()
+
+ if build_port == "wx":
+- bld.add_subdirs(['WebKitTools/DumpRenderTree', 'WebKitTools/wx/browser', 'WebKit/wx/bindings/python'])
++ bld.add_subdirs(['WebKit/wx/bindings/python', ])
View
93 external/patches/webkit/icu-fix-56345.diff
@@ -1,93 +0,0 @@
---- WebKit-r43163/WebCore/platform/text/TextBreakIteratorICU.cpp 2009-04-30 04:04:21.000000000 +0400
-+++ webkit/WebCore/platform/text/TextBreakIteratorICU.cpp 2010-10-18 11:51:16.993000240 +0400
-@@ -24,7 +24,6 @@
-
- #include "PlatformString.h"
- #include "TextBreakIteratorInternalICU.h"
--
- #include <unicode/ubrk.h>
- #include <wtf/Assertions.h>
-
-@@ -38,7 +37,7 @@ static TextBreakIterator* setUpIterator(
-
- if (!createdIterator) {
- UErrorCode openStatus = U_ZERO_ERROR;
-- iterator = static_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
-+ iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
- createdIterator = true;
- ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
- }
-@@ -46,7 +45,7 @@ static TextBreakIterator* setUpIterator(
- return 0;
-
- UErrorCode setTextStatus = U_ZERO_ERROR;
-- ubrk_setText(iterator, string, length, &setTextStatus);
-+ ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
- if (U_FAILURE(setTextStatus))
- return 0;
-
-@@ -85,34 +84,34 @@ TextBreakIterator* sentenceBreakIterator
- staticSentenceBreakIterator, UBRK_SENTENCE, string, length);
- }
-
--int textBreakFirst(TextBreakIterator* bi)
-+int textBreakFirst(TextBreakIterator* iterator)
- {
-- return ubrk_first(bi);
-+ return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
- }
-
--int textBreakNext(TextBreakIterator* bi)
-+int textBreakNext(TextBreakIterator* iterator)
- {
-- return ubrk_next(bi);
-+ return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
- }
-
--int textBreakPreceding(TextBreakIterator* bi, int pos)
-+int textBreakPreceding(TextBreakIterator* iterator, int pos)
- {
-- return ubrk_preceding(bi, pos);
-+ return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
- }
-
--int textBreakFollowing(TextBreakIterator* bi, int pos)
-+int textBreakFollowing(TextBreakIterator* iterator, int pos)
- {
-- return ubrk_following(bi, pos);
-+ return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
- }
-
--int textBreakCurrent(TextBreakIterator* bi)
-+int textBreakCurrent(TextBreakIterator* iterator)
- {
-- return ubrk_current(bi);
-+ return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
- }
-
--bool isTextBreak(TextBreakIterator* bi, int pos)
-+bool isTextBreak(TextBreakIterator* iterator, int pos)
- {
-- return ubrk_isBoundary(bi, pos);
-+ return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), pos);
- }
-
- #ifndef BUILDING_ON_TIGER
-@@ -126,7 +125,7 @@ static TextBreakIterator* setUpIteratorW
- UParseError parseStatus;
- UErrorCode openStatus = U_ZERO_ERROR;
- String rules(breakRules);
-- iterator = static_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
-+ iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
- createdIterator = true;
- ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
- }
-@@ -134,7 +133,7 @@ static TextBreakIterator* setUpIteratorW
- return 0;
-
- UErrorCode setTextStatus = U_ZERO_ERROR;
-- ubrk_setText(iterator, string, length, &setTextStatus);
-+ ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
- if (U_FAILURE(setTextStatus))
- return 0;
-
View
11 external/patches/webkit/local_sec.patch
@@ -1,11 +0,0 @@
---- WebKit/WebCore/loader/FrameLoader.cpp 2009-05-05 17:39:56.000000000 +0400
-+++ webkit/WebCore/loader/FrameLoader.cpp 2009-05-05 17:40:23.000000000 +0400
-@@ -5181,7 +5181,7 @@ bool FrameLoader::shouldTreatURLSchemeAs
- }
-
- if (scheme.isEmpty())
-- return false;
-+ return true;
-
- return localSchemes().contains(scheme);
- }
View
122 external/patches/webkit/remove-targets.patch
@@ -1,122 +0,0 @@
-diff -Naurp WebKit-r43110/JavaScriptCore/jscore.bkl webkit/JavaScriptCore/jscore.bkl
---- WebKit-r43110/JavaScriptCore/jscore.bkl 2009-04-30 23:01:27.000000000 +0400
-+++ webkit/JavaScriptCore/jscore.bkl 2009-05-02 12:40:13.000000000 +0400
-@@ -105,40 +105,6 @@ JavaScriptCore Bakefile project file.
-
- </template>
-
-- <exe id="jsc" template="icu,jscore,pthreads,wxwk">
-- <cxx-rtti>off</cxx-rtti>
-- <cxx-exceptions>off</cxx-exceptions>
-- <debug-info>on</debug-info>
-- <depends>jscore</depends>
-- <include>$(SRCDIR)</include>
-- <include>$(WK_ROOT)/JavaScriptCore</include>
-- <include>$(WK_ROOT)/JavaScriptCore/assembler</include>
-- <include>$(WK_ROOT)/JavaScriptCore/bytecompiler</include>
-- <include>$(WK_ROOT)/JavaScriptCore/debugger</include>
-- <include>$(WK_ROOT)/JavaScriptCore/parser</include>
-- <include>$(WK_ROOT)/JavaScriptCore/pcre</include>
-- <include>$(WK_ROOT)/JavaScriptCore/profiler</include>
-- <include>$(WK_ROOT)/JavaScriptCore/runtime</include>
-- <include>$(WK_ROOT)/JavaScriptCore/interpreter</include>
-- <include>$(WK_ROOT)/JavaScriptCore/bytecode</include>
-- <include>$(WK_ROOT)/JavaScriptCore/jit</include>
-- <include>$(WK_ROOT)/JavaScriptCore/wrec</include>
-- <include>$(WK_ROOT)/JavaScriptCore/wtf</include>
-- <dirname>$(WKOUTPUTDIR)</dirname>
-- <sources>$(SRCDIR)/jsc.cpp</sources>
-- <set var="READLINE_LIB">
-- <if cond="WX_PORT=='mac'">edit</if>
-- </set>
-- <sys-lib>$(READLINE_LIB)</sys-lib>
-- <if cond="FORMAT in ['msvc','msvs2005prj']">
-- <include>$(WK_ROOT)/WebKitLibraries/win/include</include>
-- <sys-lib>winmm</sys-lib> <!-- for timeGetTime -->
-- <lib-path>$(WKOUTPUTDIR)</lib-path>
-- <lib-path>$(WK_ROOT)/WebKitLibraries/win/lib</lib-path>
-- </if>
--
-- </exe>
--
- <action id="DerivedSources">
- <is-phony />
- <command>bash make-generated-sources.sh</command>
-diff -Naurp WebKit-r43110/WebKit/wx/Bakefiles.bkgen webkit/WebKit/wx/Bakefiles.bkgen
---- WebKit-r43110/WebKit/wx/Bakefiles.bkgen 2009-04-30 04:04:21.000000000 +0400
-+++ webkit/WebKit/wx/Bakefiles.bkgen 2009-05-02 12:38:57.000000000 +0400
-@@ -41,19 +41,13 @@ Build configuration script for Bakefile.
-
- <!-- List of output formats to generate: -->
- <add-formats>
-- gnu,msvs2005prj,msvc
-+ gnu
- </add-formats>
-
- <!-- JSCore settings -->
- <add-flags files="../../JavaScriptCore/jscore.bkl" formats="gnu">
- -o../../JavaScriptCore/GNUmakefile
- </add-flags>
-- <add-flags files="../../JavaScriptCore/jscore.bkl" formats="msvs2005prj">
-- -o../../JavaScriptCore/JavaScriptCore.sln
-- </add-flags>
-- <add-flags files="../../JavaScriptCore/jscore.bkl" formats="msvc">
-- -o../../JavaScriptCore/makefile.vc
-- </add-flags>
- <!-- testing XCode backend
- <add-flags files="jscore.bkl" formats="xcode2">
- -o../WebCore/Projects/base/WebCoreBase.xcode
-@@ -64,42 +58,18 @@ Build configuration script for Bakefile.
- <add-flags files="../../WebCore/webcore-wx.bkl" formats="gnu">
- -o../../WebCore/GNUmakefile
- </add-flags>
-- <add-flags files="../../WebCore/webcore-wx.bkl" formats="msvs2005prj">
-- -o../../WebCore/webcore-wx.sln
-- </add-flags>
-- <add-flags files="../../WebCore/webcore-wx.bkl" formats="msvc">
-- -o../../WebCore/makefile.vc
-- </add-flags>
-
- <add-flags files="wxwebkit.bkl" formats="gnu">
- -oGNUmakefile
- </add-flags>
-- <add-flags files="wxwebkit.bkl" formats="msvs2005prj">
-- -owxWebKit.sln
-- </add-flags>
-- <add-flags files="wxwebkit.bkl" formats="msvc">
-- -omakefile.vc
-- </add-flags>
-
- <add-flags files="bindings/python/wxwebkit-py.bkl" formats="gnu">
- -obindings/python/GNUmakefile
- </add-flags>
-- <add-flags files="bindings/python/wxwebkit-py.bkl" formats="msvs2005prj">
-- -obindings/python/wxWebKit.sln
-- </add-flags>
-- <add-flags files="bindings/python/wxwebkit-py.bkl" formats="msvc">
-- -obindings/python/makefile.vc
-- </add-flags>
-
- <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="gnu">
- -o../../WebKitTools/wx/browser/GNUmakefile
- </add-flags>
-- <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="msvs2005prj">
-- -o../../WebKitTools/wx/browser/browser.sln
-- </add-flags>
-- <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="msvc">
-- -o../../WebKitTools/wx/browser/makefile.vc
-- </add-flags>
- <!-- testing XCode backend
- <add-flags files="webcore-wx.bkl" formats="xcode2">
- -o../WebCore/Projects/wx/wxWebCore.xcode
-diff -Naurp WebKit-r43110/WebKitTools/wx/build-wxwebkit webkit/WebKitTools/wx/build-wxwebkit
---- WebKit-r43110/WebKitTools/wx/build-wxwebkit 2009-05-01 08:15:10.000000000 +0400
-+++ webkit/WebKitTools/wx/build-wxwebkit 2009-05-02 12:38:57.000000000 +0400
-@@ -302,7 +302,6 @@ if [ $do_build == 1 -o $do_clean == 1 ];
-
- do_make $WK_ROOT/WebCore "-DBUILDING_WX__=1 $WXGC_DEFINE $EXTRA_CPPFLAGS" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR DEBUG=$debug PLATFORM_OS=$PLATFORM_OS $other_args
- do_make $WK_ROOT/WebKit/wx "-DBUILDING_WX__=1 -DWXMAKINGDLL_WEBKIT=1 $WXGC_DEFINE $EXTRA_CPPFLAGS" WX_DEBUG=$wxdebug DEBUG=$debug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
-- do_make $WK_ROOT/WebKitTools/wx/browser "-DBUILDING_WX__=1 -DWXUSINGDLL_WEBKIT=1 $WXGC_DEFINE $EXTRA_CPPFLAGS" WX_DEBUG=$wxdebug DEBUG=$debug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
-
- if [ $do_clean == 1 ]; then
- rm -rf $WK_ROOT/JavaScriptCore/DerivedSources
View
64 external/patches/webkit/vis_hidden.patch
@@ -1,64 +0,0 @@
-From bug 24345
-
-
-Index: WebKit/wx/WebFrame.h
-===================================================================
---- WebKit/wx/WebFrame.h (revision 41418)
-+++ WebKit/wx/WebFrame.h (working copy)
-@@ -46,6 +46,9 @@
-
- #ifndef SWIG
-
-+#if !wxCHECK_VERSION(2,9,0) && wxCHECK_GCC_VERSION(4,0)
-+#define WXDLLIMPEXP_WEBKIT __attribute__ ((visibility("default")))
-+#else
- #if WXMAKINGDLL_WEBKIT
- #define WXDLLIMPEXP_WEBKIT WXEXPORT
- #elif defined(WXUSINGDLL_WEBKIT)
-@@ -54,8 +57,7 @@
- #define WXDLLIMPEXP_WEBKIT
- #endif
-
--#else
--#define WXDLLIMPEXP_WEBKIT
-+#endif
- #endif // SWIG
-
- class WXDLLIMPEXP_WEBKIT wxWebViewDOMElementInfo
-Index: WebKit/wx/WebView.h
-===================================================================
---- WebKit/wx/WebView.h (revision 41418)
-+++ WebKit/wx/WebView.h (working copy)
-@@ -46,6 +46,9 @@
-
- #ifndef SWIG
-
-+#if !wxCHECK_VERSION(2,9,0) && wxCHECK_GCC_VERSION(4,0)
-+#define WXDLLIMPEXP_WEBKIT __attribute__ ((visibility("default")))
-+#else
- #if WXMAKINGDLL_WEBKIT
- #define WXDLLIMPEXP_WEBKIT WXEXPORT
- #elif defined(WXUSINGDLL_WEBKIT)
-@@ -54,8 +57,7 @@
- #define WXDLLIMPEXP_WEBKIT
- #endif
-
--#else
--#define WXDLLIMPEXP_WEBKIT
-+#endif
- #endif // SWIG
-
- #ifndef SWIG
-Index: WebKitTools/wx/build-wxwebkit
-===================================================================
---- WebKitTools/wx/build-wxwebkit (revision 41418)
-+++ WebKitTools/wx/build-wxwebkit (working copy)
-@@ -179,7 +179,7 @@
- cd $olddir
- else
- if [ -f $dir/GNUmakefile ]; then
-- make -C $dir -f GNUmakefile $MAKE_ARGS CXXFLAGS="$cxxflags" $@
-+ make -C $dir -f GNUmakefile $MAKE_ARGS CXXFLAGS="$cxxflags -fvisibility=hidden -fvisibility-inlines-hidden" $@
- fi
- fi
- if [ $? != 0 ]; then
View
5,206 external/patches/webkit/webkit_688833_to_git_trunk.diff
5,206 additions, 0 deletions not shown
View
13 external/patches/webkit/wxtimerfix-gcc-4.5.diff
@@ -1,13 +0,0 @@
---- webkit/WebCore/platform/wx/SharedTimerWx.cpp.orig 2010-10-18 12:56:48.170000242 +0400
-+++ webkit/WebCore/platform/wx/SharedTimerWx.cpp 2010-10-18 12:57:03.796000241 +0400
-@@ -47,9 +47,8 @@ class WebKitTimer: public wxTimer
- virtual void Notify();
- };
-
--WebKitTimer::WebKitTimer()
-+WebKitTimer::WebKitTimer() : wxTimer()
- {
-- wxTimer::wxTimer();
- }
-
- WebKitTimer::~WebKitTimer()
View
15 external/patches/webkit/wxtimerfix.patch
@@ -1,15 +0,0 @@
---- WebKit/WebCore/platform/wx/SharedTimerWx.cpp 2009-05-05 03:17:51.000000000 +0400
-+++ webkit/WebCore/platform/wx/SharedTimerWx.cpp 2009-05-05 03:19:07.000000000 +0400
-@@ -77,11 +77,7 @@ void setSharedTimerFireTime(double fireT
- if (!wkTimer)
- wkTimer = new WebKitTimer();
-
-- unsigned int intervalInMS = interval * 1000;
--
-- // sanity check
-- if (intervalInMS < 1)
-- intervalInMS = 1;
-+ unsigned int intervalInMS = interval < 0.0012 ? 1 : interval * 1000;
-
- wkTimer->Start(intervalInMS, wxTIMER_ONE_SHOT);
- }
View
2  src/Makefile
@@ -52,7 +52,7 @@ INCLUDES = $(WXINCLUDES) $(OURINCLUDES) $(GTKINCLUDES) -I$(ROOTDIR)/ecore -I.
OURLIBPATHS = -L$(EXT_DIR)/lib
WXLIBS = $(shell $(EXT_DIR)/bin/wx-config --libs)
-WEBKIT_LIBS = -lwxwebkit -lwebcore-wx -ljscore
+WEBKIT_LIBS = -lwxwebkit -ljscore
LIBS = $(OURLIBPATHS) -L$(ROOTDIR)/ecore -l$(ECORE) -lcurl -ltomcrypt -ltommath -lmk4 -lpcre -ltinyxml $(WEBKIT_LIBS) $(WXLIBS)
View
2  src/webconnect/webframe.h
@@ -13,6 +13,8 @@
#ifndef __WXWEBCONNECT_WEBFRAME_H
#define __WXWEBCONNECT_WEBFRAME_H
+// HACK wxWebKit and wxWebconnect both define wxWebFrame class so rename one of them
+#define wxWebFrame wxWebconnectFrame
///////////////////////////////////////////////////////////////////////////////
Please sign in to comment.
Something went wrong with that request. Please try again.