Inkscape Devel

Thread Start a new thread

Download

inkscape-devel@lists.inkscape.org

4 participants
12945 discussions

[0.41] Fix link: Move functions from splivarot.cpp to xml/
by Peter Moulder 06 Feb '05

06 Feb '05

A couple of utility functions in splivarot.cpp have become used by xml/repr-util.cpp. The attached patch moves these two functions (LCA and AncetreFils) to new files xml/repr-sorting.{cpp,h} in xml/libspxml.a. This is appropriate for cleanliness, and also fixes a link problem with `make check'. Since we're in hard freeze, I haven't renamed these functions. (N.B. Remember to do `cvs add -ko xml/repr-sorting.{cpp,h}' after applying this patch.) The patch (like the gc one, I should have mentioned in the previous message) is from the src directory. pjrm.

2 2

[0/5]: patches for clean "make check"
by Kees Cook 05 Feb '05

05 Feb '05

Following this email are five patch sets (whose apply order matters). This is a full roll-up of changes Peter and I worked on last night with some additional updates to get "make check" to fully pass. 1/5: compile cleanups only This is makefile goo for getting "make check" to compile correctly. 2/5: test code changes only This is test-code changes only. No core code changes are needed to make these tests pass "make check". 3/5: core code changes for repr-action-test compiling This is a change to the way core code is layed out in the tree, to help compile repr-action-test more easily. The functions are unchanged. 4/5: core code changes for repr-action-test behavior This changes when an undo session is released, down in simple-session. This lets repr-action-test pass its tests. The only caller to sp_repr_rollback is sp_document_cancel. sp_document_cancel isn't easily callable, since the three calls to it currently would only happen during repr tree breakage in the XML editor. I think this is safe. 5/5: win32 file list updates This is just a final sync of all the above file changes, as seen by the win32 file list building tools. "make check" finished, but "make distcheck" does not, as streamtest depends on files local to its directory, which is against build rules for "distcheck". I will fix it later, since I made it relocatable in patch #2. -- Kees Cook @outflux.net

4 4

[4/5]: core code changes for repr-action-test behavior
by Kees Cook 05 Feb '05

05 Feb '05

attached. -- Kees Cook @outflux.net

3 2

[1/5]: compile cleanups only
by Kees Cook 05 Feb '05

05 Feb '05

attached. -- Kees Cook @outflux.net

2 1

[5/5]: win32 file list updates
by Kees Cook 05 Feb '05

05 Feb '05

attached. -- Kees Cook @outflux.net

1 0

[3/5]: core code changes for repr-action-test compiling
by Kees Cook 05 Feb '05

05 Feb '05

attached. -- Kees Cook @outflux.net

1 0

[2/5]: test code changes only
by Kees Cook 05 Feb '05

05 Feb '05

attached. -- Kees Cook @outflux.net

1 0

RE: [Inkscape-devel] Inkboard linking/dependencies
by Montgomery, Steven S 05 Feb '05

05 Feb '05

I've went ahead and included the extern lines: however, that's a different issue than what we were having. The undefined reference we have is to functions we wrote in inkboard.cpp. Here they are from the most recent attempt: dialogs/libspdialogs.a(InkboardMsg.o)(.text+0xa7a): In function `sp_inkBMsg_ObjectAddedChild': dialogs/InkboardMsg.cpp:436: undefined reference to `sendChange(char*)' dialogs/libspdialogs.a(InkboardMsg.o)(.text+0xc92): In function `sp_inkBMsg_ObjectRemovedChild': dialogs/InkboardMsg.cpp:519: undefined reference to `sendChange(char*)' dialogs/libspdialogs.a(InkboardMsg.o)(.text+0xe4d): In function `sp_inkBMsg_ObjectChanged': dialogs/InkboardMsg.cpp:624: undefined reference to `sendChange(char*)' dialogs/libspdialogs.a(inkboard-connect.o)(.text+0xa97): In function `sp_inkboardConnect_dialog_inkboardConnect(_GObject*, _GObject*)': dialogs/inkboard-connect.cpp:228: undefined reference to `connect_and_auth(char*, char*, char*)' dialogs/libspdialogs.a(inkboard-connect.o)(.text+0xacf):dialogs/inkboard -connect.cpp:238: undefined reference to `setRecipient(char const*)' dialogs/libspdialogs.a(inkboard-connect.o)(.text+0x138f): In function `sp_inkboardConnect_dialog_inkboardShareUser(_GObject*, _GObject*)': dialogs/inkboard-connect.cpp:393: undefined reference to `send_connect_request_to_user(char const*, char*)' I suspect you didn't get that error when you checked out of the CVS. Line 8 of inkboard.cpp should be #include "dialogs/InkboardMsg.h" instead of #include "dialogs/InkboardMsg.cpp". I hesitate to upload that change since we've been following the convention of only committing changes after we ensure that it at least compiles. For a reason I don't fully understand, including that .cpp somehow informs the linker of where our new functions are defined. Thanks for the help on this. Steven -----Original Message----- From: inkscape-devel-admin(a)lists.sourceforge.net [mailto:inkscape-devel-admin@lists.sourceforge.net] On Behalf Of Bryce Harrington Sent: Friday, February 04, 2005 1:43 AM To: Montgomery, Steven S Cc: inkscape-devel(a)lists.sourceforge.net Subject: RE: [Inkscape-devel] Inkboard linking/dependencies On Thu, 3 Feb 2005, Montgomery, Steven S wrote: > No, we don't have our code linking normally. Since it was such a > brickwall for our progress, we moved the Jabber code into a file we > added under dialogs(where it was being called from). Obviously this > links, but we definitely would like to separate the code back out how it > should be. > > I've seen some recent posts about automake 1.9 causing problems for some > people. Perhaps that is our issue as well? Okay, I think we got this one figured out tonight. Check out our discussion in today's jabber logs here: http://inkscape.gristle.org/2005-02-03.txt Basically, loudmouth is set up to link in C style but since Inkscape is C++, libs are linked in C++ style. You can direct the linker to link the loudmouth functions in C style like this: diff -p -u -r1.4 inkboard.h --- inkboard.h 3 Feb 2005 20:19:33 -0000 1.4 +++ inkboard.h 4 Feb 2005 06:21:55 -0000 @@ -1,7 +1,10 @@ //Inkboard.h +extern "C" { #include <loudmouth/loudmouth.h> +}; + //#include "inkboard-TimedMessageNode.h" #define TEST_RECEPTION 1 Bryce ------------------------------------------------------- This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting Tool for open source databases. Create drag-&-drop reports. Save time by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc. Download a FREE copy at http://www.intelliview.com/go/osdn_nl _______________________________________________ Inkscape-devel mailing list Inkscape-devel(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel

2 1

[0.41] Possible bezier test fix
by Peter Moulder 05 Feb '05

05 Feb '05

As mentioned on jabber, i haven't even *compiled* this patch yet, let alone checked whether it fixes the test failure. I send it now because it's bed time, and it'll take a while on this machine to compile with optimization enabled. (The test doesn't fail without optimization enabled, on my machine.) As usual, the patch is relative to the src/ directory. pjrm.

1 0

0.41 "make check" progress
by Kees Cook 05 Feb '05

05 Feb '05

Peter and I managed to nail down almost all the issues with "make check". This patch includes Peter's earlier ones, and is almost entirely changes to test code, or Makefile goo. There are still two tests failing (and unless they're simple, I would vote to ignore them, since I'm not sure they were run for the 0.40 release... anyone know?) src/xml/repr-action-test src/display/bezier-utils-test I'll try to get 0.41pre1 packaged tomorrow. (This patch does not, however, include mental's update, which I think looks fine to go in.) -- Kees Cook @outflux.net

1 0

Jump to page: