[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
xan at webkit.org
xan at webkit.org
Wed Dec 22 18:29:27 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6933f0b20698142ef660a3ba4ea56c590897aba3
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Dec 12 12:00:36 2010 +0000
2010-12-12 Xan Lopez <xlopez at igalia.com>
Rubber-stamped by Gustavo Noronha.
Stop checking for glib >= 2.16, we have dependend on a newer
version for a long time now.
* tests/testatk.c: Stop checking for glib >= 2.16.
* tests/testatkroles.c: ditto.
* tests/testdomdocument.c: ditto.
* tests/testdomdomwindow.c: ditto.
* tests/testdomnode.c: ditto.
* tests/testglobals.c: ditto.
* tests/testhttpbackend.c: ditto.
* tests/testloading.c: ditto.
* tests/testmimehandling.c: ditto.
* tests/testnetworkrequest.c: ditto.
* tests/testnetworkresponse.c: ditto.
* tests/testwebbackforwardlist.c: ditto.
* tests/testwebdatasource.c: ditto.
* tests/testwebframe.c: ditto.
* tests/testwebhistoryitem.c: ditto.
* tests/testwebresource.c: ditto.
* tests/testwebsettings.c: ditto.
* tests/testwebview.c: ditto.
* tests/testwindow.c: ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73874 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 760039b..6ff86a2 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,30 @@
+2010-12-12 Xan Lopez <xlopez at igalia.com>
+
+ Rubber-stamped by Gustavo Noronha.
+
+ Stop checking for glib >= 2.16, we have dependend on a newer
+ version for a long time now.
+
+ * tests/testatk.c: Stop checking for glib >= 2.16.
+ * tests/testatkroles.c: ditto.
+ * tests/testdomdocument.c: ditto.
+ * tests/testdomdomwindow.c: ditto.
+ * tests/testdomnode.c: ditto.
+ * tests/testglobals.c: ditto.
+ * tests/testhttpbackend.c: ditto.
+ * tests/testloading.c: ditto.
+ * tests/testmimehandling.c: ditto.
+ * tests/testnetworkrequest.c: ditto.
+ * tests/testnetworkresponse.c: ditto.
+ * tests/testwebbackforwardlist.c: ditto.
+ * tests/testwebdatasource.c: ditto.
+ * tests/testwebframe.c: ditto.
+ * tests/testwebhistoryitem.c: ditto.
+ * tests/testwebresource.c: ditto.
+ * tests/testwebsettings.c: ditto.
+ * tests/testwebview.c: ditto.
+ * tests/testwindow.c: ditto.
+
2010-12-11 Xan Lopez <xlopez at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/tests/testatk.c b/WebKit/gtk/tests/testatk.c
index abd6091..1ee6c55 100644
--- a/WebKit/gtk/tests/testatk.c
+++ b/WebKit/gtk/tests/testatk.c
@@ -24,7 +24,7 @@
#include <unistd.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
static const char* centeredContents = "<html><body><p style='text-align: center;'>Short line</p><p style='text-align: center;'>Long-size line with some foo bar baz content</p><p style='text-align: center;'>Short line</p><p style='text-align: center;'>This is a multi-line paragraph<br />where the first line<br />is the biggest one</p></body></html>";
@@ -1338,7 +1338,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testatkroles.c b/WebKit/gtk/tests/testatkroles.c
index 5fd08b0..5ad6b5f 100644
--- a/WebKit/gtk/tests/testatkroles.c
+++ b/WebKit/gtk/tests/testatkroles.c
@@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
/* Non form roles */
#define HTML_DOCUMENT_FRAME "<html><body>This is a test.</body></html>"
@@ -421,7 +421,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testdomdocument.c b/WebKit/gtk/tests/testdomdocument.c
index 56e233f..aa6cbb3 100644
--- a/WebKit/gtk/tests/testdomdocument.c
+++ b/WebKit/gtk/tests/testdomdocument.c
@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
#define HTML_DOCUMENT_TITLE "<html><head><title>This is the title</title></head><body></body></html>"
#define HTML_DOCUMENT_ELEMENTS "<html><body><ul><li>1</li><li>2</li><li>3</li></ul></body></html>"
@@ -368,7 +368,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testdomdomwindow.c b/WebKit/gtk/tests/testdomdomwindow.c
index a52bca5..b15558e 100644
--- a/WebKit/gtk/tests/testdomdomwindow.c
+++ b/WebKit/gtk/tests/testdomdomwindow.c
@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
#define HTML_DOCUMENT "<html><head><title>This is the title</title></head><body><p id='test'>test</p></body></html>"
@@ -222,7 +222,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testdomnode.c b/WebKit/gtk/tests/testdomnode.c
index 7d62720..893b7cc 100644
--- a/WebKit/gtk/tests/testdomnode.c
+++ b/WebKit/gtk/tests/testdomnode.c
@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
#define HTML_DOCUMENT_HIERARCHY_NAVIGATION "<html><head><title>This is the title</title></head><body><p>1</p><p>2</p><p>3</p></body></html>"
#define HTML_DOCUMENT_NODE_INSERTION "<html><body></body></html>"
@@ -199,7 +199,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testglobals.c b/WebKit/gtk/tests/testglobals.c
index e53edf4..da0ffa3 100644
--- a/WebKit/gtk/tests/testglobals.c
+++ b/WebKit/gtk/tests/testglobals.c
@@ -21,7 +21,7 @@
#include <libsoup/soup.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
// Make sure the session is initialized properly when webkit_get_default_session() is called.
static void test_globals_default_session()
@@ -59,7 +59,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testhttpbackend.c b/WebKit/gtk/tests/testhttpbackend.c
index c061374..f0fac16 100644
--- a/WebKit/gtk/tests/testhttpbackend.c
+++ b/WebKit/gtk/tests/testhttpbackend.c
@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
// Not yet public API
SoupMessage* webkit_network_request_get_message(WebKitNetworkRequest* request);
@@ -79,7 +79,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testloading.c b/WebKit/gtk/tests/testloading.c
index fd9a05c..a0ec8c9 100644
--- a/WebKit/gtk/tests/testloading.c
+++ b/WebKit/gtk/tests/testloading.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
/* This string has to be rather big because of the cancelled test - it
* looks like soup refuses to send or receive a too small chunk */
@@ -438,7 +438,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testmimehandling.c b/WebKit/gtk/tests/testmimehandling.c
index 2d6c623..dcfc3a3 100644
--- a/WebKit/gtk/tests/testmimehandling.c
+++ b/WebKit/gtk/tests/testmimehandling.c
@@ -27,7 +27,7 @@
#include <webkit/webkit.h>
#include <unistd.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
GMainLoop* loop;
SoupSession *session;
@@ -221,7 +221,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testnetworkrequest.c b/WebKit/gtk/tests/testnetworkrequest.c
index 40f8e7f..fb6ec41 100644
--- a/WebKit/gtk/tests/testnetworkrequest.c
+++ b/WebKit/gtk/tests/testnetworkrequest.c
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
static void test_network_request_create_destroy()
{
@@ -100,7 +100,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testnetworkresponse.c b/WebKit/gtk/tests/testnetworkresponse.c
index 9050c04..90062c6 100644
--- a/WebKit/gtk/tests/testnetworkresponse.c
+++ b/WebKit/gtk/tests/testnetworkresponse.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
static void test_network_response_create_destroy()
{
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testwebbackforwardlist.c b/WebKit/gtk/tests/testwebbackforwardlist.c
index 2109840..b9e395e 100644
--- a/WebKit/gtk/tests/testwebbackforwardlist.c
+++ b/WebKit/gtk/tests/testwebbackforwardlist.c
@@ -21,7 +21,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
static void test_webkit_web_history_item_lifetime(void)
{
@@ -330,7 +330,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testwebdatasource.c b/WebKit/gtk/tests/testwebdatasource.c
index 638ff10..96d95e4 100644
--- a/WebKit/gtk/tests/testwebdatasource.c
+++ b/WebKit/gtk/tests/testwebdatasource.c
@@ -21,7 +21,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
static const gshort defaultTimeout = 10;
guint waitTimer;
@@ -246,7 +246,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testwebframe.c b/WebKit/gtk/tests/testwebframe.c
index 59c7c2b..d1ff7ea 100644
--- a/WebKit/gtk/tests/testwebframe.c
+++ b/WebKit/gtk/tests/testwebframe.c
@@ -25,7 +25,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
static int numberOfFramesCreated = 0;
@@ -224,7 +224,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testwebhistoryitem.c b/WebKit/gtk/tests/testwebhistoryitem.c
index b940afb..362dc98 100644
--- a/WebKit/gtk/tests/testwebhistoryitem.c
+++ b/WebKit/gtk/tests/testwebhistoryitem.c
@@ -21,7 +21,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
typedef struct {
WebKitWebHistoryItem* item;
@@ -74,7 +74,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testwebresource.c b/WebKit/gtk/tests/testwebresource.c
index d699c91..1b893a9 100644
--- a/WebKit/gtk/tests/testwebresource.c
+++ b/WebKit/gtk/tests/testwebresource.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
#define INDEX_HTML "<html></html>"
#define MAIN_HTML "<html><head><script language=\"javascript\" src=\"/javascript.js\"></script></head><body><h1>hah</h1></html>"
@@ -335,7 +335,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testwebsettings.c b/WebKit/gtk/tests/testwebsettings.c
index 8c77def..4db929a 100644
--- a/WebKit/gtk/tests/testwebsettings.c
+++ b/WebKit/gtk/tests/testwebsettings.c
@@ -21,7 +21,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
static void test_webkit_web_settings_user_agent(void)
{
@@ -74,7 +74,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testwebview.c b/WebKit/gtk/tests/testwebview.c
index 36511d7..76debcc 100644
--- a/WebKit/gtk/tests/testwebview.c
+++ b/WebKit/gtk/tests/testwebview.c
@@ -29,7 +29,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
GMainLoop* loop;
SoupSession *session;
@@ -371,7 +371,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
diff --git a/WebKit/gtk/tests/testwindow.c b/WebKit/gtk/tests/testwindow.c
index 106f934..ecd6609 100644
--- a/WebKit/gtk/tests/testwindow.c
+++ b/WebKit/gtk/tests/testwindow.c
@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include <webkit/webkit.h>
-#if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
+#if GTK_CHECK_VERSION(2, 14, 0)
static void notify_load_status_cb(WebKitWebView* web_view, GParamSpec* pspec, gpointer data)
{
@@ -123,7 +123,7 @@ int main(int argc, char** argv)
#else
int main(int argc, char** argv)
{
- g_critical("You will need at least glib-2.16.0 and gtk-2.14.0 to run the unit tests. Doing nothing now.");
+ g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
return 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list