Re: osx fixes for marble / subsurface build.

2015-04-27 Thread Tomaz Canabrava
Jan, what file / line?

On Mon, Apr 27, 2015, 05:30 Jan Mulder jlmul...@xs4all.nl wrote:

 On 04/26/15 20:51, Tomaz Canabrava wrote:

  fixed issue with CMake on marble ( that used the incorrect path for
  the library )
  fixed a few issues with build.sh / subsurface
 
  please note that this shouldn`t break anything for non mac users, and
  mac users - please note that this shouldn`t break anything, but
  instead make it work.

 Hard coded reference to .dylib  library files break the build on (I
 expect) all non-mac users. My build (on Arch Linux) succeeded by simply
 renaming it to .so
 ___
 subsurface mailing list
 subsurface@subsurface-divelog.org
 http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface


Re: osx fixes for marble / subsurface build.

2015-04-27 Thread Tomaz Canabrava
HM... Can you change that to find of its dawin passou a dylib and a .so
otherwise? I cant do that now and this is important. :(

On Mon, Apr 27, 2015, 07:33 Jan Mulder jlmul...@xs4all.nl wrote:

 On 04/27/15 12:28, Tomaz Canabrava wrote:


 On Mon, Apr 27, 2015, 05:30 Jan Mulder jlmul...@xs4all.nl wrote:

 On 04/26/15 20:51, Tomaz Canabrava wrote:

  fixed issue with CMake on marble ( that used the incorrect path for
  the library )
  fixed a few issues with build.sh / subsurface
 
  please note that this shouldn`t break anything for non mac users, and
  mac users - please note that this shouldn`t break anything, but
  instead make it work.

 Hard coded reference to .dylib  library files break the build on (I
 expect) all non-mac users. My build (on Arch Linux) succeeded by simply
 renaming it to .so


  Jan, what file / line?


 In the ./scripts/build.sh script. At the very end (line 109). The part
 that you added in this patch.

___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface


Re: osx fixes for marble / subsurface build.

2015-04-27 Thread Jan Mulder

On 04/26/15 20:51, Tomaz Canabrava wrote:

fixed issue with CMake on marble ( that used the incorrect path for 
the library )

fixed a few issues with build.sh / subsurface

please note that this shouldn`t break anything for non mac users, and 
mac users - please note that this shouldn`t break anything, but 
instead make it work.


Hard coded reference to .dylib  library files break the build on (I 
expect) all non-mac users. My build (on Arch Linux) succeeded by simply 
renaming it to .so

___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface


Re: osx fixes for marble / subsurface build.

2015-04-26 Thread Tomaz Canabrava
this is the marble patch.

On Sun, Apr 26, 2015 at 3:51 PM, Tomaz Canabrava tcanabr...@kde.org wrote:

 People,

 I got many many issues trying to make this works reasonably well:

 fixed issue with CMake on marble ( that used the incorrect path for the
 library )
 fixed a few issues with build.sh / subsurface

 please note that this shouldn`t break anything for non mac users, and mac
 users - please note that this shouldn`t break anything, but instead make it
 work.

 we don`t need libgit from brew anymore, and it`s hardcoded to use our copy
 from the build script.

 I just rebuild my entire subsurface from scratch ( together with libgit,
 libmarble, libdivecomputer ) and it worked, I sincerely hope it will work
 for all of you.

 please note that one of the patches is a MARBLE patch, that Ill attach in
 a next e-mail to avoid confusion, but things should be applied in
 subsurface and marble before trying to compile.





0001-Fixed-deployment-of-the-marble-library-with-correct-.patch
Description: Binary data
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface


osx fixes for marble / subsurface build.

2015-04-26 Thread Tomaz Canabrava
People,

I got many many issues trying to make this works reasonably well:

fixed issue with CMake on marble ( that used the incorrect path for the
library )
fixed a few issues with build.sh / subsurface

please note that this shouldn`t break anything for non mac users, and mac
users - please note that this shouldn`t break anything, but instead make it
work.

we don`t need libgit from brew anymore, and it`s hardcoded to use our copy
from the build script.

I just rebuild my entire subsurface from scratch ( together with libgit,
libmarble, libdivecomputer ) and it worked, I sincerely hope it will work
for all of you.

please note that one of the patches is a MARBLE patch, that Ill attach in a
next e-mail to avoid confusion, but things should be applied in subsurface
and marble before trying to compile.


0001-Don-t-deppend-on-CMake-to-find-the-right-libraries.patch
Description: Binary data


0002-CMake-needs-hints-that-this-will-be-a-win32-or-a-mac.patch
Description: Binary data


0003-Always-reconfigure-libdivecomputer.patch
Description: Binary data


0004-Do-not-call-install_name_tool-for-Marble-library.patch
Description: Binary data
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface