Skip to content

qtwebkit: fix build issue with gcc 4.7 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: unstable
Choose a base branch
from
Open

qtwebkit: fix build issue with gcc 4.7 #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions qtwebkit/0001-Add-LunaServiceBridge-interface.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ index 0000000..e763655
+#include <lunaservice.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <wtf/text/CString.h>
+
+namespace WebCore {
Expand Down Expand Up @@ -366,7 +367,6 @@ index 0000000..e763655
+ */
+void LunaServiceManager::cancel(LunaServiceManagerListener* inListener)
+{
+ bool retVal;
+ LSError lserror;
+
+ if (!inListener || !inListener->listenerToken)
Expand Down Expand Up @@ -453,7 +453,7 @@ new file mode 100644
index 0000000..838ce50
--- /dev/null
+++ b/Source/WebCore/platform/webos/PalmServiceBridge.cpp
@@ -0,0 +1,414 @@
@@ -0,0 +1,413 @@
+
+#include "config.h"
+#if ENABLE(PALM_SERVICE_BRIDGE)
Expand Down Expand Up @@ -696,7 +696,6 @@ index 0000000..838ce50
+
+int PalmServiceBridge::call(const String& uri, const String& payload, ExceptionCode& ec)
+{
+ const char* callerId = 0;
+ bool usePrivateBus = false;
+
+ JSValue identifier;
Expand Down Expand Up @@ -877,7 +876,7 @@ index 0000000..83f723f
+#ifndef PalmServiceBridge_h
+#define PalmServiceBridge_h
+
+#ifdef ENABLE(PALM_SERVICE_BRIDGE)
+#if ENABLE(PALM_SERVICE_BRIDGE)
+
+#include "ActiveDOMObject.h"
+#include "Event.h"
Expand Down