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

crogers at google.com crogers at google.com
Wed Dec 22 17:58:46 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 85c972c546960fea443e28c7ae9a55e77ad5b75c
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 21:17:29 2010 +0000

    2010-12-03  Chris Rogers  <crogers at google.com>
    
            Unreviewed build fix.
    
            Try to fix GTK build due to recent web audio makefile changes (disable ENABLE_WEB_AUDIO explicitly)
            https://bugs.webkit.org/show_bug.cgi?id=50478
    
            * GNUmakefile.am:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73293 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b512d8e..ec36439 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-03  Chris Rogers  <crogers at google.com>
+
+        Unreviewed build fix.
+
+        Try to fix GTK build due to recent web audio makefile changes (disable ENABLE_WEB_AUDIO explicitly)
+        https://bugs.webkit.org/show_bug.cgi?id=50478
+
+        * GNUmakefile.am:
+
 2010-12-03  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 51ab709..6ced55f 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -4570,6 +4570,12 @@ DerivedSources/WebCore/XLinkNames.cpp : $(WebCore)/dom/make_names.pl $(WebCore)/
 	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkattrs.in --outputDir "$(GENSOURCES_WEBCORE)"
 
 # ----
+# Web Audio Support - disable for now.
+# ----
+FEATURE_DEFINES += ENABLE_WEB_AUDIO=0
+webcore_cppflags += -DENABLE_WEB_AUDIO=0
+
+# ----
 # Web Sockets Support
 # ----
 if ENABLE_WEB_SOCKETS

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list