- fix building with gcc 8 and proj 6

- rel 5

diff --git a/gcc8.patch b/gcc8.patch
new file mode 100644 (file)
index 0000000..7f3cbd9
--- /dev/null
+++ b/gcc8.patch
@@ -0,0 +1,76 @@
+--- qlandkartegt-1.8.1/3rdparty/map2gcm/main.cpp~      2014-08-08 11:53:46.000000000 +0200
++++ qlandkartegt-1.8.1/3rdparty/map2gcm/main.cpp       2019-04-06 10:31:37.345289713 +0200
+@@ -40,7 +40,7 @@
+ #define _MKSTR(x)           _MKSTR_1(x)
+ #endif
+ 
+-#define VER_STR             _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP)
++#define VER_STR             _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP)
+ #define WHAT_STR            "map2gcm, Version " VER_STR
+ 
+ #define MAX_TILE_SIZE   1024
+--- qlandkartegt-1.8.1/3rdparty/map2rmap/main.cpp~     2014-08-08 11:53:42.000000000 +0200
++++ qlandkartegt-1.8.1/3rdparty/map2rmap/main.cpp      2019-04-06 10:35:40.638287282 +0200
+@@ -33,7 +33,7 @@
+ #define _MKSTR(x)           _MKSTR_1(x)
+ #endif
+ 
+-#define VER_STR             _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP)
++#define VER_STR             _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP)
+ #define WHAT_STR            "map2rmap, Version " VER_STR
+ 
+ 
+--- qlandkartegt-1.8.1/3rdparty/map2rmp/main.cpp~      2014-08-08 11:53:46.000000000 +0200
++++ qlandkartegt-1.8.1/3rdparty/map2rmp/main.cpp       2019-04-06 10:36:14.732042916 +0200
+@@ -32,7 +32,7 @@
+ #define _MKSTR(x)           _MKSTR_1(x)
+ #endif
+ 
+-#define VER_STR             _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP)
++#define VER_STR             _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP)
+ #define WHAT_STR            "map2rmp, Version " VER_STR
+ 
+ int main(int argc, char ** argv)
+--- qlandkartegt-1.8.1/3rdparty/map2rmp/CFileGenerator.cpp~    2014-08-08 11:53:46.000000000 +0200
++++ qlandkartegt-1.8.1/3rdparty/map2rmp/CFileGenerator.cpp     2019-04-06 10:36:57.432572912 +0200
+@@ -27,7 +27,7 @@
+ #define _MKSTR(x)           _MKSTR_1(x)
+ #endif
+ 
+-#define VER_STR             _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP)
++#define VER_STR             _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP)
+ 
+ 
+ extern "C"
+--- qlandkartegt-1.8.1/3rdparty/map2jnx/main.cpp~      2014-08-08 11:53:42.000000000 +0200
++++ qlandkartegt-1.8.1/3rdparty/map2jnx/main.cpp       2019-04-06 10:37:28.652961115 +0200
+@@ -51,7 +51,7 @@
+ #define _MKSTR(x)           _MKSTR_1(x)
+ #endif
+ 
+-#define VER_STR             _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP)
++#define VER_STR             _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP)
+ #define WHAT_STR            "map2jnx, Version " VER_STR
+ 
+ #define JNX_MAX_TILES       50000 //6250
+--- qlandkartegt-1.8.1/3rdparty/cache2gtiff/main.cpp~  2014-08-08 11:53:46.000000000 +0200
++++ qlandkartegt-1.8.1/3rdparty/cache2gtiff/main.cpp   2019-04-06 10:37:57.093315233 +0200
+@@ -35,7 +35,7 @@
+ #define _MKSTR(x)           _MKSTR_1(x)
+ #endif
+ 
+-#define VER_STR             _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP)
++#define VER_STR             _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP)
+ #define WHAT_STR            "cache2gtiff, Version " VER_STR
+ 
+ 
+--- qlandkartegt-1.8.1/src/version.h~  2014-08-08 11:53:29.000000000 +0200
++++ qlandkartegt-1.8.1/src/version.h   2019-04-06 10:39:26.654433027 +0200
+@@ -23,6 +23,6 @@
+ #define _MKSTR(x)      _MKSTR_1(x)
+ #endif
+ 
+-#define VER_STR       _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP)
++#define VER_STR       _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP)
+ #define WHAT_STR      "QLandkarte GT, Version " VER_STR
+ #endif                           //VERSION_H

diff --git a/qlandkartegt.spec b/qlandkartegt.spec
index 5b39cd6e975602a6b160c9b692a8d1c468d360b0..aa9a46e01c97cb2685acde386a0892757f76e897 100644 (file)
--- a/qlandkartegt.spec
+++ b/qlandkartegt.spec
@@ -6,11 +6,12 @@ Summary:      Garmin's MapSource clone for Linux
 Summary(pl.UTF-8):     Klon MapSource pod Linuksa
 Name:          qlandkartegt
 Version:       1.8.1
-Release:       4
+Release:       5
 License:       GPLv2
 Group:         X11/Applications
 Source0:       http://downloads.sourceforge.net/qlandkartegt/%{name}-%{version}.tar.gz
 # Source0-md5: 2bfe90aff7e21b19572b7b250d76a540
+Patch0:                gcc8.patch
 URL:           http://qlandkarte.org
 BuildRequires: QtCore-devel >= 4.6.0
 BuildRequires: QtDBus-devel >= 4.6.0
@@ -39,10 +40,13 @@ Klon MapSource pod Linuksa.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
 cd build
+CFLAGS="%{rpmcflags} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
+CXXFLAGS="%{rpmcxxflags} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
 %cmake ..
 %{__make}