[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[luiz at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f3a0725c008c04b48e634ea02d2785e112f91532
Author: luiz at webkit.org <luiz at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 13:11:55 2010 +0000

    2010-10-07  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Reviewed by Adam Roben.
    
            [Qt] Webkit2 MacOS build fix
            https://bugs.webkit.org/show_bug.cgi?id=47167
    
            There were two problems when building Qt WebKit2 in Mac. The first was that
            ld does not support flag -whole-archive and it needed to be replaced by flag -all_load.
            The second problem was that __APPLE__ is been used to identify safari builds and, when
            building Qt in MacOS, Qt was ending up using the wrong typedef. The solution was to use
            a Qt specific WKNativeEvent.h that only has the proper Qt typedef instead of the original one.
    
            * UIProcess/API/C/qt/WKNativeEvent.h: Added.
            * WebKit2.pri:
            * WebKit2.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69304 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7b05fe3..a6b300e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-07  Luiz Agostini  <luiz.agostini at openbossa.org>
+
+        Reviewed by Adam Roben.
+
+        [Qt] Webkit2 MacOS build fix
+        https://bugs.webkit.org/show_bug.cgi?id=47167
+
+        There were two problems when building Qt WebKit2 in Mac. The first was that
+        ld does not support flag -whole-archive and it needed to be replaced by flag -all_load.
+        The second problem was that __APPLE__ is been used to identify safari builds and, when
+        building Qt in MacOS, Qt was ending up using the wrong typedef. The solution was to use
+        a Qt specific WKNativeEvent.h that only has the proper Qt typedef instead of the original one.
+
+        * UIProcess/API/C/qt/WKNativeEvent.h: Added.
+        * WebKit2.pri:
+        * WebKit2.pro:
+
 2010-10-07  Balazs Kelemen  <kbalazs at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/UIProcess/API/C/qt/WKNativeEvent.h b/WebKit2/UIProcess/API/C/qt/WKNativeEvent.h
new file mode 100644
index 0000000..78df4ac
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/qt/WKNativeEvent.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKNativeEvent_h
+#define WKNativeEvent_h
+
+// a Qt specific WKNativeEvent.h file is needed because that the use of __APPLE__
+// in original WKNativeEvent.h file breaks Qt build in MacOS
+
+class QEvent;
+typedef const QEvent* WKNativeEventPtr;
+
+#endif /* WKNativeEvent_h */
diff --git a/WebKit2/WebKit2.pri b/WebKit2/WebKit2.pri
index c9c6e52..103fed1 100644
--- a/WebKit2/WebKit2.pri
+++ b/WebKit2/WebKit2.pri
@@ -14,7 +14,8 @@ defineTest(addWebKit2Lib) {
     QMAKE_LIBDIR += $$pathToWebKit2Output
 
     # Make symbols visible
-    QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
+    mac:QMAKE_LFLAGS += -Wl,-all_load -l$$WEBKIT2_TARGET
+    else:QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
 
     POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}lib$${WEBKIT2_TARGET}.a
 
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index be41d5f..021356d 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -207,13 +207,13 @@ HEADERS += \
     UIProcess/API/C/WKContextPrivate.h \
     UIProcess/API/C/WKFrame.h \
     UIProcess/API/C/WKFramePolicyListener.h \
-    UIProcess/API/C/WKNativeEvent.h \
     UIProcess/API/C/WKNavigationData.h \
     UIProcess/API/C/WKPage.h \
     UIProcess/API/C/WKPageNamespace.h \
     UIProcess/API/C/WKPagePrivate.h \
     UIProcess/API/C/WKPreferences.h \
     UIProcess/API/C/WKPreferencesPrivate.h \
+    UIProcess/API/C/qt/WKNativeEvent.h \
     UIProcess/API/cpp/qt/WKStringQt.h \
     UIProcess/API/cpp/qt/WKURLQt.h \
     UIProcess/API/cpp/WKRetainPtr.h \

-- 
WebKit Debian packaging