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

jchaffraix at webkit.org jchaffraix at webkit.org
Wed Dec 22 12:58:57 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 1c8d14b73ec04a08f0ae66c6534aa19bb8150da5
Author: jchaffraix at webkit.org <jchaffraix at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 3 16:15:55 2010 +0000

    [GTK] compilation issue with JSTimeRanges when video turned off
    https://bugs.webkit.org/show_bug.cgi?id=44249
    
    Patch by Zaheer Ahmad <zaheer.mot at gmail.com> on 2010-09-03
    Reviewed by Darin Adler.
    
    Move the JSTimeRanges outside ENABLE_VIDEO in GNUMakefile.am
    * WebCore/GNUMakefile.am
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66736 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c43b33d..0efd04a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-03  Zaheer Ahmad <zaheer.mot at gmail.com>
+
+        Reviewed by Darin Adler.
+
+        [GTK] compilation issue with JSTimeRanges when video turned off
+        https://bugs.webkit.org/show_bug.cgi?id=44249
+
+        Move the JSTimeRanges outside ENABLE_VIDEO in GNUMakefile.am
+        * WebCore/GNUMakefile.am
+
 2010-09-03  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 9f7eef3..d361810 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -391,6 +391,8 @@ webcore_built_sources += \
 	DerivedSources/WebCore/JSHTMLUListElement.h \
 	DerivedSources/WebCore/JSHTMLVideoElement.cpp \
 	DerivedSources/WebCore/JSHTMLVideoElement.h \
+	DerivedSources/WebCore/JSTimeRanges.cpp \
+	DerivedSources/WebCore/JSTimeRanges.h \
 	DerivedSources/WebCore/JSImageData.cpp \
 	DerivedSources/WebCore/JSImageData.h \
 	DerivedSources/WebCore/JSInjectedScriptHost.cpp \
@@ -3134,10 +3136,6 @@ if ENABLE_DEBUG
 webcore_cppflags += -DGST_DISABLE_DEPRECATED
 endif # END ENABLE_DEBUG
 
-webcore_built_sources += \
-	DerivedSources/WebCore/JSTimeRanges.cpp \
-	DerivedSources/WebCore/JSTimeRanges.h
-
 webcore_sources += \
 	WebCore/bindings/js/JSAudioConstructor.cpp \
 	WebCore/bindings/js/JSAudioConstructor.h \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list