removing Marble traces from the Subsurface tree

[Lubomir I. Ivanov]

On 26 August 2017 at 15:02, Lubomir I. Ivanov <neolit123 at gmail.com> wrote:
> On 26 August 2017 at 08:08, Miika Turkia <miika.turkia at gmail.com> wrote:
>> On Sat, Aug 26, 2017 at 2:30 AM, Dirk Hohndel <dirk at hohndel.org> wrote:
>>>
>>>> On Aug 25, 2017, at 3:11 PM, Lubomir I. Ivanov <neolit123 at gmail.com> wrote:
>>>>
>>>> On 25 August 2017 at 23:46, Dirk Hohndel <dirk at hohndel.org> wrote:
>>>>>
>>>>>> On Aug 25, 2017, at 1:40 PM, Lubomir I. Ivanov <neolit123 at gmail.com> wrote:
>>>>>>
>>>>>> here is my script to pull the headers locally from the Qt source code
>>>>>> git repository.
>>>>>> from there it's a matter of "sudo cp"-ing them in the correct Qt
>>>>>> header's folder - e.g.:
>>>>>> /usr/include/qt5/QtLocation/5.9.1/QtLocation/private/
>>>>>>
>>>>>> usage:
>>>>>> $sh ./get_qtlocation_private_headers.sh 5.9.1
>>>>>>
>>>>>> the alternative is to use packages from other distros - already mentioned.
>>>>>
>>>>> That may be even easier than what I just sent out.
>>>>>
>>>>> Here's my request - can you add to this script
>>>>>
>>>>> a) detection if the headers are already there (qmake -query QT_INSTALL_HEADERS and poke around there)
>>>>> b) if not, download the headers (using the script or something similar)
>>>>> c) don't install into the system path, but have them in install_root and modify googlemaps plugin to pick them up from there if necessary
>>>>>
>>>>
>>>> i got this working (a,b,c) with the headers residing in the plugin
>>>> folders, but vladest needs to revert the PR, IMO.
>>>
>>> OOPS. I tested it here and it seemed to work. Maybe I the headers
>>> stayed around when I removed the package. Weird. I'll apologize to him.
>>>
>>>> also i'm pretty sure we need to pull the QtPositioning private headers too.
>>>
>>> That's what it looks like from your test :-(
>>>
>>>> except for c) -> can you please explain "install_root"?
>>>> is this where all the subsurface source code resides after pulling.
>>>> would that mean that there would be a "googlemaps" folder in there,
>>>> where supposedly the private headers needs to be placed too if they
>>>> don't exist in ?
>>>
>>> When we run scripts/build.sh we install the things that we build as dependencies
>>> under ~/src/install_root (assuming you have ~/src/subsurface). And we also install
>>> the googlemaps plugin in that hierarchy. So it seems reasonable to also install the
>>> include file that we get from Qt private headers in that same hierarchy, just for
>>> consistency.
>>>
>>>> will continue on this tomorrow.
>>
>> I just got thinking this morning... Since I have the install of Qt
>> 5.9.1 on my system, that should include all the headers, why am I
>> still using the Ubuntu packaged Qt for googlemaps plugin. And after
>> hardcoding the qmake in build.sh to point to the one in my qmake 5.9.1
>> I was able to build googlemaps plugin just fine. Then just copying it
>> under subsurface build dir was enough to get the map to work.
>>
>
> good to hear,
>
> i was just able to build subsurface on 17.04 after a couple of hours
> of googling package names...
> now to tackle the automation of fetching the private headers.
>

1)
here is a PR with a small change in the googlemaps plugin's qmake to
allow using headers from relative paths:
https://github.com/vladest/googlemaps/pull/15

2)
attached is my updated script to fetch the QtLocation and
QtPositioning private headers from the Qt repository.
if someone has the time you can integrated that into our build.sh.

one potential problem here is that i don't know how to place the
headers in install_root and tell the qmake of the googlemaps plugin to
use install_root in a non-disruptive way (i.e. only we care about
install_root). instead the solution might be to simply copy the header
folders inside the googlemaps plugin folder it will work.

NOTE: both these changes require qmake5.
need to leave in a minute and will be back on sunday afternoon (EET).

lubomir
--
-------------- next part --------------
A non-text attachment was scrubbed...
Name: get_qtlocation_private_headers.sh
Type: application/x-sh
Size: 988 bytes
Desc: not available
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20170826/c14d76ce/attachment.sh>