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

Accepting request 771737 from home:Guillaume_G:branches:Application:Geo

Browse Source 
- Update to 3.10.2 (bugfix)
- Drop usptreamed patch:
  * qgis-3.8.3-reproducible.patch
  * a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch
  * Fix-build-with-txt2tags-3.3.patch
- Fix build on Leap 15.1 (fix grass folder)

OBS-URL: https://build.opensuse.org/request/show/771737
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=289
This commit is contained in:
Nicolas Rochard 2020-02-07 15:43:37 +00:00 committed by Git OBS Bridge
parent 5a9cf32dbc
commit 43f6ac019b
9 changed files with 23 additions and 12604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12537
Fix-build-with-txt2tags-3.3.patch
View File

File diff suppressed because it is too large Load Diff

24
a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch
View File

@ -1,24 +0,0 @@
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)

3
qgis-3.10.0.tar.bz2
View File

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

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

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

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

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

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

@ -0,0 +1 @@
381cb01a8ac2f5379a915b124e9c830d727d2c67775ec49609c7153fe765a6f7 qgis-3.10.2.tar.bz2

27
qgis-3.8.3-reproducible.patch
View File

@ -1,27 +0,0 @@
From 1719c04f014cb47284be50b335e9835d687c7dff Mon Sep 17 00:00:00 2001
From: Antoine Belvire <antoine.belvire@opensuse.org>
Date: Sat, 12 Oct 2019 11:00:10 +0200
Subject: [PATCH] Sort translations in desktop file
Randomness is introduced by usage of Python's glob. Let's sort the result to
get a more reproducible build.
---
scripts/ts2appinfo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/ts2appinfo.py b/scripts/ts2appinfo.py
index 5fadd30e30..a9018a26c3 100644
--- a/scripts/ts2appinfo.py
+++ b/scripts/ts2appinfo.py
@@ -57,7 +57,7 @@ except AttributeError:
app = QCoreApplication(argvb)
-for qm in glob(sys.argv[1] + "/output/i18n/qgis_*.qm"):
+for qm in sorted(glob(sys.argv[1] + "/output/i18n/qgis_*.qm")):
translator = QTranslator()
translator.load(qm)
--
2.23.0

10
qgis.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Feb 7 10:14:37 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to 3.10.2 (bugfix)
- Drop usptreamed patch:
* qgis-3.8.3-reproducible.patch
* a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch
* Fix-build-with-txt2tags-3.3.patch
- Fix build on Leap 15.1 (fix grass folder)
-------------------------------------------------------------------
Thu Jan 2 10:18:47 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

21
qgis.spec
View File

@ -17,9 +17,8 @@
%bcond_without grass
Name: qgis
Version: 3.10.0
Version: 3.10.2
Release: 0
Summary: A Geographic Information System (GIS)
License: GPL-2.0-only
@ -29,11 +28,6 @@ Source: https://qgis.org/downloads/%{name}-%{version}.tar.bz2
Source1: https://qgis.org/downloads/%{name}-%{version}.tar.bz2.sha256
Source2: %{name}.rpmlintrc
Source3: qgis_sample_data.zip
# PATCH-FIX-UPSTREAM fix randomness in desktop file translations
Patch0: qgis-3.8.3-reproducible.patch
Patch1: a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch
# PATCH-FIX-UPSTREAM fix build with recent txt2tags versions
Patch2: Fix-build-with-txt2tags-3.3.patch
BuildRequires: FastCGI-devel
BuildRequires: bison >= 2.4
BuildRequires: cmake >= 3.0.0
@ -41,16 +35,13 @@ BuildRequires: fdupes
BuildRequires: filesystem
BuildRequires: flex >= 2.5.6
BuildRequires: geos-devel >= 3.4
%if %{with grass}
BuildRequires: grass-devel >= 7.2
%endif
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
BuildRequires: libexiv2-devel
BuildRequires: libqscintilla_qt5-devel
BuildRequires: libspatialindex-devel
BuildRequires: ocl-icd-devel
@ -141,13 +132,15 @@ Recommends: gpsbabel
Conflicts: qgis-ltr
Conflicts: qgis-master
Obsoletes: qgis2
%if %{with grass}
BuildRequires: grass-devel >= 7.2
%endif
%package devel
Summary: Development Libraries for QGIS
Group: Development/Libraries/C and C++
Requires: python3-qt5-devel
Requires: qgis = %{version}
%if %{with grass}
%package plugin-grass
Summary: GRASS Support Libraries for QGIS
@ -200,7 +193,11 @@ export PATH=$PATH:$QTDIR/bin
%if %{with grass}
-DWITH_GRASS=TRUE \
-DWITH_GRASS7=TRUE \
%if 0%{?suse_version} > 1500
-DGRASS_PREFIX7=`cat %{_sysconfdir}/GRASSDIR` \
%else
-DGRASS_PREFIX7=%{_libdir}/grass78 \
%endif
%endif
-DWITH_QSPATIALITE=TRUE \
-DWITH_SERVER=TRUE \