[PATCH] Update required packages on INSTALL file

2016-06-18 Thread Miika Turkia
libgit2-dev is no longer needed as we compile it from sources.
Also add qtpositioning5-dev for Debian as dependencies there are
apparently slightly different than on Ubuntu.

Signed-off-by: Miika Turkia 
---
 INSTALL | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index 13009e4..a5eb0b9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -75,7 +75,7 @@ On Fedora you need
 
 sudo yum install git gcc-c++ make autoconf automake libtool cmake \
libzip-devel libxml2-devel libxslt-devel libsqlite3x-devel \
-   libgit2-devel libudev-devel libusbx-devel libcurl-devel libssh2-devel\
+   libudev-devel libusbx-devel libcurl-devel libssh2-devel\
qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtscript-devel \
qt5-qtwebkit-devel qt5-qtsvg-devel qt5-qttools-devel \
qt5-qtconnectivity-devel qt5-qtlocation-devel
@@ -86,7 +86,7 @@ as yum is being deprecated.
 Package names are sadly different on OpenSUSE
 
 sudo zypper install git gcc-c++ make autoconf automake libtool cmake 
libzip-devel \
-   libxml2-devel libxslt-devel sqlite3-devel libgit2-devel 
libusb-1_0-devel \
+   libxml2-devel libxslt-devel sqlite3-devel libusb-1_0-devel \
libqt5-linguist-devel libqt5-qttools-devel libQt5WebKitWidgets-devel \
libqt5-qtbase-devel libQt5WebKit5-devel libqt5-qtsvg-devel \
libqt5-qtscript-devel libqt5-qtdeclarative-devel \
@@ -96,11 +96,11 @@ On Debian Stretch and recent Ubuntu flavors this seems to 
work
 
 sudo apt-get install git g++ make autoconf automake libtool cmake pkg-config \
libxml2-dev libxslt1-dev libzip-dev libsqlite3-dev \
-   libusb-1.0-0-dev libgit2-dev \
+   libusb-1.0-0-dev libssl-dev \
qt5-default qt5-qmake qtchooser qttools5-dev-tools libqt5svg5-dev \
libqt5webkit5-dev libqt5qml5 libqt5quick5 libqt5declarative5 \
qtscript5-dev libssh2-1-dev libcurl4-openssl-dev qttools5-dev \
-   qtconnectivity5-dev qtlocation5-dev
+   qtconnectivity5-dev qtlocation5-dev qtpositioning5-dev
 
 On PCLinuxOS you appear to need the following packages
 
-- 
2.5.0

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


Re: Patch update INSTALL file

2015-11-25 Thread Sebastian Kügler
On Tuesday, November 24, 2015 09:08:42 AM Dirk Hohndel wrote:
> On Ubuntu it definitely is qtlocation5-dev

Same in Debian unstable/sid/stretch.
-- 
sebas

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


Re: Patch update INSTALL file

2015-11-24 Thread Salvador Cuñat
Good evening

2015-11-24 18:17 GMT+01:00 Dirk Hohndel :

>
>
> On Nov 24, 2015, at 9:08 AM, Dirk Hohndel  wrote:
>
>
> On Nov 24, 2015, at 9:03 AM, Stephen Hemminger 
> wrote:
>
> On Tue, 24 Nov 2015 14:37:30 +
> Pedro Neves  wrote:
>
> Hi:
>
> Small patch to reflect the need to install qtlocation5-dev on
> Debian/Ubuntu.
>
> @Dirk:
>
> I hope all is correct ;-)
>
> Cheers:
>
> Pedro
>
>
> The library you want is qtpositioning5-dev on Debian.
>
> https://packages.debian.org/source/wheezy-backports/qtlocation-opensource-src
>
>
> Odd - maybe that's an issue of diverging package names?
> On Ubuntu it definitely is qtlocation5-dev
>
>
> OK, so qtlocation5-dev depends on qtpositioning5-dev
> So is it reasonable to assume that qtlocation5-dev would work, assuming it
> had beenback ported to wheezy as well?
>
> Or would it be better to switch all of the dependencies to qtpositioning5
> if that is indeed sufficient to build Subsurface?
>

I'm in Debian Sid,  I installed both libraries separately so no
dependencies there, but I can confirm both of them are necesary to
actually  build  Subsurface.  Don't know if they have made into Whezzy or
even into Jessie.

BTW, the smartrak thing in Pedro's patch is the patch I sent some time ago
and Pedro kindly tried to work,  but the patch never did into master, so
when Pedro worked his patch it has probably snaked there as he has it
applied.

http://lists.subsurface-divelog.org/pipermail/subsurface/2015-November/023264.html

Regards.

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


Re: Patch update INSTALL file

2015-11-24 Thread Dirk Hohndel
On Tue, Nov 24, 2015 at 08:27:37AM -0800, Dirk Hohndel wrote:
> 
> > diff --git a/smtk-import/CMakeLists.txt b/smtk-import/CMakeLists.txt
> > index 93fbb84..cdcb1bc 100644
> > --- a/smtk-import/CMakeLists.txt
> > +++ b/smtk-import/CMakeLists.txt
> > @@ -1,3 +1,5 @@
> > +set(CMAKE_AUTOUIC ON)
> > +set(CMAKE_INCLUDE_CURRENT_DIR ON)
> 
> This is wrong (and I don't think you wanted to include this in this patch,
> anyway)
> 
> We run UIC manually now as the automatic code in cmake failed for us a few
> too many times. And you shouldn't need "INCLUDE_CURRENT_DIR" - if an
> include file isn't found for you in the build, please post about it

-ENOTENOUGHCOFFEE
I just realized that this was to the smtk-import CMakeLists file. Oops.
So yes, if you need to make changes to that, please send in a separate
patch.

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


Re: Patch update INSTALL file

2015-11-24 Thread Dirk Hohndel

> On Nov 24, 2015, at 9:03 AM, Stephen Hemminger  
> wrote:
> 
> On Tue, 24 Nov 2015 14:37:30 +
> Pedro Neves  wrote:
> 
>> Hi:
>> 
>> Small patch to reflect the need to install qtlocation5-dev on Debian/Ubuntu.
>> 
>> @Dirk:
>> 
>> I hope all is correct ;-)
>> 
>> Cheers:
>> 
>> Pedro
> 
> The library you want is qtpositioning5-dev on Debian.
> https://packages.debian.org/source/wheezy-backports/qtlocation-opensource-src 
> 

Odd - maybe that's an issue of diverging package names?
On Ubuntu it definitely is qtlocation5-dev

And qt5-qtlocation-devel on Fedora and related systems.
And libqt5-qtlocation-devel on OpenSUSE and related systems.

AppImages are such a wonderful thing...

/D

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


Re: Patch update INSTALL file

2015-11-24 Thread Pedro Neves

On 24-11-2015 16:43, Dirk Hohndel wrote:


-ENOTENOUGHCOFFEE
I just realized that this was to the smtk-import CMakeLists file. Oops.
So yes, if you need to make changes to that, please send in a separate
patch.

/D


Hi DIrk:

Actually, the chages in smtk-import CMakeLists were only made by be to 
compile the tool. They have nothing to to with the patch I've sent. I 
believe it's enough to apply the patch on the INSTALL file and disregard 
the changes on the CMakeLists file... Right?


Cheers:

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


Re: Patch update INSTALL file

2015-11-24 Thread Stephen Hemminger
On Tue, 24 Nov 2015 08:27:37 -0800
Dirk Hohndel  wrote:

> > diff --git a/INSTALL b/INSTALL
> > index 8e832b9..32c3eba 100644
> > --- a/INSTALL
> > +++ b/INSTALL
> > @@ -100,7 +100,7 @@ sudo apt-get install git g++ make autoconf libtool 
> > cmake pkg-config \
> > qt5-default qt5-qmake qtchooser qttools5-dev-tools libqt5svg5-dev \
> > libqt5webkit5-dev libqt5qml5 libqt5quick5 libqt5declarative5 \
> > qtscript5-dev libssh2-1-dev libcurl4-openssl-dev qttools5-dev \
> > -   qtconnectivity5-dev
> > +   qtconnectivity5-dev qtlocation5-dev  
> 
> So this is correct, but we of course need the corresponding packages on
> the other distros as well, so I'll modify that.


There is no qtlocation5-dev package on Debian 8.
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface


Re: Patch update INSTALL file

2015-11-24 Thread Dirk Hohndel
On Tue, Nov 24, 2015 at 02:37:30PM +, Pedro Neves wrote:
> From e55cb0e1e6fb585b39cc4343fe5a130c05f2af5e Mon Sep 17 00:00:00 2001
> From: Pedro Neves <nevesdi...@gmail.com>
> Date: Tue, 24 Nov 2015 14:29:15 +
> Subject: [PATCH] Update INSTALL file with Debian/Ubuntu instructions
> 
> The INSTALL file was updated to reflect the need to install qtlocation5-dev 
> on Debian/Ubuntu systems to prevent build errors with latest master.
> 
> Signed-off-by: Pedro Neves <nevesdi...@gmail.com>
> ---
>  INSTALL| 2 +-
>  smtk-import/CMakeLists.txt | 2 ++
>  subsurface.desktop | 1 +
>  3 files changed, 4 insertions(+), 1 deletion(-)
>  mode change 100644 => 100755 subsurface.desktop
> 
> diff --git a/INSTALL b/INSTALL
> index 8e832b9..32c3eba 100644
> --- a/INSTALL
> +++ b/INSTALL
> @@ -100,7 +100,7 @@ sudo apt-get install git g++ make autoconf libtool cmake 
> pkg-config \
>   qt5-default qt5-qmake qtchooser qttools5-dev-tools libqt5svg5-dev \
>   libqt5webkit5-dev libqt5qml5 libqt5quick5 libqt5declarative5 \
>   qtscript5-dev libssh2-1-dev libcurl4-openssl-dev qttools5-dev \
> - qtconnectivity5-dev
> + qtconnectivity5-dev qtlocation5-dev

So this is correct, but we of course need the corresponding packages on
the other distros as well, so I'll modify that.

> diff --git a/smtk-import/CMakeLists.txt b/smtk-import/CMakeLists.txt
> index 93fbb84..cdcb1bc 100644
> --- a/smtk-import/CMakeLists.txt
> +++ b/smtk-import/CMakeLists.txt
> @@ -1,3 +1,5 @@
> +set(CMAKE_AUTOUIC ON)
> +set(CMAKE_INCLUDE_CURRENT_DIR ON)

This is wrong (and I don't think you wanted to include this in this patch,
anyway)

We run UIC manually now as the automatic code in cmake failed for us a few
too many times. And you shouldn't need "INCLUDE_CURRENT_DIR" - if an
include file isn't found for you in the build, please post about it

(and of course - Tomaz is once again, oops, no, still completely rewriting
the Cmake infrastructure which likely means that the moment I merge those
changes all of my builds will be broken again...)

> diff --git a/subsurface.desktop b/subsurface.desktop
> old mode 100644
> new mode 100755
> index cbdcbac..dfb8d6e
> --- a/subsurface.desktop
> +++ b/subsurface.desktop
> @@ -1,3 +1,4 @@
> +#!/usr/bin/env xdg-open

Why would you need that???

/D


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


Re: Patch update INSTALL file

2015-11-24 Thread Stephen Hemminger
On Tue, 24 Nov 2015 14:37:30 +
Pedro Neves  wrote:

> Hi:
> 
> Small patch to reflect the need to install qtlocation5-dev on Debian/Ubuntu.
> 
> @Dirk:
> 
> I hope all is correct ;-)
> 
> Cheers:
> 
> Pedro

The library you want is qtpositioning5-dev on Debian.
https://packages.debian.org/source/wheezy-backports/qtlocation-opensource-src
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface


Re: Patch update INSTALL file

2015-11-24 Thread Dirk Hohndel

> On Nov 24, 2015, at 9:08 AM, Dirk Hohndel  wrote:
> 
> 
>> On Nov 24, 2015, at 9:03 AM, Stephen Hemminger > > wrote:
>> 
>> On Tue, 24 Nov 2015 14:37:30 +
>> Pedro Neves > wrote:
>> 
>>> Hi:
>>> 
>>> Small patch to reflect the need to install qtlocation5-dev on Debian/Ubuntu.
>>> 
>>> @Dirk:
>>> 
>>> I hope all is correct ;-)
>>> 
>>> Cheers:
>>> 
>>> Pedro
>> 
>> The library you want is qtpositioning5-dev on Debian.
>> https://packages.debian.org/source/wheezy-backports/qtlocation-opensource-src
>>  
>> 
> 
> Odd - maybe that's an issue of diverging package names?
> On Ubuntu it definitely is qtlocation5-dev

OK, so qtlocation5-dev depends on qtpositioning5-dev
So is it reasonable to assume that qtlocation5-dev would work, assuming it had 
beenback ported to wheezy as well?

Or would it be better to switch all of the dependencies to qtpositioning5 if 
that is indeed sufficient to build Subsurface?

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


Patch update INSTALL file

2015-11-24 Thread Pedro Neves

Hi:

Small patch to reflect the need to install qtlocation5-dev on Debian/Ubuntu.

@Dirk:

I hope all is correct ;-)

Cheers:

Pedro
>From e55cb0e1e6fb585b39cc4343fe5a130c05f2af5e Mon Sep 17 00:00:00 2001
From: Pedro Neves <nevesdi...@gmail.com>
Date: Tue, 24 Nov 2015 14:29:15 +
Subject: [PATCH] Update INSTALL file with Debian/Ubuntu instructions

The INSTALL file was updated to reflect the need to install qtlocation5-dev on Debian/Ubuntu systems to prevent build errors with latest master.

Signed-off-by: Pedro Neves <nevesdi...@gmail.com>
---
 INSTALL| 2 +-
 smtk-import/CMakeLists.txt | 2 ++
 subsurface.desktop | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 subsurface.desktop

diff --git a/INSTALL b/INSTALL
index 8e832b9..32c3eba 100644
--- a/INSTALL
+++ b/INSTALL
@@ -100,7 +100,7 @@ sudo apt-get install git g++ make autoconf libtool cmake pkg-config \
 	qt5-default qt5-qmake qtchooser qttools5-dev-tools libqt5svg5-dev \
 	libqt5webkit5-dev libqt5qml5 libqt5quick5 libqt5declarative5 \
 	qtscript5-dev libssh2-1-dev libcurl4-openssl-dev qttools5-dev \
-	qtconnectivity5-dev
+	qtconnectivity5-dev qtlocation5-dev
 
 On PCLinuxOS you appear to need the following packages
 
diff --git a/smtk-import/CMakeLists.txt b/smtk-import/CMakeLists.txt
index 93fbb84..cdcb1bc 100644
--- a/smtk-import/CMakeLists.txt
+++ b/smtk-import/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(SMTK_IMPORT_SRCS
 	smartrak.c
 	smrtk2ssrfc_window.ui
diff --git a/subsurface.desktop b/subsurface.desktop
old mode 100644
new mode 100755
index cbdcbac..dfb8d6e
--- a/subsurface.desktop
+++ b/subsurface.desktop
@@ -1,3 +1,4 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
 Type=Application
 Name=subsurface
-- 
2.5.0

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


[PATCH] Update install file to build on Fedora (23) and update path

2015-10-19 Thread Steve
Went to do some real testing on the weekend :)
I had just updated to HW firmware version 1.9 before the trip and I had an
issue downloading from my OSTC 3+ so wanted to test from another os.
I had installed the beta Fedora 23 with the latest 4.3 rc5 kernel and tried
to build subsurface as I couldn't see any packages for Fedora 23.
Turns out the OSTC 3+ still wouldn't download the dives until I reverted to
firmware version 1.88
Below are my changes to build on Fedora 23 but I did not change yum to dnf
in the patch.

[master 115b0f6] Updated packages required to build on Fedora Updated path
to reflect where the package was built
 1 file changed, 2 insertions(+), 2 deletions(-)

Updated packages required to build on Fedora
Updated path to reflect where the package was built

Signed-off-by: Steve Williams 
---
diff --git a/INSTALL b/INSTALL
index 5f8f228..8b41e69 100644
--- a/INSTALL
+++ b/INSTALL
@@ -75,7 +75,7 @@ On Fedora you need
 
 sudo yum install git gcc-c++ make autoconf automake libtool cmake \
libzip-devel libxml2-devel libxslt-devel libsqlite3x-devel \
-   libgit2-devel libudev-devel libusbx-devel \
+   libgit2-devel libudev-devel libusbx-devel libcurl-devel
libssh2-devel\
qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtscript-devel \
qt5-qtwebkit-devel qt5-qtsvg-devel qt5-qttools-devel \
qt5-qtconnectivity-devel
@@ -124,7 +124,7 @@ git clone git://subsurface-divelog.org/subsurface
 
 Now you can run Subsurface like this:
 
-cd subsurface
+cd subsurface/build
 ./subsurface
---

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


Updating INSTALL file

2015-10-15 Thread Ash Kamel
Hello everyone and fellow divers,

I just wanted to let you all know about a small tweak that could help
people new to building from source.  Take a look at this PR
https://github.com/torvalds/subsurface/pull/120 . It hopfully makes it
clear which directory the executable will be in after running the build.sh
script.

Regards,

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


Re: Updating INSTALL file

2015-10-15 Thread Dirk Hohndel
On Thu, Oct 15, 2015 at 01:01:11PM -0400, Ash Kamel wrote:
> Hello everyone and fellow divers,
> 
> I just wanted to let you all know about a small tweak that could help
> people new to building from source.  Take a look at this PR
> https://github.com/torvalds/subsurface/pull/120 . It hopfully makes it
> clear which directory the executable will be in after running the build.sh
> script.

Thanks, I saw that and will pull it later today.

Good catch!

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


[PATCH] Minor fixes to the INSTALL-file

2015-06-11 Thread Paul-Erik Törrönen
* Add needed qt5-qtlocation-devel package for Fedora install
* Correct the call to subsurface binary after compilation]

Signed-off-by: Paul-Erik Törrönen pol...@777-team.org
---
 INSTALL | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index 2a4c987..09caf3e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -58,7 +58,10 @@ sudo yum install git gcc-c++ make autoconf automake
libtool cmake \
libzip-devel libxml2-devel libxslt-devel libsqlite3x-devel \
libgit2-devel libudev-devel libusbx-devel \
qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtscript-devel \
-   qt5-qtwebkit-devel qt5-qtsvg-devel qt5-qttools-devel
+   qt5-qtwebkit-devel qt5-qtsvg-devel qt5-qttools-devel 
qt5-qtlocation-devel
+
+Note that beginning with Fedora 22, you should be using the dnf command
instead
+as yum is being deprecated.

 Package names are sadly different on OpenSUSE

@@ -99,8 +102,8 @@ git clone -b v4.4.2
git://subsurface-divelog.org/subsurface

 Now you can run Subsurface like this:

-cd ~/src/subsurface
-./subsurface
+cd ~/src
+install-root/bin/subsurface


 Building Subsurface under MacOSX (using Homebrew)
-- 
2.4.2



-- 
Paul-Erik Törrönen   When science and the Bible differ,
pol...@777-team.org   science has obviously misinterpreted
+358 40 703 1231  its data
http://poltsi.fi/ Henry Morris, father of 'modern creationism'

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


Re: [PATCH] Minor fixes to the INSTALL-file

2015-06-11 Thread Dirk Hohndel
On Thu, Jun 11, 2015 at 12:02:22PM +0300, Paul-Erik Törrönen wrote:
 * Add needed qt5-qtlocation-devel package for Fedora install
 * Correct the call to subsurface binary after compilation]

Thanks for the patch. Much appreciated.

Small complaint... the patch was line wrapped and needed to be hand edited
before it would apply...

It's pushed now.

/D

 diff --git a/INSTALL b/INSTALL
 index 2a4c987..09caf3e 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -58,7 +58,10 @@ sudo yum install git gcc-c++ make autoconf automake
 libtool cmake \

^ here

   libzip-devel libxml2-devel libxslt-devel libsqlite3x-devel \
   libgit2-devel libudev-devel libusbx-devel \
   qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtscript-devel \
 - qt5-qtwebkit-devel qt5-qtsvg-devel qt5-qttools-devel
 + qt5-qtwebkit-devel qt5-qtsvg-devel qt5-qttools-devel 
 qt5-qtlocation-devel
 +
 +Note that beginning with Fedora 22, you should be using the dnf command
 instead

^ and here

 +as yum is being deprecated.
 
  Package names are sadly different on OpenSUSE
 
 @@ -99,8 +102,8 @@ git clone -b v4.4.2
 git://subsurface-divelog.org/subsurface

^^ and here as well

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


Re: INSTALL file

2014-11-25 Thread Steve Butler


On 11/24/2014 06:08 AM, Lubomir I. Ivanov wrote:

On 24 November 2014 at 03:20, Steve Butler kg...@comcast.net wrote:

On 11/22/2014 11:46 PM, Miika Turkia wrote:

On Sun, Nov 23, 2014 at 8:51 AM, Steve Butler kg...@comcast.net wrote:

On 11/17/2014 01:56 PM, Lubomir I. Ivanov wrote:

On 17 November 2014 23:53, Lubomir I. Ivanov neolit...@gmail.com wrote:

On 17 November 2014 23:49, Steve Butler kg...@comcast.net wrote:

Looks like I need to find a non-Canonical source to update.  Is there
another PPA to which I can point for a later version?


that should be it:
https://marble.kde.org/sources.php

but perhaps it would be best to remove all marble related packages
first.


not the exact answer to the question, i admit. perhaps there are
alternative and compatible PPA, if not, you may have to built from the
sources which is a bit of task.



Built from source.  Now need the qmake command to include Marble again.  I
thought a simple 'qmake' might do that.  But it is still disabled at build
time.


I wonder if you are missing libmarble-dev. If everything is available, qmake
should pick up Marble. Just to make sure, the Ubuntu packages I have
uploaded to our PPA (subusrface-beta has the 4.2.90 beta release along with
latest master of libdivecomputer) have the following dependencies:


It is present but Lubomir thinks it was compiled with an older version of qt
than I'm using.  I was getting:
.obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x60): undefined
reference to `Marble::MarbleWidget::connectNotify(QMetaMethod const)'
.obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x68): undefined
reference to `Marble::MarbleWidget::disconnectNotify(QMetaMethod const)'

Lubomir had me turn off Marble with:

qmake DEFINES += NO_MARBLE
make clean
make


I pulled down latest Marble (or thought I did) and compiled on my box.  Need
to go buy Qmake for Dummies so I can reverse the above and see if what I
did fixed my problem.



make sure you have marble installed sudo make install.
https://marble.kde.org/sources.php

but something to note here; this:
... -DCMAKE_BUILD_TYPE=Debug ...

will build a 'debug' version of marble which means that you need to
build subsurface with make debug, unless you have also have built a
'release' version of marble in which case you can also build
subsurface using 'make release'.

the idea behind 'make release' and 'make debug' is that on runtime
subsurface will look for different shared libraries between the two.
in the case of 'debug' those are inflated with special debug symbols
that are useful for finding the exact problematic line of code.

to redo the qmake configuration just run:
qmake
make clean
make [debug]

if you get errors post them here.

lubomir
--

Sorry for the delayed response.  I'll use the Life comment I've seen 
from others.  If you want the detailed litany just PM me grin.


I'm back to square one:
.obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x60): 
undefined reference to `Marble::MarbleWidget::connectNotify(QMetaMethod 
const)'
.obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x68): 
undefined reference to 
`Marble::MarbleWidget::disconnectNotify(QMetaMethod const)'

collect2: error: ld returned 1 exit status
Makefile:523: recipe for target 'subsurface' failed
make: *** [subsurface] Error 1

Maybe my compile and install of Marble didn't do what I thought it did.  
I'm thinking of firing up Software Center and removing all incarnations 
of Marble I can find and then do a find /usr -name '*marble*' and see 
what is left.  Hope I don't destroy my box in the process.  I'll try to 
refrain from:

cd /
sudo rm -rf *

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


Re: INSTALL file

2014-11-23 Thread Robert C. Helling
Hi,



 Am 23.11.2014 um 08:46 schrieb Miika Turkia miika.tur...@gmail.com:
 
 I thought a simple 'qmake' might do that.  But it is still disabled at build 
 time.

Iirc if you disabled marble on the command line previously you have to re 
enable it explicitly. At least for -config debug that is the case. 

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


Re: INSTALL file

2014-11-23 Thread Miika Turkia
On Mon, Nov 24, 2014 at 3:20 AM, Steve Butler kg...@comcast.net wrote:


 On 11/22/2014 11:46 PM, Miika Turkia wrote:

  On Sun, Nov 23, 2014 at 8:51 AM, Steve Butler kg...@comcast.net wrote:


 On 11/17/2014 01:56 PM, Lubomir I. Ivanov wrote:

 On 17 November 2014 23:53, Lubomir I. Ivanov neolit...@gmail.com
 wrote:

 On 17 November 2014 23:49, Steve Butler kg...@comcast.net wrote:

 Looks like I need to find a non-Canonical source to update.  Is there
 another PPA to which I can point for a later version?

  that should be it:
 https://marble.kde.org/sources.php

 but perhaps it would be best to remove all marble related packages
 first.

  not the exact answer to the question, i admit. perhaps there are
 alternative and compatible PPA, if not, you may have to built from the
 sources which is a bit of task.



  Built from source.  Now need the qmake command to include Marble again.
 I thought a simple 'qmake' might do that.  But it is still disabled at
 build time.


  I wonder if you are missing libmarble-dev. If everything is available,
 qmake should pick up Marble. Just to make sure, the Ubuntu packages I have
 uploaded to our PPA (subusrface-beta has the 4.2.90 beta release along with
 latest master of libdivecomputer) have the following dependencies:


 It is present but Lubomir thinks it was compiled with an older version of
 qt than I'm using.  I was getting:
 .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x60):
 undefined reference to `Marble::MarbleWidget::connectNotify(QMetaMethod
 const)'
 .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x68):
 undefined reference to `Marble::MarbleWidget::disconnectNotify(QMetaMethod
 const)'

 Lubomir had me turn off Marble with:

 qmake DEFINES += NO_MARBLE
 make clean
 make


 I pulled down latest Marble (or thought I did) and compiled on my box.
 Need to go buy Qmake for Dummies so I can reverse the above and see if
 what I did fixed my problem.

 That is exactly the reason, I have multiple build directories..I do not
know how to tune the qmake parameters after initially setting them. And I
need debug and normal builds in parallel...


libqt4-dev, qt4-qmake, libxml2-dev, libxslt1-dev, zlib1g-dev,
 libusb-1.0-0-dev, libzip-dev, libmarble-dev, libsqlite3-dev,
 libqtwebkit-dev, pkg-config, libgit2-dev, asciidoc

  If you have them all installed, then you should have quite complete
 build of Subsurface, including Marble. The INSTALL document seems to
 suggest that you compile inside the source tree..this is not ideal - better
 to compile in a sub directory, so it is easy to delete the whole compile if
 needed. (e.g. qmake-qt4 ~/source/subsurface). Anyway, if you disabled
 Marble with the qmake, just try to build in a fresh build directory and see
 if that helps (I am sure there is a way to tell qmake to re-includ marble,
 but I have no idea how, I just scrap the build dir if it is messed up and
 create a new one)


 Tips like this will help me.  As I told Dirk, my background is COBOL
 followed by a stint as an Oracle DBA (then middle management.

 So, if I understand you correctly, in my structure of:
 ~/Projects/LibDiveComputer
 ~/Projects/Marble
 ~/Projects/Subsurface
 etc

 I should build a new one of ~/Projects/Subsurface/mybuild and run issue
 the commands from there?  BTW, can't find qmake-qt4 on mu Ubuntu 14.10 box.


I have my build directories inside subsurface sources, but I think someone
said that they should actually be at the same level. The only time when the
build directory under the Subsurface source dir has bitten me has been when
I reset the sources back to what is on git, getting rid of all the extra
files I have created there (then the build directories are also deleted).

Some libraries are only available for qt4 on my Ubuntu 14.04 box, so that
is why I use qmake-qt4. If you have all the required libs for qt5, then
just go ahead and use that. BTW, it does look like the Marble on 14.10 is
compiled against qt4.

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


Re: INSTALL file

2014-11-22 Thread Miika Turkia
On Sun, Nov 23, 2014 at 8:51 AM, Steve Butler kg...@comcast.net wrote:


 On 11/17/2014 01:56 PM, Lubomir I. Ivanov wrote:

 On 17 November 2014 23:53, Lubomir I. Ivanov neolit...@gmail.com wrote:

 On 17 November 2014 23:49, Steve Butler kg...@comcast.net wrote:

 Looks like I need to find a non-Canonical source to update.  Is there
 another PPA to which I can point for a later version?

  that should be it:
 https://marble.kde.org/sources.php

 but perhaps it would be best to remove all marble related packages first.

  not the exact answer to the question, i admit. perhaps there are
 alternative and compatible PPA, if not, you may have to built from the
 sources which is a bit of task.



 Built from source.  Now need the qmake command to include Marble again.  I
 thought a simple 'qmake' might do that.  But it is still disabled at build
 time.


I wonder if you are missing libmarble-dev. If everything is available,
qmake should pick up Marble. Just to make sure, the Ubuntu packages I have
uploaded to our PPA (subusrface-beta has the 4.2.90 beta release along with
latest master of libdivecomputer) have the following dependencies:

 libqt4-dev, qt4-qmake, libxml2-dev, libxslt1-dev, zlib1g-dev,
libusb-1.0-0-dev, libzip-dev, libmarble-dev, libsqlite3-dev,
libqtwebkit-dev, pkg-config, libgit2-dev, asciidoc

If you have them all installed, then you should have quite complete build
of Subsurface, including Marble. The INSTALL document seems to suggest that
you compile inside the source tree..this is not ideal - better to compile
in a sub directory, so it is easy to delete the whole compile if needed.
(e.g. qmake-qt4 ~/source/subsurface). Anyway, if you disabled Marble with
the qmake, just try to build in a fresh build directory and see if that
helps (I am sure there is a way to tell qmake to re-includ marble, but I
have no idea how, I just scrap the build dir if it is messed up and create
a new one)

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


Re: INSTALL file

2014-11-17 Thread Steve Butler


On 11/16/2014 10:29 PM, Dirk Hohndel wrote:

Could some of you who build from source on various flavors of Linux and
Mac check the INSTALL file and make sure it's still accurate / send
updates?

Thanks, that would really help me.

Still learning c++ and git.  In other words a greenhorn.  But still 
unable to build from source.  The make step fails.  In 6-8 months I 
should be more helpful.  In the meantime, gasping for air!


Anybody else using Ubuntu 14.10?

Did:
-git status
On branch master
Your branch is behind 'origin/master' by 20 commits, and can be 
fast-forwarded.

  (use git pull to update your local branch)
nothing to commit, working directory clean

-git pull
First, rewinding head to replay your work on top of it...
Fast-forwarded master to 25072b60ce6407044820dba043f07247f5acf226.

-qmake

-make | tee -a ~/steve.txt
see attached for full listing
linking subsurface
.obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x60): 
undefined reference to `Marble::MarbleWidget::connectNotify(QMetaMethod 
const)'
.obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x68): 
undefined reference to 
`Marble::MarbleWidget::disconnectNotify(QMetaMethod const)'

collect2: error: ld returned 1 exit status
make: *** [subsurface] Error 1
Makefile:523: recipe for target 'subsurface' failed





/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_source.ts 
-qm translations/subsurface_source.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_source.qm'...
Generated 0 translation(s) (0 finished and 0 unfinished)
Ignored 1227 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_bg_BG.ts -qm 
translations/subsurface_bg_BG.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_bg_BG.qm'...
Generated 1217 translation(s) (1217 finished and 0 unfinished)
Ignored 10 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_da_DK.ts -qm 
translations/subsurface_da_DK.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_da_DK.qm'...
Generated 1016 translation(s) (1016 finished and 0 unfinished)
Ignored 211 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_de_CH.ts -qm 
translations/subsurface_de_CH.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_de_CH.qm'...
Generated 945 translation(s) (945 finished and 0 unfinished)
Ignored 282 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_de_DE.ts -qm 
translations/subsurface_de_DE.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_de_DE.qm'...
Generated 1214 translation(s) (1214 finished and 0 unfinished)
Ignored 13 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_el_GR.ts -qm 
translations/subsurface_el_GR.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_el_GR.qm'...
Generated 543 translation(s) (543 finished and 0 unfinished)
Ignored 684 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_en_GB.ts -qm 
translations/subsurface_en_GB.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_en_GB.qm'...
Generated 1216 translation(s) (1216 finished and 0 unfinished)
Ignored 11 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_es_ES.ts -qm 
translations/subsurface_es_ES.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_es_ES.qm'...
Generated 1217 translation(s) (1217 finished and 0 unfinished)
Ignored 10 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_et_EE.ts -qm 
translations/subsurface_et_EE.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_et_EE.qm'...
Generated 942 translation(s) (942 finished and 0 unfinished)
Ignored 285 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_fi_FI.ts -qm 
translations/subsurface_fi_FI.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_fi_FI.qm'...
Generated 1208 translation(s) (1208 finished and 0 unfinished)
Ignored 19 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_fr_FR.ts -qm 
translations/subsurface_fr_FR.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_fr_FR.qm'...
Generated 1149 translation(s) (1149 finished and 0 unfinished)
Ignored 78 untranslated source text(s)
/usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_he.ts -qm 
translations/subsurface_he.qm
Warning: ignoring defaultcodec element
Updating 'translations/subsurface_he.qm'...
Generated 502 translation(s) (502 finished and 0 unfinished

Re: INSTALL file

2014-11-17 Thread Steve Butler


On 11/17/2014 01:45 PM, Lubomir I. Ivanov wrote:

qmake DEFINES += NO_MARBLE
make clean
make
Yes, that did work.  Sounds like a newer version of qtCreator is needed 
on my box.


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


Re: INSTALL file

2014-11-17 Thread Lubomir I. Ivanov
On 17 November 2014 23:53, Lubomir I. Ivanov neolit...@gmail.com wrote:
 On 17 November 2014 23:49, Steve Butler kg...@comcast.net wrote:

 Looks like I need to find a non-Canonical source to update.  Is there
 another PPA to which I can point for a later version?


 that should be it:
 https://marble.kde.org/sources.php

 but perhaps it would be best to remove all marble related packages first.


not the exact answer to the question, i admit. perhaps there are
alternative and compatible PPA, if not, you may have to built from the
sources which is a bit of task.

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


INSTALL file

2014-11-16 Thread Dirk Hohndel
Could some of you who build from source on various flavors of Linux and
Mac check the INSTALL file and make sure it's still accurate / send
updates?

Thanks, that would really help me.

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