From 9cdf5895fd3e05ec5f057305dd9092bd4657695e0d73d8378f98542ce8f247e8 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 14 Nov 2019 09:21:27 +0000 Subject: [PATCH] Accepting request 748410 from home:LPechacek:qgis-issue-32764 Final fix for the build issue (upstream issue #32764). OBS-URL: https://build.opensuse.org/request/show/748410 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=278 --- ...915d7bf9c7c54b2047f8819ba2aae6669f35.patch | 24 +++++++++++++++++++ qgis.changes | 8 +++++++ qgis.spec | 6 ++--- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch diff --git a/a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch b/a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch new file mode 100644 index 0000000..d073717 --- /dev/null +++ b/a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch @@ -0,0 +1,24 @@ +From a07d915d7bf9c7c54b2047f8819ba2aae6669f35 Mon Sep 17 00:00:00 2001 +From: Matthias Kuhn +Date: Wed, 13 Nov 2019 10:27:06 +0100 +Subject: [PATCH] Add missing dep + +Fix #32764 + +Acked-by: Libor Pechacek +--- + 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) diff --git a/qgis.changes b/qgis.changes index 6225452..b570715 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 13 11:59:22 UTC 2019 - Libor Pechacek + +- 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 diff --git a/qgis.spec b/qgis.spec index e2f4065..98ae5e3 100644 --- a/qgis.spec +++ b/qgis.spec @@ -34,6 +34,7 @@ Source3: qgis_sample_data.zip Patch0: fix_grass_qt511.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 @@ -187,6 +188,7 @@ QGIS sample data with raster, vector, gps files and a GRASS location from the Al %setup -q %patch0 -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 @@ -229,9 +231,7 @@ export PATH=$PATH:$QTDIR/bin export QTDIR=%{_prefix} export PATH=$PATH:$QTDIR/bin -# Limit number of build jobs to work around https://github.com/qgis/QGIS/issues/32764 -# VVV - remove once the fix is in place -%make_jobs -j3 +%make_jobs %install %cmake_install