[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

xan at webkit.org xan at webkit.org
Fri Feb 26 22:17:56 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 72bdc1b99d31c93ce9cafe49270b2709748b428f
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 20:40:03 2010 +0000

    2010-02-11  Xan Lopez  <xlopez at igalia.com>
    
            Try to fix GTK+ build.
    
            * configure.ac:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54666 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 71ea26c..28e5c4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-11  Xan Lopez  <xlopez at igalia.com>
+
+        Try to fix GTK+ build.
+
+        * configure.ac:
+
 2010-02-11  Antonio Gomes  <tonikitoo at webkit.org>
 
         Reviewed by Xan Lopez.
diff --git a/configure.ac b/configure.ac
index e0d5883..67536f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,6 +204,7 @@ GTK_REQUIRED_VERSION=2.10
 LIBXSLT_REQUIRED_VERSION=1.1.7
 SQLITE_REQUIRED_VERSION=3.0
 GSTREAMER_REQUIRED_VERSION=0.10
+GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.23
 ENCHANT_REQUIRED_VERSION=0.22
 GAIL_REQUIRED_VERSION=1.8
 
@@ -723,7 +724,7 @@ if test "$enable_video" = "yes"; then
                      gstreamer-app-0.10
                      gstreamer-base-0.10
                      gstreamer-pbutils-0.10
-                     gstreamer-plugins-base-0.10.23
+                     gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
                      gstreamer-video-0.10])
    AC_SUBST([GSTREAMER_CFLAGS])
    AC_SUBST([GSTREAMER_LIBS])

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list