diff -r ../pristine/inkscape-0.46/src/dialogs/export.cpp ./src/dialogs/export.cpp
356c356
<         directory = g_dirname(file_entry_text);
---
>         directory = g_path_get_dirname(file_entry_text);
363c363
<             directory = g_dirname(SP_DOCUMENT_URI(SP_ACTIVE_DOCUMENT));
---
>             directory = g_path_get_dirname(SP_DOCUMENT_URI(SP_ACTIVE_DOCUMENT));
1054c1054
<       if (g_strcasecmp (dot + 1, extension) == 0)
---
>         if (g_ascii_strcasecmp(dot + 1, extension) == 0)
diff -r ../pristine/inkscape-0.46/src/nodepath.cpp ./src/nodepath.cpp
90,91d89
< static GMemChunk *nodechunk = NULL;
< 
4117,4120c4115
<     if (nodechunk == NULL)
<         nodechunk = g_mem_chunk_create(Inkscape::NodePath::Node, 32, G_ALLOC_AND_FREE);
< 
<     Inkscape::NodePath::Node *n = (Inkscape::NodePath::Node*)g_mem_chunk_alloc(nodechunk);
---
>     Inkscape::NodePath::Node *n = (Inkscape::NodePath::Node*)g_slice_new(Inkscape::NodePath::Node);
4272c4267
<     g_mem_chunk_free(nodechunk, node);
---
>     g_slice_free(Inkscape::NodePath::Node, node);
diff -r ../pristine/inkscape-0.46/src/prefix.cpp ./src/prefix.cpp
349c349
<  * Extracts the directory component of path. Similar to g_dirname() or the dirname
---
>  * Extracts the directory component of path. Similar to g_path_get_dirname() or the dirname
diff -r ../pristine/inkscape-0.46/src/sp-namedview.cpp ./src/sp-namedview.cpp
930,932c930,932
<         if (!g_strcasecmp(str, "true") ||
<             !g_strcasecmp(str, "yes") ||
<             !g_strcasecmp(str, "y") ||
---
>         if (!g_ascii_strcasecmp(str, "true") ||
>             !g_ascii_strcasecmp(str, "yes") ||
>             !g_ascii_strcasecmp(str, "y") ||
diff -r ../pristine/inkscape-0.46/src/widgets/desktop-widget.cpp ./src/widgets/desktop-widget.cpp
609,611c609,611
<         gchar const *fname = ( TRUE
<                                ? uri
<                                : g_basename(uri) );
---
>         gchar *fname = ( TRUE
>                          ? g_strdup(uri)
>                          : g_path_get_basename(uri) );
626a627
>         g_free(fname);
diff -r ../pristine/inkscape-0.46/src/xml/repr-util.cpp ./src/xml/repr-util.cpp
466,468c466,468
<         if (!g_strcasecmp(v, "true") ||
<             !g_strcasecmp(v, "yes" ) ||
<             !g_strcasecmp(v, "y"   ) ||
---
>         if (!g_ascii_strcasecmp(v, "true") ||
>             !g_ascii_strcasecmp(v, "yes" ) ||
>             !g_ascii_strcasecmp(v, "y"   ) ||