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

hausmann at webkit.org hausmann at webkit.org
Wed Dec 22 14:12:05 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ce3bac069d48b37df6e718b7797b201f296276ed
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 13:27:36 2010 +0000

    Unreviewed build fix.
    
    [Symbian] Fix build issue due to gaps in ordinals in the def file
    
    Restore previously removed symbols and mark them absent instead. We must
    not remove symbols from this file, because it breaks binary compatibility
    (when re-assigning the ordinals of the following symbols) or it causes build
    breakage when instead having a gap in the ordinal sequence. Instead removing
    a symbol is done by marking it as absent.
    
    * symbian/eabi/QtWebKitu.def:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69104 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 48c9736..f14f200 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-05  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Unreviewed build fix.
+
+        [Symbian] Fix build issue due to gaps in ordinals in the def file
+
+        Restore previously removed symbols and mark them absent instead. We must
+        not remove symbols from this file, because it breaks binary compatibility
+        (when re-assigning the ordinals of the following symbols) or it causes build
+        breakage when instead having a gap in the ordinal sequence. Instead removing
+        a symbol is done by marking it as absent.
+
+        * symbian/eabi/QtWebKitu.def:
+
 2010-10-04  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/qt/symbian/eabi/QtWebKitu.def b/WebKit/qt/symbian/eabi/QtWebKitu.def
index 2b917e1..c9fac91 100644
--- a/WebKit/qt/symbian/eabi/QtWebKitu.def
+++ b/WebKit/qt/symbian/eabi/QtWebKitu.def
@@ -799,6 +799,7 @@ EXPORTS
 	_ZN8QWebPage23allowGeolocationRequestEP9QWebFrame @ 798 NONAME
 	_ZN8QWebPage23viewportChangeRequestedERKNS_13ViewportHintsE @ 799 NONAME ABSENT
 	_ZNK15QWebScriptWorld5worldEv @ 800 NONAME
+	_ZN16QGraphicsWebView13setDeviceSizeERK5QSize @ 801 NONAME ABSENT
 	_ZN23DumpRenderTreeSupportQt12pagePropertyEP9QWebFrameRK7QStringi @ 802 NONAME
 	_ZN23DumpRenderTreeSupportQt16isPageBoxVisibleEP9QWebFramei @ 803 NONAME
 	_ZN23DumpRenderTreeSupportQt16resumeAnimationsEP9QWebFrame @ 804 NONAME
@@ -810,6 +811,7 @@ EXPORTS
 	_ZN8QWebPage23checkPermissionFromUserEP9QWebFrameNS_16PermissionDomainERNS_16PermissionPolicyE @ 810 NONAME
 	_ZN8QWebPage25requestPermissionFromUserEP9QWebFrameNS_16PermissionDomainE @ 811 NONAME
 	_ZN8QWebPage27cancelRequestsForPermissionEP9QWebFrameNS_16PermissionDomainE @ 812 NONAME
+	_ZNK16QGraphicsWebView10deviceSizeEv @ 813 NONAME ABSENT
 	_ZN23DumpRenderTreeSupportQt14viewportAsTextEP8QWebPageRK5QSize @ 814 NONAME
 	_ZN23DumpRenderTreeSupportQt32simulateDesktopNotificationClickERK7QString @ 815 NONAME
 	_ZN8QWebPage23viewportChangeRequestedEv @ 816 NONAME

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list