PR#1: Update to 3.14.16 - rpms/qgis - src.fedoraproject.org

rpms / qgis

#1 Update to 3.14.16

Merged 3 years ago by orion. Opened 3 years ago by orion.

rpms/ orion/qgis update into master

Orion Poplawski • 3 years ago

2c3eddf

.gitignore

file modified

		`@@ -54,3 +54,4 @@`
		`/qgis-3.10.2.tar.bz2`
		`/qgis-3.12.0.tar.bz2`
		`/qgis-3.12.1.tar.bz2`
		`+ /qgis-3.14.16.tar.bz2`

qgis-lib64.patch

file modified

+4 -5

		`@@ -1,11 +1,10 @@`
		`- diff --git a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake`
		`- index 607960c9..77b5c93f 100644`
		`- --- a/cmake/PyQtMacros.cmake`
		`- +++ b/cmake/PyQtMacros.cmake`
		`+ diff -up qgis-3.14.16/cmake/PyQtMacros.cmake.lib64 qgis-3.14.16/cmake/PyQtMacros.cmake`
		`+ --- qgis-3.14.16/cmake/PyQtMacros.cmake.lib64 2020-10-17 16:20:28.086666501 -0600`
		`+ +++ qgis-3.14.16/cmake/PyQtMacros.cmake 2020-10-17 16:22:51.087723411 -0600`
		`@@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles )`
		`ELSE(CMAKE_HOST_WIN32)`
		`# TODO osx`
		`- SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")`
		`+ SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh")`
		`- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")`
		`+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")`
		`ENDIF(CMAKE_HOST_WIN32)`

qgis.spec

file modified

+13 -21

		`@@ -23,8 +23,8 @@`
		`#TODO: Run test suite (see debian/rules)`

		`Name: qgis`
		`- Version: 3.12.1`
		`- Release: 7%{?dist}`
		`+ Version: 3.14.16`
		`+ Release: 1%{?dist}`
		`Summary: A user friendly Open Source Geographic Information System`

		`# http://issues.qgis.org/issues/3789`
		`@@ -76,9 +76,12 @@`

		`BuildRequires: libdxfrw-devel`
		`BuildRequires: libzip-devel`
		`+ BuildRequires: netcdf-devel`
		`+ BuildRequires: ocl-icd-devel`
		`BuildRequires: opencl-headers`
		`BuildRequires: postgresql-devel`
		`BuildRequires: proj-devel`
		`+ BuildRequires: protobuf-lite-devel`
		`BuildRequires: qt5-qtlocation-devel`
		`BuildRequires: qt5-qtwebkit-devel`
		`BuildRequires: qt5-qttools-static`
		`@@ -260,36 +263,20 @@`
		`%cmake_install`

		`# Install desktop file without connecting proprietary file types`
		`- desktop-file-install \`
		`+ desktop-file-edit \`
		`--remove-mime-type="application/x-raster-ecw" \`
		`--remove-mime-type="application/x-raster-mrsid" \`
		`- --dir=%{buildroot}%{_datadir}/applications \`
		`- org.qgis.qgis.desktop`
		`+ %{buildroot}%{_datadir}/applications/org.qgis.qgis.desktop`

		`# Install MIME type definitions`
		`install -d %{buildroot}%{_datadir}/mime/packages`
		`install -pm0644 %{SOURCE5} \`
		`%{buildroot}%{_datadir}/mime/packages/%{name}.xml`

		`- # Install application and MIME icons`
		`- for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do`
		`- install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/apps`
		`- install -pm0644 linux/icons/%{name}-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/qgis.png`
		`- done`
		`-`
		`- for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do`
		`- install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes`
		`- install -pm0644 linux/icons/qgis-mime-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes/qgis-mime.png`
		`- done`
		`-`
		`install -pd %{buildroot}%{_datadir}/pixmaps`
		`- install -pd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps`
		`-`
		`install -pm0644 images/icons/%{name}-icon-512x512.png %{buildroot}%{_datadir}/pixmaps/%{name}.png`
		`install -pm0644 images/icons/%{name}_icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg`
		`- install -pm0644 images/icons/%{name}_icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg`
		`install -pm0644 images/icons/%{name}-mime-icon.png %{buildroot}%{_datadir}/pixmaps/%{name}-mime.png`
		`- install -pm0644 images/icons/%{name}_mime_icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-mime.svg`

		`# Install basic QGIS Mapserver configuration for Apache`
		`install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d`
		`@@ -314,7 +301,8 @@`


		`%files -f %{name}.lang`
		`- %doc BUGS NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz`
		`+ %license COPYING`
		`+ %doc BUGS NEWS.md README.md Exception_to_GPL_for_Qt.txt ChangeLog.gz`
		`# QGIS shows the following files in the GUI, including the license text`
		`%doc %{_datadir}/%{name}/doc/`
		`%dir %{_datadir}/%{name}/i18n/`
		`@@ -329,6 +317,7 @@`
		`%{_libdir}/%{name}/`
		`%{_qt5_plugindir}/sqldrivers/libqsqlspatialite.so`
		`%{_bindir}/%{name}`
		`+ %{_bindir}/%{name}_process`
		`%{_mandir}/man1/%{name}.1*`
		`%dir %{_datadir}/%{name}/`
		`%{_datadir}/mime/packages/qgis.xml`
		`@@ -381,6 +370,9 @@`


		`%changelog`
		`+ * Sun Oct 18 2020 Orion Poplawski <orion@nwra.com> - 3.14.16-1`
		`+ - Update to 3.14.16`
		`+`
		`* Fri Sep 11 2020 Jan Grulich <jgrulich@redhat.com> - 3.12.1-7`
		`- rebuild (qt5)`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (qgis-3.12.1.tar.bz2) = 855a18a0d2342d1d12a88bc4c4c52b71067fa4ef9b4a6d833798fe3fccaec6255c35dc129d0c6566c87fe641dc058ae7495bda382d4dec761a8ee824031d3d04`
		`+ SHA512 (qgis-3.14.16.tar.bz2) = 0b26575df5a1903e12300522b4ca915c01c1b324677d91f1746b6e8a79d9bd66b1a0c3297178dc47bc8725728d1df15cc2d955291025704243f1b1f98e5d7a95`

orion commented 3 years ago

I started looking at updating to 3.12.3 to resolve the FTFBS issues, but kept running into compilation issues. Bit the bullet to update to 3.14.16. Hopefully this build finishes.

Still want to look at the OpenCL detection failure as well, but since that has been that way for a while it's not a big deal.