Build a new compile environment
Axel Richter
Axel.Richter at freenet.de
Fri Jul 14 04:17:12 PDT 2017
Hi Robert,
Am 14.07.2017 um 12:10 schrieb Robert Helling:
> Hi Axel,
>
>> On 14. Jul 2017, at 11:34, Axel Richter
>> <Axel.Richter at freenet.de
>> <mailto:Axel.Richter at freenet.de>> wrote:
>>
>> * libgit compiles ok.
>> * libdivecomputer compiles ok.
>> * the marble flavour runs into a problem:
>> /home/axel/src/marble-source/src/lib/marble/geodata/geodata_export.h:15:27:
>> fatal error: marble_export.h: Datei oder Verzeichnis
>> nicht gefunden
>>
> For me it’s in
> ~/src/marble-source/src/lib/marble/marble_export.h
> I have no clue why it does not find that. Please check if
> you have that file. If yes, try to figure out why that’s
> not in the include path.
>
I'm running with the current master of the subsurface marble
version.
If you browse
https://github.com/Subsurface-divelog/marble/tree/Subsurface-branch/src/lib/marble
its gone.
After some work I created a patch (attached) to make marble
compilable again.
If anyone can have a look into it...
>> * desktop-widges need MarbleWidget.h:
>> In file included from
>> /home/axel/src/subsurface/desktop-widgets/globe.cpp:2:0:
>> /home/axel/src/subsurface/./desktop-widgets/globe.h:8:33:
>> fatal error: marble/MarbleWidget.h: Datei oder
>> Verzeichnis nicht gefunden
>> I think this is a subsequent error of the missing
>> marble_export.h
>>
> I would guess so.
Yes, after successful compile it installs correctly now.
>> * Some libraries link to install-root/lib and some to
>> install-root/lib64. The problem:
>> No rule to make target
>> '/home/axel/src/install-root/lib/libdivecomputer.a',
>> needed by 'tests/TestMerge'. Schluss.
>> I copied lib/* to lib64 and set a symbolic link.
>>
> Weird. But to get started, you could disable building the
> tests. To do that
>
> cd ~/src/subsurface/build
> ccmake .
>
> and disable test. If the marble problem persists you can
> disable that as well.
>>
>> *
>>
>>
>> My Qt (for the linux itself) is the 5.6.1 from SuSE
>> repository.
>
> This should work but is a bit ancient. Current Qt is
> 5.9.1. I am currently using 5.7 and 5.8. You can download
> that directly from the Qt website.
Ok. I'll update. I'll need it anyway for the android build
later.
Thanks a lot,
Axel.
>
> Best
> Robert
>
> --
> .oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oO
> Robert C. Helling Elite Master Course Theoretical and
> Mathematical Physics
> Scientific Coordinator
> Ludwig Maximilians Universitaet
> Muenchen, Dept. Physik
> Phone: +49 89 2180-4523
> Theresienstr. 39, rm. B339
> http://www.atdotde.de
>
> Enhance your privacy, use cryptography! My PGP keys have
> fingerprints
> A9D1 A01D 13A5 31FA 6515 BB44 0820 367C 36BC 0C1D and
> DCED 37B6 251C 7861 270D 5613 95C7 9D32 9A8D 9B8F
>
>
>
>
>
--
Axel Richter
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20170714/ad152ace/attachment-0001.html>
-------------- next part --------------
diff --git a/src/lib/marble/AbstractFloatItem.h b/src/lib/marble/AbstractFloatItem.h
index 25b8ea84a..d2a3a82f3 100644
--- a/src/lib/marble/AbstractFloatItem.h
+++ b/src/lib/marble/AbstractFloatItem.h
@@ -85,9 +85,9 @@ class MARBLE_EXPORT AbstractFloatItem : public RenderPlugin, public FrameGraphic
* @deprecated Do not override this method since it won't be called any longer.
* Override one of FrameGraphicsItem's paint methods instead.
*/
- MARBLE_DEPRECATED bool render( GeoPainter *painter, ViewportParams *viewport,
+ MARBLE_DEPRECATED ( bool render( GeoPainter *painter, ViewportParams *viewport,
const QString& renderPos = QLatin1String("FLOAT_ITEM"),
- GeoSceneLayer * layer = 0 ) override;
+ GeoSceneLayer * layer = 0 ) override);
QString renderPolicy() const override;
@@ -96,7 +96,7 @@ class MARBLE_EXPORT AbstractFloatItem : public RenderPlugin, public FrameGraphic
* @deprecated The return value of method is ignored. The float item's rendering position
* will always be "FLOAT_ITEM".
*/
- MARBLE_DEPRECATED QStringList renderPosition() const override;
+ MARBLE_DEPRECATED ( QStringList renderPosition() const override);
/**
* @brief Set visibility of the float item
diff --git a/src/lib/marble/MarbleGlobal.h b/src/lib/marble/MarbleGlobal.h
index 31f1e61b9..2d1bcee99 100644
--- a/src/lib/marble/MarbleGlobal.h
+++ b/src/lib/marble/MarbleGlobal.h
@@ -292,7 +292,7 @@ class MARBLE_EXPORT MarbleGlobal
void setProfiles( Profiles profiles );
/** @deprecated Profiles are detected automatically now. This only returns profiles() anymore */
- MARBLE_DEPRECATED static Profiles detectProfiles();
+ MARBLE_DEPRECATED ( static Profiles detectProfiles());
private:
MarbleGlobal();
diff --git a/src/lib/marble/Planet.h b/src/lib/marble/Planet.h
index 26a7b445d..2e2e86e5b 100644
--- a/src/lib/marble/Planet.h
+++ b/src/lib/marble/Planet.h
@@ -37,7 +37,7 @@ public:
/**
* @deprecated Please use PlanetFactory::construct(id) instead.
*/
- MARBLE_DEPRECATED explicit Planet(const QString& id);
+ MARBLE_DEPRECATED ( explicit Planet(const QString& id));
///Copy Constructor
Planet( const Planet& other );
@@ -103,11 +103,11 @@ public:
/**
* @deprecated Please use PlanetFactory::localizedName(id) instead.
*/
- MARBLE_DEPRECATED static QString name(const QString& id);
+ MARBLE_DEPRECATED ( static QString name(const QString& id));
/**
* @deprecated Please use PlanetFactory::planetList() instead.
*/
- MARBLE_DEPRECATED static QStringList planetList();
+ MARBLE_DEPRECATED ( static QStringList planetList());
bool hasAtmosphere() const;
void setHasAtmosphere( bool enabled );
diff --git a/src/lib/marble/TinyWebBrowser.cpp b/src/lib/marble/TinyWebBrowser.cpp
index 78f54ab06..18371874a 100644
--- a/src/lib/marble/TinyWebBrowser.cpp
+++ b/src/lib/marble/TinyWebBrowser.cpp
@@ -21,6 +21,7 @@
#ifndef QT_NO_PRINTER
#include <QPrintDialog>
#include <QPrinter>
+#endif
// Marble
#include "MarbleGlobal.h"
diff --git a/src/lib/marble/geodata/data/GeoDataContainer.h b/src/lib/marble/geodata/data/GeoDataContainer.h
index edea0fef8..f89bc739a 100644
--- a/src/lib/marble/geodata/data/GeoDataContainer.h
+++ b/src/lib/marble/geodata/data/GeoDataContainer.h
@@ -108,7 +108,7 @@ class GEODATA_EXPORT GeoDataContainer : public GeoDataFeature
*/
void insert( int index, GeoDataFeature *feature );
- GEODATA_DEPRECATED void insert(GeoDataFeature *other, int index);
+ GEODATA_DEPRECATED (void insert(GeoDataFeature *other, int index));
/**
* @brief add an element
diff --git a/src/lib/marble/geodata/data/GeoDataCoordinates.cpp b/src/lib/marble/geodata/data/GeoDataCoordinates.cpp
index 94bab3cb6..a3df49801 100644
--- a/src/lib/marble/geodata/data/GeoDataCoordinates.cpp
+++ b/src/lib/marble/geodata/data/GeoDataCoordinates.cpp
@@ -19,7 +19,6 @@
#include "LonLatParser_p.h"
#include <qmath.h>
-<<<<<<< HEAD
#include <QRegExp>
#include <QLocale>
#include <QString>
@@ -27,10 +26,7 @@
#include <QCoreApplication>
#include <QAtomicInt>
#include <QDataStream>
-=======
-#include <QDataStream>
#include <QPointF>
->>>>>>> master
#include "MarbleGlobal.h"
#include "MarbleDebug.h"
diff --git a/src/lib/marble/geodata/data/GeoDataGeometry.cpp b/src/lib/marble/geodata/data/GeoDataGeometry.cpp
index 6ca643036..8cf97fffe 100644
--- a/src/lib/marble/geodata/data/GeoDataGeometry.cpp
+++ b/src/lib/marble/geodata/data/GeoDataGeometry.cpp
@@ -27,11 +27,6 @@
#include "MarbleDebug.h"
#include <QDataStream>
-<<<<<<< HEAD
-
-=======
->>>>>>> master
-
namespace Marble
{
diff --git a/src/lib/marble/geodata/data/GeoDataLabelStyle.cpp b/src/lib/marble/geodata/data/GeoDataLabelStyle.cpp
index 1d7f7ff10..d67baa99c 100644
--- a/src/lib/marble/geodata/data/GeoDataLabelStyle.cpp
+++ b/src/lib/marble/geodata/data/GeoDataLabelStyle.cpp
@@ -12,10 +12,7 @@
#include "GeoDataLabelStyle.h"
#include <QFont>
-<<<<<<< HEAD
-=======
#include <QColor>
->>>>>>> master
#include <QDataStream>
#include "GeoDataTypes.h"
diff --git a/src/lib/marble/layers/PopupLayer.cpp b/src/lib/marble/layers/PopupLayer.cpp
index c47ecface..c3242046f 100644
--- a/src/lib/marble/layers/PopupLayer.cpp
+++ b/src/lib/marble/layers/PopupLayer.cpp
@@ -59,7 +59,7 @@ PopupLayer::Private::Private( MarbleWidget *marbleWidget, PopupLayer *q ) :
#ifndef SUBSURFACE
m_popupItem( new PopupItem( q ) ),
#endif
- m_widget( marbleWidget )
+ m_widget( marbleWidget ),
m_hasCrosshairsPlugin( false ),
m_crosshairsVisible( true )
{
-------------- next part --------------
A non-text attachment was scrubbed...
Name: marble_export.h
Type: text/x-chdr
Size: 852 bytes
Desc: not available
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20170714/ad152ace/attachment-0001.h>
More information about the subsurface
mailing list