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

eric at webkit.org eric at webkit.org
Fri Feb 26 22:20:09 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit e4d1c320ad8ea6d057bb51177d25b57872038434
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 17:46:38 2010 +0000

    2010-02-15  Emilio Pozuelo Monfort  <pochu27 at gmail.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Fails to build on GNU/Hurd because of PATH_MAX usage
            https://bugs.webkit.org/show_bug.cgi?id=34920
    
            Use dynamic allocation instead of fixed PATH_MAX size buffers to
            fix the build on GNU/Hurd, where PATH_MAX is undefined.
    
            * tests/testmimehandling.c:
            (main):
            * tests/testwebview.c:
            (main):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54779 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 8fdd05e..d237387 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-15  Emilio Pozuelo Monfort  <pochu27 at gmail.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Fails to build on GNU/Hurd because of PATH_MAX usage
+        https://bugs.webkit.org/show_bug.cgi?id=34920
+
+        Use dynamic allocation instead of fixed PATH_MAX size buffers to
+        fix the build on GNU/Hurd, where PATH_MAX is undefined.
+
+        * tests/testmimehandling.c:
+        (main):
+        * tests/testwebview.c:
+        (main):
+
 2010-02-14  Diego Escalante Urrelo  <descalante at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/gtk/tests/testmimehandling.c b/WebKit/gtk/tests/testmimehandling.c
index bfe3148..e6e8d45 100644
--- a/WebKit/gtk/tests/testmimehandling.c
+++ b/WebKit/gtk/tests/testmimehandling.c
@@ -183,11 +183,12 @@ int main(int argc, char** argv)
 
     /* Hopefully make test independent of the path it's called from. */
     while (!g_file_test ("WebKit/gtk/tests/resources/test.html", G_FILE_TEST_EXISTS)) {
-        char path_name[PATH_MAX];
+        gchar *path_name;
 
         g_chdir("..");
 
-        g_assert(!g_str_equal(getcwd(path_name, PATH_MAX), "/"));
+        g_assert(!g_str_equal((path_name = g_get_current_dir()), "/"));
+        g_free(path_name);
     }
 
     g_chdir("WebKit/gtk/tests/resources/");
diff --git a/WebKit/gtk/tests/testwebview.c b/WebKit/gtk/tests/testwebview.c
index c028a36..34b6867 100644
--- a/WebKit/gtk/tests/testwebview.c
+++ b/WebKit/gtk/tests/testwebview.c
@@ -234,11 +234,12 @@ int main(int argc, char** argv)
 
     /* Hopefully make test independent of the path it's called from. */
     while (!g_file_test ("WebKit/gtk/tests/resources/test.html", G_FILE_TEST_EXISTS)) {
-        char path_name[PATH_MAX];
+        gchar *path_name;
 
         g_chdir("..");
 
-        g_assert(!g_str_equal(getcwd(path_name, PATH_MAX), "/"));
+        g_assert(!g_str_equal((path_name = g_get_current_dir()), "/"));
+        g_free(path_name);
     }
 
     g_chdir("WebKit/gtk/tests/resources/");

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list