[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 15:53:41 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 10cf035cb2d71336cc0fab1c36fb86d9d05c0ae9
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 16 09:01:12 2010 +0000
2010-11-16 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
[CMake] Remove platform dependent include directories
https://bugs.webkit.org/show_bug.cgi?id=49553
* CMakeLists.txt:
2010-11-16 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
[CMake] Add platform dependent include directories
https://bugs.webkit.org/show_bug.cgi?id=49553
* CMakeListsEfl.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72067 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/CMakeLists.txt b/WebKit/CMakeLists.txt
index 0d3edca..57557e3 100644
--- a/WebKit/CMakeLists.txt
+++ b/WebKit/CMakeLists.txt
@@ -20,7 +20,6 @@ SET(WebKit_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform"
"${WEBCORE_DIR}/platform/animation"
"${WEBCORE_DIR}/platform/graphics"
- "${WEBCORE_DIR}/platform/graphics/cairo"
"${WEBCORE_DIR}/platform/graphics/transforms"
"${WEBCORE_DIR}/platform/network"
"${WEBCORE_DIR}/platform/sql"
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 16b53e9..9c29e83 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-16 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [CMake] Remove platform dependent include directories
+ https://bugs.webkit.org/show_bug.cgi?id=49553
+
+ * CMakeLists.txt:
+
2010-11-12 John Knottenbelt <jknotten at chromium.org>
Reviewed by Steve Block.
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index d2c70b9..7abbc17 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -11,6 +11,7 @@ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
"${WEBKIT_DIR}/efl/ewk"
"${WEBKIT_DIR}/efl/WebCoreSupport"
"${WEBCORE_DIR}/platform/efl"
+ "${WEBCORE_DIR}/platform/graphics/cairo"
${Cairo_INCLUDE_DIRS}
${ECORE_X_INCLUDE_DIRS}
${EDJE_INCLUDE_DIRS}
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index cc38037..5228f4c 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-16 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [CMake] Add platform dependent include directories
+ https://bugs.webkit.org/show_bug.cgi?id=49553
+
+ * CMakeListsEfl.txt:
+
2010-11-14 Ryuan Choi <ryuan.choi at samsung.com>
Reviewed by Martin Robinson.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list