[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[eric at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit f41697b68e002c8aacc4590d87fea867adf532e1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 22:45:01 2010 +0000

    2010-01-05  Robert Hogan  <robert at roberthogan.net>
    
            Reviewed by Eric Seidel.
    
            [Qt] fix DRT link failures on --no-svg builds when only making changes to DRT
    
            If you're working from a --minimal or --no-svg build and make changes to the
            DRT, then recompile, the build will fail.
    
            This is because the current behavior at build time is to assume that the
            previous Qt build supported SVG and consequently delete libQtWebKit.so.
            Unfortunately, just deleting libQtWebKit.so will not cause the library to
            re-link. Instead the build will see libQtWebKit.so.4 and co., pass over the
            linking phase, and attempt to link the DRT with libQtWebKit.so absent. This
            results in a link failure on the DRT.
    
            Since re-linking libQtWebKit can take up to ten minutes and should be avoided
            in cases where not actually required, remove the assumption that
            the previous Qt build supported SVG, and amend the symbol detection to look for
            a symbol name that is not present in SVG builds. Currently webkitdirs.pm looks
            for 'SVGElement' but even non-SVG builds contain the symbol 'isSVGElement'.
    
            https://bugs.webkit.org/show_bug.cgi?id=32992
    
            * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52825 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d6ce782..9d1a1b7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,29 @@
+2010-01-05  Robert Hogan  <robert at roberthogan.net>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] fix DRT link failures on --no-svg builds when only making changes to DRT
+        
+        If you're working from a --minimal or --no-svg build and make changes to the
+        DRT, then recompile, the build will fail.
+        
+        This is because the current behavior at build time is to assume that the
+        previous Qt build supported SVG and consequently delete libQtWebKit.so.
+        Unfortunately, just deleting libQtWebKit.so will not cause the library to
+        re-link. Instead the build will see libQtWebKit.so.4 and co., pass over the
+        linking phase, and attempt to link the DRT with libQtWebKit.so absent. This
+        results in a link failure on the DRT.
+        
+        Since re-linking libQtWebKit can take up to ten minutes and should be avoided
+        in cases where not actually required, remove the assumption that
+        the previous Qt build supported SVG, and amend the symbol detection to look for
+        a symbol name that is not present in SVG builds. Currently webkitdirs.pm looks
+        for 'SVGElement' but even non-SVG builds contain the symbol 'isSVGElement'.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=32992
+
+        * Scripts/webkitdirs.pm:
+
 2010-01-05  Chris Jerdonek  <chris.jerdonek at gmail.com>
 
         Reviewed by David Kilzer.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 17a83f6..20a1ad2 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -621,15 +621,12 @@ sub hasSVGSupport
 {
     my $path = shift;
 
-    if (isQt()) {
-        return 1;
-    }
-    
     if (isWx()) {
         return 0;
     }
 
-    return libraryContainsSymbol($path, "SVGElement");
+    # We used to look for SVGElement but isSVGElement is a valid symbol in --no-svg builds.
+    return libraryContainsSymbol($path, "SVGDefsElement");
 }
 
 sub removeLibraryDependingOnSVG

-- 
WebKit Debian packaging