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

[demarchi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 263be204855801582f3ef2810fa4aee7cfeca8dd
Author: demarchi at webkit.org <demarchi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 16:39:36 2010 +0000

    2010-08-25  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Unreviewed build fix.
    
            [EFL] Build fix for revision 65332
            https://bugs.webkit.org/show_bug.cgi?id=44543
    
            Generated variables are now returned from FindPkgConfig, so no need
            to document the custom ones.
    
            * cmake/FindGthread.cmake:
    2010-08-25  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Unreviewed build fix.
    
            [EFL] Build fix for revision 65332
            https://bugs.webkit.org/show_bug.cgi?id=44543
    
            Use Gthread_LIBRARIES instead of GTHREAD_LIBRARIES. This fix
            the build when using ENABLE_GLIB_SUPPORT=ON and NETWORK_BACKEND=curl.
    
            * CMakeListsEfl.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66018 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 5f336ff..2508bd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-25  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Unreviewed build fix.
+
+        [EFL] Build fix for revision 65332
+        https://bugs.webkit.org/show_bug.cgi?id=44543
+
+        Generated variables are now returned from FindPkgConfig, so no need
+        to document the custom ones.
+
+        * cmake/FindGthread.cmake:
+
 2010-08-24  Xan Lopez  <xlopez at igalia.com>
 
         Build fix, strike 2.
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index 04c1ac7..cdb24ff 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -177,7 +177,7 @@ IF (ENABLE_GLIB_SUPPORT)
   LIST(APPEND EWebLauncher_LIBRARIES
     ${Gdk_LIBRARIES}
     ${Glib_LIBRARIES}
-    ${GTHREAD_LIBRARIES}
+    ${Gthread_LIBRARIES}
   )
 ENDIF ()
 
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 9b3f30e..df33029 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-25  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Unreviewed build fix.
+
+        [EFL] Build fix for revision 65332
+        https://bugs.webkit.org/show_bug.cgi?id=44543
+
+        Use Gthread_LIBRARIES instead of GTHREAD_LIBRARIES. This fix
+        the build when using ENABLE_GLIB_SUPPORT=ON and NETWORK_BACKEND=curl.
+
+        * CMakeListsEfl.txt:
+
 2010-08-24  Lukasz Slachciak  <l.slachciak at samsung.com>
 
         Reviewed by Antonio Gomes.
diff --git a/cmake/FindGthread.cmake b/cmake/FindGthread.cmake
index d52aa5f..281e657 100644
--- a/cmake/FindGthread.cmake
+++ b/cmake/FindGthread.cmake
@@ -1,8 +1,4 @@
-# Find include and libraries for GTHREAD library
-# GTHREAD_INCLUDE     Directories to include to use GTHREAD
-# GTHREAD_INCLUDE-I   Directories to include to use GTHREAD (with -I)
-# GTHREAD_LIBRARIES   Libraries to link against to use GTHREAD
-# GTHREAD_FOUND       GTHREAD was found
+# Find include and libraries for Gthread library
 
 INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES (Gthread REQUIRED gthread-2.0>=2.20.0)

-- 
WebKit Debian packaging