pool/qgis
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 748573 from Application:Geo

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/748573
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qgis?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2019-11-14 23:12:58 +00:00 committed by Git OBS Bridge
commit cf301042c6
8 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch Normal file
View File

@ -0,0 +1,24 @@
From a07d915d7bf9c7c54b2047f8819ba2aae6669f35 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Wed, 13 Nov 2019 10:27:06 +0100
Subject: [PATCH] Add missing dep
Fix #32764
Acked-by: Libor Pechacek <lpechacek@gmx.com>
---
src/providers/wms/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt
index 60dc3448db37..22c71d1b2eab 100644
--- a/src/providers/wms/CMakeLists.txt
+++ b/src/providers/wms/CMakeLists.txt
@@ -68,6 +68,7 @@ IF (WITH_GUI)
)
TARGET_COMPILE_DEFINITIONS(wmsprovider_gui_a PRIVATE "-DQT_NO_FOREACH")
ADD_DEPENDENCIES(wmsprovider_gui_a ui)
+ ADD_DEPENDENCIES(wmsprovider_a ui)
ENDIF (WITH_GUI)
IF (FORCE_STATIC_PROVIDERS)

22
ef8f06330f57882f740cfe7f8f3659b54b1bb1fb.patch
View File

@ -1,22 +0,0 @@
From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Sat, 22 Jun 2019 10:11:31 +0200
Subject: [PATCH] Add missing include
Fix https://github.com/qgis/QGIS/issues/30316
---
src/analysis/interpolation/qgsinterpolator.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h
index 35343ccdf7f..5d694418299 100644
--- a/src/analysis/interpolation/qgsinterpolator.h
+++ b/src/analysis/interpolation/qgsinterpolator.h
@@ -19,6 +19,7 @@
#define QGSINTERPOLATOR_H
#include <QVector>
+#include <QList>
#include "qgis_sip.h"
#include "qgis_analysis.h"

3
qgis-3.10.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:25eb1c41d9fb922ffa337a720dfdceee43cf2d38409923f087c2010c9742f012
size 101075584

1
qgis-3.10.0.tar.bz2.sha256 Normal file
View File

@ -0,0 +1 @@
25eb1c41d9fb922ffa337a720dfdceee43cf2d38409923f087c2010c9742f012 qgis-3.10.0.tar.bz2

3
qgis-3.8.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cca3e8483bc158cb8e972eb819a55a5734ba70f2c7da28ebc485864aafb17bd
size 82720462

1
qgis-3.8.3.tar.bz2.md5
View File

@ -1 +0,0 @@
b7b4b5fba56b6b67e7de3fbe0c39f588 qgis-3.8.3.tar.bz2

16
qgis.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Nov 13 11:59:22 UTC 2019 - Libor Pechacek <lpechacek@gmx.com>
- Fix upstream issue 32764 preventing parallel build and remove the build time
workaround.
- Added patches:
a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch
-------------------------------------------------------------------
Thu Nov 7 18:35:16 UTC 2019 - Libor Pechacek <lpechacek@gmx.com>
- Update to 3.10.0, changes are documented at
http://changelog.qgis.org/en/qgis/version/3.10/
- Removed patches:
ef8f06330f57882f740cfe7f8f3659b54b1bb1fb.patch (merged upstream)
-------------------------------------------------------------------
Wed Oct 16 06:15:34 UTC 2019 - Antoine Belvire <antoine.belvire@opensuse.org>

16
qgis.spec
View File

@ -15,26 +15,26 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%bcond_without grass
%bcond_with otb
Name: qgis
Version: 3.8.3
Version: 3.10.0
Release: 0
Summary: A Geographic Information System (GIS)
License: GPL-2.0-only
Group: Productivity/Graphics/Visualization/Other
URL: https://qgis.org/
Source: https://qgis.org/downloads/%{name}-%{version}.tar.bz2
Source1: https://qgis.org/downloads/%{name}-%{version}.tar.bz2.md5
Source1: https://qgis.org/downloads/%{name}-%{version}.tar.bz2.sha256
Source2: %{name}.rpmlintrc
Source3: qgis_sample_data.zip
# Headers in Qt5.11 were cleaned up to no longer include unneeded other headers.
Patch0: fix_grass_qt511.patch
# PATCH-FIX-UPSTREAM Missing include https://github.com/qgis/QGIS/issues/30316
Patch1: ef8f06330f57882f740cfe7f8f3659b54b1bb1fb.patch
# PATCH-FIX-UPSTREAM fix randomness in desktop file translations
Patch2: qgis-3.8.3-reproducible.patch
Patch3: a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch
BuildRequires: FastCGI-devel
BuildRequires: bison >= 2.4
BuildRequires: cmake >= 3.0.0
@ -45,10 +45,10 @@ BuildRequires: geos-devel >= 3.4
%if %{with grass}
BuildRequires: grass-devel >= 7.2
%endif
BuildRequires: libexiv2-devel
BuildRequires: libQt5Sql-private-headers-devel
BuildRequires: libQt5Sql5-mysql
BuildRequires: libQt5Sql5-postgresql
BuildRequires: libexiv2-devel
# Add the 3 main db we should access
# also have them in requires
BuildRequires: libQt5Sql5-sqlite
@ -62,11 +62,11 @@ BuildRequires: otb-devel
BuildRequires: pkgconfig
BuildRequires: poppler-tools
BuildRequires: python-qscintilla-qt5-sip
BuildRequires: python3-GDAL
BuildRequires: python3-Jinja2
BuildRequires: python3-OWSLib
BuildRequires: python3-PyYAML
BuildRequires: python3-future
BuildRequires: python3-GDAL
BuildRequires: python3-psycopg2
BuildRequires: python3-pygments
BuildRequires: python3-qscintilla-qt5
@ -127,12 +127,12 @@ Requires: libQt5Sql5-mysql
Requires: libQt5Sql5-postgresql
# Force requires of those 3 main component.
Requires: libQt5Sql5-sqlite
Requires: python3-GDAL
Requires: python3-Jinja2
Requires: python3-OWSLib
Requires: python3-PyYAML
Requires: python3-Pygments
Requires: python3-future
Requires: python3-GDAL
Requires: python3-psycopg2
# Those are not picked by obs
Requires: python3-qscintilla-qt5
@ -187,8 +187,8 @@ QGIS sample data with raster, vector, gps files and a GRASS location from the Al
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Remove bad env and python version in grass plugin
sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,g' src/plugins/grass/scripts/*.py
sed -i 's,^#!%{_bindir}/env python3$,#!%{_bindir}/python3,g' src/plugins/grass/scripts/*.py