From 24b68d2156d83c54e10b11f01c37f6a8f187a6523b2377e249226c4c193c1c35 Mon Sep 17 00:00:00 2001
From: Nicolas Rochard <nrochard@gmail.com>
Date: Mon, 11 Jun 2018 19:52:16 +0000
Subject: [PATCH] Accepting request 616119 from
 home:bruno_friedmann:branches:Application:Geo

- Added patch fix_grass_qt511.patch fix_3d_qt511.patch
  to fix build with QT5 > 5.11

OBS-URL: https://build.opensuse.org/request/show/616119
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=232
---
 fix_3d_qt511.patch    | 12 ++++++++++++
 fix_grass_qt511.patch | 22 ++++++++++++++++++++++
 qgis.changes          |  6 ++++++
 qgis.spec             |  5 +++++
 4 files changed, 45 insertions(+)
 create mode 100644 fix_3d_qt511.patch
 create mode 100644 fix_grass_qt511.patch

diff --git a/fix_3d_qt511.patch b/fix_3d_qt511.patch
new file mode 100644
index 0000000..9221141
--- /dev/null
+++ b/fix_3d_qt511.patch
@@ -0,0 +1,12 @@
+diff -rup a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt
+--- a/src/3d/CMakeLists.txt	2018-05-18 14:01:05.000000000 +0200
++++ b/src/3d/CMakeLists.txt	2018-06-11 14:59:34.456085339 +0200
+@@ -145,7 +145,7 @@ INCLUDE_DIRECTORIES(SYSTEM
+ 
+ ADD_LIBRARY(qgis_3d SHARED ${QGIS_3D_SRCS} ${QGIS_3D_MOC_SRCS} ${QGIS_3D_HDRS} ${QGIS_3D_RCC_SRCS})
+ 
+-qt5_use_modules(qgis_3d 3DCore 3DRender 3DInput 3DLogic 3DExtras)
++TARGET_LINK_LIBRARIES(qgis_3d Qt5::3DCore Qt5::3DRender Qt5::3DInput Qt5::3DLogic Qt5::3DExtras)
+ 
+ GENERATE_EXPORT_HEADER(
+    qgis_3d
diff --git a/fix_grass_qt511.patch b/fix_grass_qt511.patch
new file mode 100644
index 0000000..0d0a259
--- /dev/null
+++ b/fix_grass_qt511.patch
@@ -0,0 +1,22 @@
+diff -rup a/src/plugins/grass/qgsgrassmoduleinput.h b/src/plugins/grass/qgsgrassmoduleinput.h
+--- a/src/plugins/grass/qgsgrassmoduleinput.h	2018-05-27 14:42:00.818046215 +0200
++++ b/src/plugins/grass/qgsgrassmoduleinput.h	2018-06-10 17:25:28.632016481 +0200
+@@ -23,6 +23,7 @@
+ #include <QFileSystemModel>
+ #include <QFileSystemWatcher>
+ #include <QGroupBox>
++#include <QHeaderView>
+ #include <QListView>
+ #include <QMap>
+ #include <QSortFilterProxyModel>
+diff -rup a/src/plugins/grass/qgsgrassregion.h b/src/plugins/grass/qgsgrassregion.h
+--- a/src/plugins/grass/qgsgrassregion.h	2018-05-27 14:42:00.822046231 +0200
++++ b/src/plugins/grass/qgsgrassregion.h	2018-06-10 18:13:31.935308056 +0200
+@@ -16,6 +16,7 @@
+ #ifndef QGSGRASSREGION_H
+ #define QGSGRASSREGION_H
+ 
++#include <QValidator>
+ #include "ui_qgsgrassregionbase.h"
+ #include "qgscoordinatereferencesystem.h"
+ #include "qgscoordinatetransform.h"
diff --git a/qgis.changes b/qgis.changes
index 8c6f418..5a9650c 100644
--- a/qgis.changes
+++ b/qgis.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 11 14:24:54 UTC 2018 - bruno@ioda-net.ch
+
+- Added patch fix_grass_qt511.patch fix_3d_qt511.patch 
+  to fix build with QT5 > 5.11 
+
 -------------------------------------------------------------------
 Fri Jun  8 11:49:08 UTC 2018 - ernst@pleiszenburg.de
 
diff --git a/qgis.spec b/qgis.spec
index 63338e2..51c1050 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -28,6 +28,9 @@ Source1:        %{name}.desktop
 Source2:        %{name}.rpmlintrc
 Source3:        qgis_sample_data.zip
 Source4:        https://qgis.org/downloads/%{name}-%{version}.tar.bz2.md5
+# Headers in Qt5.11 were cleaned up to no longer include unneeded other headers.
+Patch0:         fix_grass_qt511.patch
+Patch1:         fix_3d_qt511.patch
 BuildRequires:  -post-build-checks
 BuildRequires:  FastCGI-devel
 BuildRequires:  bison >= 2.4
@@ -163,6 +166,8 @@ QGIS sample data with free raster, vector, gps files and a GRASS location from A
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 #Fix shebang
 #sed -i "s,^#!/usr/bin/env python$,#!/usr/bin/python," ./src/plugins/grass/modules/*.py