Patch applied. Thanks! Also fixed bug in toggling on tensor nodes.
Tav
On Thu, 2012-01-12 at 11:44 +0000, Alex Valavanis wrote:
Yes, it's a case of us being forced to switch to glib top-level headers for glib 2.31 support. It was fixed in lp:inkscape r10762 (patch attached). I *think* that's the only necessary change for now. At some point, I'll get round to top-level-ication of all the rest of the gnome library headers but they shouldn't cause any other build failures (yet!)
AV
On 12 January 2012 11:24, ~suv <suv-sf@...58...> wrote:
On 12/01/2012 03:24, Josh Andler wrote:
On 11/01/2012 14:16, Tavmjong Bah wrote:
My branch can be found at:
On Ubuntu Precise I'm getting the following when trying to compile, I don't hit it in either trunk or the 0.48.x branch... also, bzr status shows everything as being kosher.
CXX dir-util.o dir-util.cpp: In function ‘std::string sp_relative_path_from_path(const string&, const string&)’: dir-util.cpp:21:42: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:27:36: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp: In function ‘const char* sp_extension_from_path(const char*)’: dir-util.cpp:54:31: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp: At global scope: dir-util.cpp:63:39: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp: In function ‘char* inkscape_rel2abs(const char*, const char*, char*, size_t)’: dir-util.cpp:74:16: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:95:18: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:100:22: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:111:20: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:119:33: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:129:33: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:141:27: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp: In function ‘char* inkscape_abs2rel(const char*, const char*, char*, size_t)’: dir-util.cpp:160:18: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:177:20: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:179:33: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:191:32: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp:196:20: error: ‘G_DIR_SEPARATOR’ was not declared in this scope dir-util.cpp: In function ‘gchar* prepend_current_dir_if_relative(const gchar*)’: dir-util.cpp:230:33: error: ‘g_get_current_dir’ was not declared in this scope make[3]: *** [dir-util.o] Error 1
This was fixed (or addressed) in trunk already, see Bug #901599 https://bugs.launchpad.net/inkscape/+bug/901599 “dir-util.o fails to build with glib 2.31 in Ubuntu precise”
The relevant revision in trunk appears to have been on 2011-12-08: http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10762 but maybe there are additional related commits (@Alex, could you comment?).
AFAICT, the last merge of trunk into the mesh branch was done some time ago (2011-10-31): http://bazaar.launchpad.net/~tavmjong-free/inkscape/mesh/changes
<off-topic> Yesterday, I tried for the first time and succeeded to build the mesh branch on OS X 10.7.2 Lion, with cairo from git master ;) </off-topic>
~suv