Commit graph

8 commits

Author SHA1 Message Date
Orivej Desh
a4085e28b1 subsurface: 4.6.0 -> 4.7.2 2017-11-05 03:38:37 +00:00
Vladimír Čunát
24b1c6ee88
subsurface: disable parallel make
It was failing on Hydra:
http://hydra.nixos.org/build/48847277/nixlog/2/raw
2017-02-17 11:39:21 +01:00
Peter Hoeg
9550686be8 subsurface: 4.5.97 -> 4.6.0 (#22615)
We do a few more things:

 - libmarble and libdivecomputer with the subsurface patches have both been
   inlined for 2 reasons:
   a) nobody else is using these forks
   b) they need to be updated in lockstep with subsurface

 - instead of building libmarble against qtquick1, we now build using
   qtquickcontrols (qtquick2)

 - getting rid of qtquick1 also allows us to use the default qt (currently 5.6)

 - we get rid of some hacks to deal with library dependencies

 - instead of manually overriding various phases, we simply use cmakeFlags to
   pass proper parameters
2017-02-11 15:48:18 +01:00
Vladimír Čunát
ee2edd4527
Merge branch 'master' into staging 2017-01-10 15:38:07 +01:00
Maximilian Güntner
9112410f65
subsurface: rev update for 4.5.97
Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-10 00:00:59 +01:00
Vladimír Čunát
3a3b0263b0
subsurface: disable parallel make, as it fails on Hydra
http://hydra.nixos.org/build/46126151/nixlog/1/raw
2017-01-08 14:13:40 +01:00
Maximilian Güntner
b00516ca31
subsurface: 4.5.6 -> 4.5.97 (beta 2)
Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-03 16:06:50 +01:00
Maximilian Güntner
90377526eb subsurface: init at 4.5.6
Signed-off-by: Maximilian Güntner <code@klandest.in>
2016-11-15 04:54:52 +01:00