1182368 - Fix fallout from bug 905127 due to missing headers for purplexpcom

Status: RESOLVED FIXED

(Chat Core :: General, defect)

Description

[Patrick Cloke [:clokep]]

Attachment: Fix compilation

Some bustages in purpleAccount and purpleProtocol due to bug 905127.

I've attached a patch which gets purplexpcom to compile, but it does not link:

 0:19.87 Undefined symbols for architecture x86_64:
 0:19.87   "NS_NewFileURI(nsIURI**, nsIFile*, nsIIOService*)", referenced from:
 0:19.87       purpleAccountBuddy::GetBuddyIconFilename(nsACString&) in purpleAccountBuddy.o
 0:19.87   "NS_IsOffline()", referenced from:
 0:19.87       purpleAccount::Connect() in purpleAccount.o
 0:19.87       purpleDNS::Resolve(_PurpleDnsQueryData*, void (*)(_PurpleDnsQueryData*, _GSList*), void (*)(_PurpleDnsQueryData*, char const*)) in purpleDNS.o
 0:19.87       purpleSocketWatcher::AddWatch(int, PurpleInputCondition, void (*)(void*, int, PurpleInputCondition), void*) in purpleSockets.o
 0:19.87 ld: symbol(s) not found for architecture x86_64
 0:19.87 clang: error: linker command failed with exit code 1 (use -v to see invocation)
 0:19.87 make[4]: *** [libpurplexpcom.dylib] Error 1
 0:19.87 make[3]: *** [extensions/purple/purplexpcom/src/target] Error 2
 0:19.87 make[2]: *** [compile] Error 2
 0:19.87 make[1]: *** [compile] Error 2
 0:19.87 make: *** [default] Error 2

Comment 1

[aleth [:aleth]]

Maybe comment 18 - 25 in bug 905127 help with the linking?

Comment 2

[Patrick Cloke [:clokep]]

(In reply to aleth [:aleth] from comment #1)
> Maybe comment 18 - 25 in bug 905127 help with the linking?

Hmm...so there is this nsNetUtil.inl file, but it doesn't seem to include NS_IsOffline or NS_NewFileURI, which are the functions that we need...maybe I need to define some external linkage thing?

Comment 3

[aleth [:aleth]]

(In reply to Patrick Cloke [:clokep] from comment #2)
> (In reply to aleth [:aleth] from comment #1)
> > Maybe comment 18 - 25 in bug 905127 help with the linking?
> 
> Hmm...so there is this nsNetUtil.inl file, but it doesn't seem to include
> NS_IsOffline or NS_NewFileURI, which are the functions that we need...maybe
> I need to define some external linkage thing?

Since "The functions that need to be seen by external code or that change their behavior when used by external code are contained in nsNetUtil.inl." I guess what's needed is to get those two functions added there.

Comment 4

[Patrick Cloke [:clokep]]

Florian suggested on IRC:
11:11:08 AM - flo-retina: clokep_work: if NS_NewFileURI turns out to be a pain, it's trivial to inline in our code: http://mxr.mozilla.org/mozilla-central/source/netwerk/base/nsNetUtil.cpp#120
11:11:45 AM - flo-retina: NS_IsOffline is easy too: http://mxr.mozilla.org/mozilla-central/source/netwerk/base/nsNetUtil.cpp#1404

Comment 5

[Patrick Cloke [:clokep]]

http://hg.mozilla.org/users/florian_queze.net/purple/rev/21c486b08dda

We should still be busted after this...

Comment 6

[Dragana Damjanovic [:dragana]]

Have added patch from bug 1183579, it isn't in mozilla central jet. if you have applied the patch, can you tell me how to build purplexpcom from mozilla central.

Comment 7

[Patrick Cloke [:clokep]]

Dragana, Florian applied the patch this morning and it worked fine for him. Thanks for fixing this! :)

Comment 8

[Florian Quèze [:florian]]

(In reply to Patrick Cloke [:clokep] from comment #7)
> Dragana, Florian applied the patch this morning and it worked fine for him.
> Thanks for fixing this! :)

I actually verified the patch fixes the compile issue on both Linux and Mac.

Comment 9

[Patrick Cloke [:clokep]]

This should be fixed now!