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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e683fb70eaf0192e0770513d9e68b6f121f404a6
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 23 15:20:36 2010 +0000

    2010-08-23  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] run-launcher fails if WebKitGTK+ compiled with GTK+-3.0 support
            https://bugs.webkit.org/show_bug.cgi?id=42026
    
            If a GTK+ 3.x build is present return that as the library to use,
            otherwise fallback to the GTK+ 2.x build.
    
            * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65811 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c95ef33..ce5e40d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-23  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] run-launcher fails if WebKitGTK+ compiled with GTK+-3.0 support
+        https://bugs.webkit.org/show_bug.cgi?id=42026
+
+        If a GTK+ 3.x build is present return that as the library to use,
+        otherwise fallback to the GTK+ 2.x build.
+
+        * Scripts/webkitdirs.pm:
+
 2010-08-23  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 6530244..3901611 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -597,7 +597,11 @@ sub builtDylibPathForName
         return "$configurationProductDir/libwxwebkit.dylib";
     }
     if (isGtk()) {
-        return "$configurationProductDir/$libraryName/../.libs/libwebkitgtk-1.0.so";
+        my $libraryDir = "$configurationProductDir/$libraryName/../.libs/";
+        if (-e $libraryDir . "libwebkitgtk-3.0.so") {
+            return $libraryDir . "libwebkitgtk-3.0.so";
+        }
+        return $libraryDir . "libwebkitgtk-1.0.so";
     }
     if (isEfl()) {
         return "$configurationProductDir/$libraryName/../.libs/libewebkit.so";

-- 
WebKit Debian packaging