webkit-gtk: error: 'yield' was not declared in this scope

[ghost]

I came across this anomaly in the beast webkit-gtk.

Seems to be a namespace problem as very well explained by the compiler message below:

  CXX    Source/WebCore/platform/sql/libWebCore_la-SQLiteDatabase.lo
Source/WebCore/platform/sql/SQLiteDatabase.cpp: In member function 'void WebCore::SQLiteDatabase::interrupt()':
Source/WebCore/platform/sql/SQLiteDatabase.cpp:128:15: error: 'yield' was not declared in this scope
Source/WebCore/platform/sql/SQLiteDatabase.cpp:128:15: note: suggested alternative:
In file included from ./Source/JavaScriptCore/wtf/ThreadRestrictionVerifier.h:35:0,
                 from ./Source/JavaScriptCore/wtf/RefCounted.h:26,
                 from ./Source/JavaScriptCore/wtf/text/CString.h:30,
                 from Source/WebCore/platform/sql/SQLiteDatabase.h:31,
                 from Source/WebCore/platform/sql/SQLiteDatabase.cpp:28:
./Source/JavaScriptCore/wtf/Threading.h:103:25: note:   'WTF::yield'
gmake[1]: *** [Source/WebCore/platform/sql/libWebCore_la-SQLiteDatabase.lo] Error 1
gmake[1]: Leaving directory `/home/richard/src/pkgsrc/www/webkit-gtk/work.devzone/webkit-1.8.3'
gmake: *** [all] Error 2
*** Error code 2

Stop.
bmake: stopped in /home/richard/src/pkgsrc/www/webkit-gtk
*** Error code 1

Stop.

Tried patching as follows:

--- SQLiteDatabase.cpp.orig     dim. oct. 28 06:53:34 2012
+++ SQLiteDatabase.cpp  dim. oct. 28 06:47:18 2012
@@ -125,7 +125,7 @@
         if (!m_db)
             return;
         sqlite3_interrupt(m_db);
-        yield();
+        WTF::yield();
     }

     m_lockingMutex.unlock();

and it compiles further now. (PS I haven't tried the webkit-gtk3 tree)

BTW, pkgvi, mkpatches and bmake mdi are great tools (discovered via this wiki: http://wiki.minix3.org/en/DevelopersGuide/TestingPkgsrc).
If it would be useful, I could try doing git diffs for joyent/pkgsrc ...

Now that I've tasted blood, will never suffer myself to go back to SFE!

cheers

[ghost]

Sheesh, took over a day to complete the build from start to finish with a successful install.
Although being an interesting exercise, not sure git diffs without a git to git operation is really useful, did need to revert the existing patches with a git checkout -- after deleting patches/*.orig in order to avoid update problems with bmake mdi.
anyway, came out thus:

richard@devzone:~/src/pkgsrc$ git diff --staged www/webkit-gtk
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index a406c80..1040e5c 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -8,6 +8,7 @@ SHA1 (patch-Source_JavaScriptCore_wtf_MathExtras.h) = a47cf7e70688d46096930b2029
 SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) = f056b8f08c68d44e1b9dfd2bcf60cb788b05f38f
 SHA1 (patch-Source_WebCore_css_CSSGrammar.y) = 22e704480c4f0045ed9ee20f807ce703f20749e9
 SHA1 (patch-Source_WebCore_css_CSSParser.cpp) = 8a7687bd2361184765f2757335f80a68bdc09bf7
+SHA1 (patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp) = ee5716029b4da89df4aa81b68ff664f5e767501b
 SHA1 (patch-Source_WebCore_xml_XPathGrammar.y) = aa5881029a604673ef3e15be7a8d92ed3489658e
 SHA1 (patch-Source_WebCore_xml_XPathParser.cpp) = 53fec9eb744c9890ba9d2b0511bb917e8c8a1b7f
 SHA1 (patch-ai) = 7b94becb603b88c66d8d8f1619d90dc6553d970c
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp b/www/webkit-gtk/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp
new file mode 100644
index 0000000..7c714e9
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Source/WebCore/platform/sql/SQLiteDatabase.cpp.orig        2012-10-28 05:53:34.244656153 +0000
++++ Source/WebCore/platform/sql/SQLiteDatabase.cpp
+@@ -125,7 +125,7 @@ void SQLiteDatabase::interrupt()
+         if (!m_db)
+             return;
+         sqlite3_interrupt(m_db);
+-        yield();
++        WTF::yield();
+     }
+ 
+     m_lockingMutex.unlock();