• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/webkit/webkit-fix-compilation-on-DirectFB.patch
Gustavo ZacariasGustavo Zacarias committed e4cce3732ce22 Dec 2010
Raw file
Source viewDiff to previous
@@ -571,7 +572,7 @@ NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32 len, const c
 
1
From 91a2bf4c3a21720a27223ba293ba90f58c349959 Mon Sep 17 00:00:00 2001
2
From: Lionel Landwerlin <llandwerlin@gmail.com>
3
Date: Sun, 11 Apr 2010 14:38:57 +0200
4
Subject: [PATCH] Fix compilation with DirectFB
5
​
6
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
7
---
8
 GNUmakefile.am                        |    2 ++
9
 WebCore/plugins/PluginView.h          |    6 +++---
10
 WebCore/plugins/gtk/PluginViewGtk.cpp |   17 ++++++++---------
11
 3 files changed, 13 insertions(+), 12 deletions(-)
12
​
13
diff --git a/GNUmakefile.am b/GNUmakefile.am
14
index 3bdfe53..8626bbb 100644
15
--- a/GNUmakefile.am
16
+++ b/GNUmakefile.am
17
@@ -122,8 +122,10 @@ corekit_cppflags += \
18
 
19
 # For the Gtk port we want to use XP_UNIX both in X11 and Mac
20
 if !TARGET_WIN32
21
+if !TARGET_DIRECTFB
22
 corekit_cppflags += -DXP_UNIX
23
 endif
24
+endif
25
 
26
 # Default compiler flags
27
 global_cflags += \
28
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
29
index 21a25f6..8116864 100644
30
--- a/WebCore/plugins/PluginView.h
31
+++ b/WebCore/plugins/PluginView.h
32
@@ -22,7 +22,7 @@
33
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
34
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
35
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
36
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
37
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
38
  */
39
 
40
 #ifndef PluginView_h
41
@@ -312,7 +312,7 @@ namespace WebCore {
42
         bool m_haveInitialized;
43
         bool m_isWaitingToStart;
44
 
45
-#if defined(XP_UNIX)
46
+#if defined(XP_UNIX) || PLATFORM(DIRECTFB)
47
         bool m_needsXEmbed;
48
 #endif
49
 
50
@@ -340,7 +340,7 @@ public:
51
 
52
 private:
53
 
54
-#if defined(XP_UNIX) || OS(SYMBIAN)
55
+#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(DIRECTFB)
56
         void setNPWindowIfNeeded();
57
 #elif defined(XP_MACOSX)
58
         NP_CGContext m_npCgContext;
59
diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
60
index 8de63e0..039a845 100644
61
--- a/WebCore/plugins/gtk/PluginViewGtk.cpp
62
+++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
63
@@ -23,7 +23,7 @@
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.