Author: anevilyak Date: Sun Jul 4 03:24:04 2010 New Revision: 527 URL: http://mmlr.dyndns.org/changeset/527 Log: Fix building Web+ against updated locale kit (currently requires manually placing liblocalestub.a from Haiku's build tree) Modified: webkit/trunk/WebKit/Jamfile webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.cpp webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.h Modified: webkit/trunk/WebKit/Jamfile ============================================================================== --- webkit/trunk/WebKit/Jamfile Tue Jun 15 21:24:07 2010 (r526) +++ webkit/trunk/WebKit/Jamfile Sun Jul 4 03:24:04 2010 (r527) @@ -162,7 +162,7 @@ # Other required libraries curl icu-common icu-data png sqlite3 xml2 z # Haiku libraries - be bsd locale network stdc++ tracker translation + be bsd locale network liblocalestub.a stdc++ tracker translation : WebPositive.rdef ; Modified: webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.cpp ============================================================================== --- webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.cpp Tue Jun 15 21:24:07 2010 (r526) +++ webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.cpp Sun Jul 4 03:24:04 2010 (r527) @@ -71,7 +71,6 @@ fDownloadWindow(NULL), fSettingsWindow(NULL) { - be_locale->GetAppCatalog(&fAppCatalog); } Modified: webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.h ============================================================================== --- webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.h Tue Jun 15 21:24:07 2010 (r526) +++ webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.h Sun Jul 4 03:24:04 2010 (r527) @@ -77,8 +77,6 @@ DownloadWindow* fDownloadWindow; SettingsWindow* fSettingsWindow; - - BCatalog fAppCatalog; };