rpm/qgis
SHA256
1
0
Fork 0
forked from pool/qgis
Code Pull Requests Activity

Accepting request 616119 from home:bruno_friedmann:branches:Application:Geo

Browse Source 
- 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
This commit is contained in:
Nicolas Rochard 2018-06-11 19:52:16 +00:00 committed by Git OBS Bridge
parent f64d604b5e
commit 24b68d2156
4 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fix_3d_qt511.patch Normal file
View File

@ -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

22
fix_grass_qt511.patch Normal file
View File

@ -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"

6
qgis.changes
View File

@ -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

5
qgis.spec
View File

@ -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