From 0825710b3e1c88e8fb8ad1c4e3c4e136197ca556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 17 Jan 2020 23:43:28 +0100 Subject: [PATCH 001/201] New version 3.10.2 --- .gitignore | 1 + qgis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9f1fefb..c8d5397 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ qgis_1.5.0.tar.gz /qgis-3.8.3.tar.bz2 /qgis-3.10.0.tar.bz2 /qgis-3.10.1.tar.bz2 +/qgis-3.10.2.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 9322933..b4645d1 100644 --- a/qgis.spec +++ b/qgis.spec @@ -23,8 +23,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.10.1 -Release: 2%{?dist} +Version: 3.10.2 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -381,6 +381,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri Jan 17 2020 Volker Froehlich - 3.10.2-1 +- New upstream release + * Mon Dec 09 2019 Jan Grulich - 3.10.1-2 - rebuild (qt5) diff --git a/sources b/sources index 0a76317..0fa6b1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.10.1.tar.bz2) = 0e3620d4f6aefc64c243ffd307ad5a4ed44be540d5e11f5a1cf49f046e0c7a09d3470ebb6c6efbe1481c80b3f694636044c071143daa37f3b5d8d67a273cc536 +SHA512 (qgis-3.10.2.tar.bz2) = d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f From d9df2dc5561452b4e9c03edffe2bac4bef1f08ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Mon, 20 Jan 2020 09:16:15 +0100 Subject: [PATCH 002/201] Add Hant translation again --- qgis.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qgis.spec b/qgis.spec index b4645d1..db2cfdb 100644 --- a/qgis.spec +++ b/qgis.spec @@ -321,6 +321,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %doc %{_datadir}/%{name}/doc/ %dir %{_datadir}/%{name}/i18n/ %lang(zh-Hans) %{_datadir}/%{name}/i18n/%{name}_zh-Hans.qm +%lang(zh-Hant) %{_datadir}/%{name}/i18n/%{name}_zh-Hant.qm %{_libdir}/lib%{name}_native.so.* %{_libdir}/lib%{name}_app.so.* %{_libdir}/lib%{name}_analysis.so.* @@ -383,6 +384,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog * Fri Jan 17 2020 Volker Froehlich - 3.10.2-1 - New upstream release +- Add Hant translation again * Mon Dec 09 2019 Jan Grulich - 3.10.1-2 - rebuild (qt5) From 3a505513590a909aa3f0649b7fa0c93efcf94185 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 16:42:16 +0000 Subject: [PATCH 003/201] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index db2cfdb..7608fad 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.10.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -382,6 +382,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.10.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Volker Froehlich - 3.10.2-1 - New upstream release - Add Hant translation again From ae79d2cdc84b12ebc2cbdd6e24afdd8b62b2d5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sun, 23 Feb 2020 13:32:43 +0100 Subject: [PATCH 004/201] New version 3.12.0 --- .gitignore | 1 + qgis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c8d5397..b0cdc9a 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ qgis_1.5.0.tar.gz /qgis-3.10.0.tar.bz2 /qgis-3.10.1.tar.bz2 /qgis-3.10.2.tar.bz2 +/qgis-3.12.0.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 7608fad..86fbe35 100644 --- a/qgis.spec +++ b/qgis.spec @@ -23,8 +23,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.10.2 -Release: 2%{?dist} +Version: 3.12.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -382,6 +382,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sat Feb 22 2020 Volker Froehlich - 3.12.0-1 +- New upstream release + * Thu Jan 30 2020 Fedora Release Engineering - 3.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 0fa6b1e..b9f51f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.10.2.tar.bz2) = d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f +SHA512 (qgis-3.12.0.tar.bz2) = 26b70fbf321a3674afbfeefef7de69c390bea2d50e05418a9ca955b6b35bb76368755e0936516241e890b11c11b6740faa3d815fd1312bfdceda556894e1c5f0 From a066e43a4d1e54c871d070213b1001a96cef1e49 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 3 Mar 2020 17:26:32 +0100 Subject: [PATCH 005/201] Rebuild (gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 86fbe35..ffbea14 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -382,6 +382,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Tue Mar 03 2020 Sandro Mani - 3.12.0-2 +- Rebuild (gdal) + * Sat Feb 22 2020 Volker Froehlich - 3.12.0-1 - New upstream release From 1a6df31fc7a0516a358ab51e93449c8965ad074e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 3 Mar 2020 23:20:52 +0100 Subject: [PATCH 006/201] Add %{_bindir}/qgis_mapserver to files --- qgis.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qgis.spec b/qgis.spec index ffbea14..18bdec8 100644 --- a/qgis.spec +++ b/qgis.spec @@ -374,6 +374,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %files server %doc src/server/admin.sld src/server/wms_metadata.xml %{name}-server-README.fedora %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf +%{_bindir}/qgis_mapserver %{_libdir}/%{name}/server/ %{_libdir}/lib%{name}_server.so.* %{_libexecdir}/%{name}/ From 49bfbaf1ea1738e909862a897f6849336a823372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sat, 21 Mar 2020 19:30:24 +0100 Subject: [PATCH 007/201] New version 3.12.1 and fix for BZ#1815712 python3-qscintilla-qt5 was already required and provides the same as the other subpackage, that was only built when built for qt4 though! --- .gitignore | 1 + qgis.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b0cdc9a..2625747 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ qgis_1.5.0.tar.gz /qgis-3.10.1.tar.bz2 /qgis-3.10.2.tar.bz2 /qgis-3.12.0.tar.bz2 +/qgis-3.12.1.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 18bdec8..cd6ff7d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -23,8 +23,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.12.0 -Release: 2%{?dist} +Version: 3.12.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -174,7 +174,6 @@ Requires: python3-OWSLib Requires: python3-psycopg2 Requires: python3-pygments Requires: python3-PyYAML -Requires: python3-qscintilla Requires: python3-qscintilla-qt5 Requires: python3-qt5-webkit %{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} @@ -383,6 +382,10 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sat Mar 21 2020 Volker Froehlich - 3.12.1-1 +- New upstream release +- Don't require python3-qscintilla anymore (BZ #1815712) + * Tue Mar 03 2020 Sandro Mani - 3.12.0-2 - Rebuild (gdal) diff --git a/sources b/sources index b9f51f5..793f435 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.12.0.tar.bz2) = 26b70fbf321a3674afbfeefef7de69c390bea2d50e05418a9ca955b6b35bb76368755e0936516241e890b11c11b6740faa3d815fd1312bfdceda556894e1c5f0 +SHA512 (qgis-3.12.1.tar.bz2) = 855a18a0d2342d1d12a88bc4c4c52b71067fa4ef9b4a6d833798fe3fccaec6255c35dc129d0c6566c87fe641dc058ae7495bda382d4dec761a8ee824031d3d04 From 1c535d6ee7fbcb325f2aabd1bf31394dec78bd1c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 5 Apr 2020 22:38:29 -0500 Subject: [PATCH 008/201] rebuild (qt5) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index cd6ff7d..5d32dac 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -382,6 +382,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Mon Apr 06 2020 Rex Dieter - 3.12.1-2 +- rebuild (qt5) + * Sat Mar 21 2020 Volker Froehlich - 3.12.1-1 - New upstream release - Don't require python3-qscintilla anymore (BZ #1815712) From 244e3574ebe863627c03f2f53dc4aa37d9898ecd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 6 Apr 2020 10:32:09 -0500 Subject: [PATCH 009/201] drop BR: qt5-devel that's a convenience metapackage for end-users only, not intended to be used in any fedora packaging (ever). --- qgis.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 5d32dac..1f1a487 100644 --- a/qgis.spec +++ b/qgis.spec @@ -101,7 +101,6 @@ BuildRequires: python3-qscintilla-qt5 BuildRequires: qtkeychain-qt5-devel BuildRequires: qscintilla-qt5-devel -BuildRequires: qt5-devel BuildRequires: qt5-qtbase-private-devel #TODO: Something doesn't work here -- no idea what I meant by that. BuildRequires: qt5-qtdeclarative-devel @@ -384,6 +383,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog * Mon Apr 06 2020 Rex Dieter - 3.12.1-2 - rebuild (qt5) +- drop BR: qt5-devel * Sat Mar 21 2020 Volker Froehlich - 3.12.1-1 - New upstream release From 2946fcf720be4d9f4010a49dfc9b42fcfc28a535 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 6 Apr 2020 11:51:05 -0500 Subject: [PATCH 010/201] fix qt5-qtserialport dep --- qgis.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 1f1a487..220bb86 100644 --- a/qgis.spec +++ b/qgis.spec @@ -82,7 +82,7 @@ BuildRequires: proj-devel BuildRequires: qt5-qtlocation-devel BuildRequires: qt5-qtwebkit-devel BuildRequires: qt5-qttools-static -BuildRequires: qt5-qtserialport +BuildRequires: qt5-qtserialport-devel BuildRequires: qt5-qt3d-devel # PyQwt doesn't support qwt6, so just turn it off for now on RHEL %if 0%{?fedora} < 26 From 326a711af6d989ae878985b25c81009be6405277 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 21 May 2020 12:04:18 +0200 Subject: [PATCH 011/201] Rebuild (gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 220bb86..bee8018 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -381,6 +381,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Thu May 21 2020 Sandro Mani - 3.12.1-3 +- Rebuild (gdal) + * Mon Apr 06 2020 Rex Dieter - 3.12.1-2 - rebuild (qt5) - drop BR: qt5-devel From 2269d53e8bf72608b8d39e29b9767bd5886a2c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:48:20 +0200 Subject: [PATCH 012/201] Rebuilt for Python 3.9 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index bee8018..22c0d6f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.12.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -381,6 +381,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Tue May 26 2020 Miro Hrončok - 3.12.1-4 +- Rebuilt for Python 3.9 + * Thu May 21 2020 Sandro Mani - 3.12.1-3 - Rebuild (gdal) From bb3f06a11ab2a7a0da4af45b87397980d65696b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:01:18 +0000 Subject: [PATCH 013/201] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 22c0d6f..11d2d80 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.12.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -381,6 +381,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.12.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 3.12.1-4 - Rebuilt for Python 3.9 From 34482e8a197f8803f28224891246cceff8f0c9c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 07:30:29 +0000 Subject: [PATCH 014/201] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qgis.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 11d2d80..46d0649 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.12.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -381,6 +381,10 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.12.1-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.12.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7315b693825c429084c9146838abb2ab6ca489fe Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 11 Sep 2020 11:29:46 +0200 Subject: [PATCH 015/201] rebuild (qt5) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 46d0649..02d4cc4 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.12.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -381,6 +381,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri Sep 11 2020 Jan Grulich - 3.12.1-7 +- rebuild (qt5) + * Sat Aug 01 2020 Fedora Release Engineering - 3.12.1-6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 53f398ef61e57c697fe6738b0cbf1a804c8d79a9 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 11 Sep 2020 21:25:22 +0200 Subject: [PATCH 016/201] Use cmake macros --- qgis.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index 02d4cc4..1c0f242 100644 --- a/qgis.spec +++ b/qgis.spec @@ -251,13 +251,13 @@ gzip ChangeLog # Parallel build appears to occasionally result in build failures # (UI form headers generated too late) -make %{?_smp_mflags} +%cmake_build %install # Necessary for the test suite #export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib} -make install DESTDIR=%{buildroot} +%cmake_install # Install desktop file without connecting proprietary file types desktop-file-install \ From 2c3eddf90020022115d90de2f8b5ea91d8cc1eb3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 18 Oct 2020 09:04:56 -0600 Subject: [PATCH 017/201] Update to 3.14.16 Add BR ocl-icd-devel --- .gitignore | 1 + qgis-lib64.patch | 9 ++++----- qgis.spec | 34 +++++++++++++--------------------- sources | 2 +- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 2625747..74f2bc5 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ qgis_1.5.0.tar.gz /qgis-3.10.2.tar.bz2 /qgis-3.12.0.tar.bz2 /qgis-3.12.1.tar.bz2 +/qgis-3.14.16.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 11d06b4..6fc2f52 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -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) diff --git a/qgis.spec b/qgis.spec index 1c0f242..99f0cfc 100644 --- a/qgis.spec +++ b/qgis.spec @@ -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: libspatialite-devel 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 @@ gzip ChangeLog %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 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %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 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %{_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 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sun Oct 18 2020 Orion Poplawski - 3.14.16-1 +- Update to 3.14.16 + * Fri Sep 11 2020 Jan Grulich - 3.12.1-7 - rebuild (qt5) diff --git a/sources b/sources index 793f435..439c342 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.12.1.tar.bz2) = 855a18a0d2342d1d12a88bc4c4c52b71067fa4ef9b4a6d833798fe3fccaec6255c35dc129d0c6566c87fe641dc058ae7495bda382d4dec761a8ee824031d3d04 +SHA512 (qgis-3.14.16.tar.bz2) = 0b26575df5a1903e12300522b4ca915c01c1b324677d91f1746b6e8a79d9bd66b1a0c3297178dc47bc8725728d1df15cc2d955291025704243f1b1f98e5d7a95 From b2f942f3c95fba920f70eadd760671e920569c90 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 3 Nov 2020 19:25:52 +0100 Subject: [PATCH 018/201] Fix QGIS Server prefix calculation --- qgis-serverprefix.patch | 15 +++++++++++++++ qgis.spec | 10 +++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 qgis-serverprefix.patch diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch new file mode 100644 index 0000000..7ed1ef0 --- /dev/null +++ b/qgis-serverprefix.patch @@ -0,0 +1,15 @@ +diff -rupN qgis-3.14.16/src/core/qgsapplication.cpp qgis-3.14.16-new/src/core/qgsapplication.cpp +--- qgis-3.14.16/src/core/qgsapplication.cpp 2020-09-11 14:08:53.000000000 +0200 ++++ qgis-3.14.16-new/src/core/qgsapplication.cpp 2020-11-03 14:39:00.638693040 +0100 +@@ -283,6 +283,11 @@ void QgsApplication::init( QString profi + { + myDir.cdUp(); + } ++ // Fix for server which is one level deeper in /usr/libexec/qgis ++ else if ( applicationDirPath().contains( QStringLiteral( "libexec/qgis" ) ) ) ++ { ++ myDir.cdUp(); ++ } + myDir.cdUp(); // Go from /usr/bin or /usr/lib (for server) to /usr + QString myPrefix = myDir.absolutePath(); + setPrefixPath( myPrefix, true ); diff --git a/qgis.spec b/qgis.spec index 99f0cfc..6b6691d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.14.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -46,6 +46,8 @@ Source5: %{name}-mime.xml # Fix builds on 64-bit machines # https://issues.qgis.org/issues/15602 Patch0: %{name}-lib64.patch +# Fix QGIS Server prefix calculation +Patch1: %{name}-serverprefix.patch # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: @@ -199,8 +201,7 @@ for styling. Sample configurations for Httpd and Lighttpd are included. Please refer to %{name}-server-README.fedora for details! %prep -%setup -q -%patch0 -p1 -b .lib64 +%autosetup -p1 # Remove executable permissions from source code files find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ @@ -370,6 +371,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Tue Nov 03 2020 Sandro Mani - 3.14.16-2 +- Fix QGIS Server prefix calculation + * Sun Oct 18 2020 Orion Poplawski - 3.14.16-1 - Update to 3.14.16 From 0f983bdc5e3242bd6d6d2ae781d7b2a2b4e24f6d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 4 Nov 2020 12:14:45 +0100 Subject: [PATCH 019/201] Update to 3.16.0 --- .gitignore | 1 + qgis-lib64.patch | 6 +++--- qgis-server-httpd.conf | 4 ++++ qgis-serverprefix.patch | 8 ++++---- qgis.spec | 7 +++++-- sources | 2 +- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 74f2bc5..66d1099 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ qgis_1.5.0.tar.gz /qgis-3.12.0.tar.bz2 /qgis-3.12.1.tar.bz2 /qgis-3.14.16.tar.bz2 +/qgis-3.16.0.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 6fc2f52..6bb3a11 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -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 +diff -rupN --no-dereference qgis-3.16.0/cmake/PyQtMacros.cmake qgis-3.16.0-new/cmake/PyQtMacros.cmake +--- qgis-3.16.0/cmake/PyQtMacros.cmake 2020-10-23 14:10:17.000000000 +0200 ++++ qgis-3.16.0-new/cmake/PyQtMacros.cmake 2020-11-04 10:23:32.567918698 +0100 @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-server-httpd.conf b/qgis-server-httpd.conf index ce4e4bc..c14d78d 100644 --- a/qgis-server-httpd.conf +++ b/qgis-server-httpd.conf @@ -26,3 +26,7 @@ ScriptAlias /qgis/ "/usr/libexec/qgis/" + +# Uncomment to output QGIS Server log to apache error_log +# FcgidInitialEnv QGIS_SERVER_LOG_STDERR 1 +# FcgidInitialEnv QGIS_SERVER_LOG_LEVEL 0 diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 7ed1ef0..9d1fb1e 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN qgis-3.14.16/src/core/qgsapplication.cpp qgis-3.14.16-new/src/core/qgsapplication.cpp ---- qgis-3.14.16/src/core/qgsapplication.cpp 2020-09-11 14:08:53.000000000 +0200 -+++ qgis-3.14.16-new/src/core/qgsapplication.cpp 2020-11-03 14:39:00.638693040 +0100 -@@ -283,6 +283,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.16.0/src/core/qgsapplication.cpp qgis-3.16.0-new/src/core/qgsapplication.cpp +--- qgis-3.16.0/src/core/qgsapplication.cpp 2020-10-23 14:10:17.000000000 +0200 ++++ qgis-3.16.0-new/src/core/qgsapplication.cpp 2020-11-04 10:23:35.573921291 +0100 +@@ -294,6 +294,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis.spec b/qgis.spec index 6b6691d..a280f13 100644 --- a/qgis.spec +++ b/qgis.spec @@ -23,8 +23,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.14.16 -Release: 2%{?dist} +Version: 3.16.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -371,6 +371,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed Nov 04 2020 Sandro Mani - 3.16.0-1 +- Update to 3.16.0 + * Tue Nov 03 2020 Sandro Mani - 3.14.16-2 - Fix QGIS Server prefix calculation diff --git a/sources b/sources index 439c342..0f63d05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.14.16.tar.bz2) = 0b26575df5a1903e12300522b4ca915c01c1b324677d91f1746b6e8a79d9bd66b1a0c3297178dc47bc8725728d1df15cc2d955291025704243f1b1f98e5d7a95 +SHA512 (qgis-3.16.0.tar.bz2) = c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10 From b44f917fe6377e36079733b8c9d433f69448ecab Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 12 Nov 2020 15:04:29 +0100 Subject: [PATCH 020/201] Rebuild (proj, gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index a280f13..8cf8277 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -371,6 +371,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed Nov 11 13:08:14 CET 2020 Sandro Mani - 3.16.0-2 +- Rebuild (proj, gdal) + * Wed Nov 04 2020 Sandro Mani - 3.16.0-1 - Update to 3.16.0 From ef957a6580e4a0c8a0e8e102b6213f5848fd8009 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 20 Nov 2020 16:01:17 +0100 Subject: [PATCH 021/201] Update to 3.16.1 --- .gitignore | 1 + qgis-lib64.patch | 6 +++--- qgis-serverprefix.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 66d1099..c3e0146 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ qgis_1.5.0.tar.gz /qgis-3.12.1.tar.bz2 /qgis-3.14.16.tar.bz2 /qgis-3.16.0.tar.bz2 +/qgis-3.16.1.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 6bb3a11..0726f46 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.16.0/cmake/PyQtMacros.cmake qgis-3.16.0-new/cmake/PyQtMacros.cmake ---- qgis-3.16.0/cmake/PyQtMacros.cmake 2020-10-23 14:10:17.000000000 +0200 -+++ qgis-3.16.0-new/cmake/PyQtMacros.cmake 2020-11-04 10:23:32.567918698 +0100 +diff -rupN --no-dereference qgis-3.16.1/cmake/PyQtMacros.cmake qgis-3.16.1-new/cmake/PyQtMacros.cmake +--- qgis-3.16.1/cmake/PyQtMacros.cmake 2020-11-20 14:11:26.000000000 +0100 ++++ qgis-3.16.1-new/cmake/PyQtMacros.cmake 2020-11-20 14:57:25.369208214 +0100 @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 9d1fb1e..9a42005 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.16.0/src/core/qgsapplication.cpp qgis-3.16.0-new/src/core/qgsapplication.cpp ---- qgis-3.16.0/src/core/qgsapplication.cpp 2020-10-23 14:10:17.000000000 +0200 -+++ qgis-3.16.0-new/src/core/qgsapplication.cpp 2020-11-04 10:23:35.573921291 +0100 +diff -rupN --no-dereference qgis-3.16.1/src/core/qgsapplication.cpp qgis-3.16.1-new/src/core/qgsapplication.cpp +--- qgis-3.16.1/src/core/qgsapplication.cpp 2020-11-20 14:11:26.000000000 +0100 ++++ qgis-3.16.1-new/src/core/qgsapplication.cpp 2020-11-20 14:57:27.006205336 +0100 @@ -294,6 +294,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis.spec b/qgis.spec index 8cf8277..a240325 100644 --- a/qgis.spec +++ b/qgis.spec @@ -23,8 +23,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.16.0 -Release: 2%{?dist} +Version: 3.16.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -371,6 +371,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri Nov 20 2020 Sandro Mani - 3.16.1-1 +- Update to 3.16.1 + * Wed Nov 11 13:08:14 CET 2020 Sandro Mani - 3.16.0-2 - Rebuild (proj, gdal) diff --git a/sources b/sources index 0f63d05..e8f44d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.16.0.tar.bz2) = c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10 +SHA512 (qgis-3.16.1.tar.bz2) = 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8 From 1212b40ae6cfb4b4ffa98012c9e2674ac1eb4878 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 23 Nov 2020 07:54:37 +0100 Subject: [PATCH 022/201] rebuild (qt5) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index a240325..37015be 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -371,6 +371,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Mon Nov 23 07:54:37 CET 2020 Jan Grulich - 3.16.1-2 +- rebuild (qt5) + * Fri Nov 20 2020 Sandro Mani - 3.16.1-1 - Update to 3.16.1 From eacf0478db7bfd4de0d7e931facdff1308458c62 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 21 Dec 2020 15:15:13 +0100 Subject: [PATCH 023/201] Update to 3.16.2 --- .gitignore | 1 + qgis-lib64.patch | 6 +++--- qgis-serverprefix.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c3e0146..40f6cb7 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ qgis_1.5.0.tar.gz /qgis-3.14.16.tar.bz2 /qgis-3.16.0.tar.bz2 /qgis-3.16.1.tar.bz2 +/qgis-3.16.2.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 0726f46..b777394 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.16.1/cmake/PyQtMacros.cmake qgis-3.16.1-new/cmake/PyQtMacros.cmake ---- qgis-3.16.1/cmake/PyQtMacros.cmake 2020-11-20 14:11:26.000000000 +0100 -+++ qgis-3.16.1-new/cmake/PyQtMacros.cmake 2020-11-20 14:57:25.369208214 +0100 +diff -rupN --no-dereference qgis-3.16.2/cmake/PyQtMacros.cmake qgis-3.16.2-new/cmake/PyQtMacros.cmake +--- qgis-3.16.2/cmake/PyQtMacros.cmake 2020-12-21 00:12:56.000000000 +0100 ++++ qgis-3.16.2-new/cmake/PyQtMacros.cmake 2020-12-21 13:03:26.480455502 +0100 @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 9a42005..9d2d572 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.16.1/src/core/qgsapplication.cpp qgis-3.16.1-new/src/core/qgsapplication.cpp ---- qgis-3.16.1/src/core/qgsapplication.cpp 2020-11-20 14:11:26.000000000 +0100 -+++ qgis-3.16.1-new/src/core/qgsapplication.cpp 2020-11-20 14:57:27.006205336 +0100 +diff -rupN --no-dereference qgis-3.16.2/src/core/qgsapplication.cpp qgis-3.16.2-new/src/core/qgsapplication.cpp +--- qgis-3.16.2/src/core/qgsapplication.cpp 2020-12-21 00:12:56.000000000 +0100 ++++ qgis-3.16.2-new/src/core/qgsapplication.cpp 2020-12-21 13:03:28.002449832 +0100 @@ -294,6 +294,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis.spec b/qgis.spec index 37015be..da119eb 100644 --- a/qgis.spec +++ b/qgis.spec @@ -23,8 +23,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.16.1 -Release: 2%{?dist} +Version: 3.16.2 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -371,6 +371,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Mon Dec 21 2020 Sandro Mani - 3.16.2-1 +- Update to 3.16.2 + * Mon Nov 23 07:54:37 CET 2020 Jan Grulich - 3.16.1-2 - rebuild (qt5) diff --git a/sources b/sources index e8f44d1..c57006c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.16.1.tar.bz2) = 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8 +SHA512 (qgis-3.16.2.tar.bz2) = 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033 From 64571beb3f8da2969a710a01bdfa7fc21cf52394 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 13 Jan 2021 12:51:32 +0100 Subject: [PATCH 024/201] Spec cleanups --- qgis.spec | 132 +++++++++++------------------------------------------- 1 file changed, 27 insertions(+), 105 deletions(-) diff --git a/qgis.spec b/qgis.spec index da119eb..db34fdf 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,25 +1,9 @@ -#TODO: Fix error message with processing plug-in in regards to pyspatialite +%global grass7_prefix $(pkg-config --variable=prefix grass 2>/dev/null || echo '%{_libdir}/grass76') + # Shared lib calls exit # https://issues.qgis.org/issues/2854 -# libspatialite is present for PPC and PPC64 in Fedora and EL7, but not in older EL -%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE -%if (0%{?rhel} <= 6 && !0%{?fedora}) -%ifarch ppc ppc64 -%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=FALSE -%endif -%endif - -# Force the python interpreter to python3: -# brp-python-bytecompile is unable to identify -# the proper required version of python for -# py files located under /usr/share/qgis/python/plugins -%global __python %{__python3} - -#TODO: "python=python3"? - - #TODO: Run test suite (see debian/rules) Name: qgis @@ -32,90 +16,61 @@ License: GPLv3+ with exceptions URL: http://www.qgis.org Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 -# The used sources were released as a tarball, the below is only for work in progress -#git archive --format=tar --prefix=qgis-1.8.0/ master | bzip2 >../qgis-1.8.0.tar.gz - # Sample configuration files for QGIS server Source2: %{name}-server-httpd.conf Source4: %{name}-server-README.fedora - # MIME definitions # Based on debian/qgis.xml but excluding already defined or proprietary types #TODO: Path; Still necessary? Source5: %{name}-mime.xml + # Fix builds on 64-bit machines # https://issues.qgis.org/issues/15602 Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch -# Some plug-ins need Pyspatialite (bundled) -# The license is not totally clear, see: -# http://code.google.com/p/pyspatialite/issues/detail?id=3 -# It also is sort of a fork of pysqlite, which is not elegant. -# -# F20 and up instead allow for loadable sqlite extensions in Python: -# https://bugzilla.redhat.com/show_bug.cgi?id=1066708 BuildRequires: cmake BuildRequires: desktop-file-utils +BuildRequires: exiv2-devel BuildRequires: expat-devel BuildRequires: fcgi-devel BuildRequires: flex bison +BuildRequires: gcc-c++ BuildRequires: gdal-devel BuildRequires: geos-devel BuildRequires: grass-devel -%global grass7_prefix $(pkg-config --variable=prefix grass 2>/dev/null || echo '%{_libdir}/grass76') BuildRequires: gsl-devel - -%ifarch ppc ppc64 -%if (0%{?fedora} || 0%{?rhel} > 6) BuildRequires: libspatialite-devel -%endif -%else -BuildRequires: libspatialite-devel -%endif - BuildRequires: libdxfrw-devel BuildRequires: libzip-devel +BuildRequires: make BuildRequires: netcdf-devel BuildRequires: ocl-icd-devel BuildRequires: opencl-headers +BuildRequires: poly2tri-devel BuildRequires: postgresql-devel BuildRequires: proj-devel BuildRequires: protobuf-lite-devel -BuildRequires: qt5-qtlocation-devel -BuildRequires: qt5-qtwebkit-devel -BuildRequires: qt5-qttools-static -BuildRequires: qt5-qtserialport-devel -BuildRequires: qt5-qt3d-devel -# PyQwt doesn't support qwt6, so just turn it off for now on RHEL -%if 0%{?fedora} < 26 -BuildRequires: PyQwt-devel -%endif -BuildRequires: python3-sip-devel -BuildRequires: poly2tri-devel BuildRequires: python3-devel -BuildRequires: python3-qt5-devel -BuildRequires: qca-qt5-devel -BuildRequires: qjson-devel -BuildRequires: python3-qscintilla-qt5-devel -# Not dragged in by the above BuildRequires: python3-qscintilla-qt5 -#TODO: Build failure if not present, QTKEYCHAIN_INCLUDE_DIR is NOTFOUND -BuildRequires: qtkeychain-qt5-devel - +BuildRequires: python3-qscintilla-qt5-devel +BuildRequires: python3-qt5-devel +BuildRequires: python3-sip-devel +BuildRequires: qca-qt5-devel BuildRequires: qscintilla-qt5-devel +BuildRequires: qt5-qt3d-devel BuildRequires: qt5-qtbase-private-devel -#TODO: Something doesn't work here -- no idea what I meant by that. BuildRequires: qt5-qtdeclarative-devel -BuildRequires: qt-mobility-devel -BuildRequires: qwt-devel +BuildRequires: qt5-qtlocation-devel +BuildRequires: qt5-qtserialport-devel +BuildRequires: qt5-qttools-static +BuildRequires: qt5-qtwebkit-devel +BuildRequires: qtkeychain-qt5-devel BuildRequires: qwt-qt5-devel -BuildRequires: qwtpolar-devel BuildRequires: spatialindex-devel BuildRequires: sqlite-devel -BuildRequires: exiv2-devel # Enable for tests #BuildRequires: xorg-x11-server-Xvfb @@ -126,16 +81,8 @@ Requires: gpsbabel Requires: qca-qt5-ossl # We don't want to provide private Python extension libs -%if (0%{?fedora} || 0%{?rhel} > 6) %global __provides_exclude_from ^(%{python3_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$ -%endif -%if 0%{?rhel} == 6 -%{?filter_setup: -%filter_provides_in ^(%{python3_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$ -%filter_setup -} -%endif %description Geographic Information System (GIS) manages, analyzes, and displays @@ -146,6 +93,7 @@ interface. QGIS also supports display of various geo-referenced raster and Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII DEM. + %package devel Summary: Development Libraries for the QGIS Requires: %{name}%{?_isa} = %{version}-%{release} @@ -153,6 +101,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development packages for QGIS including the C header files. + %package grass Summary: GRASS Support Libraries for QGIS Requires: %{name}%{?_isa} = %{version}-%{release} @@ -161,13 +110,9 @@ Requires: grass%{?_isa} %description grass GRASS plugin for QGIS required to interface with the GRASS system. + %package -n python3-qgis %{?python_provide:%python_provide python3-qgis} -#TODO -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} Summary: Python integration and plug-ins for QGIS Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gdal-python3 @@ -185,12 +130,11 @@ Requires: python3-qt5-webkit %description -n python3-qgis Python integration and plug-ins for QGIS. + %package server Summary: FCGI-based OGC web map server Requires: %{name}%{?_isa} = %{version}-%{release} Requires: mod_fcgid -Provides: mapserver = %{version}-%{release} -Obsoletes: mapserver < 2.8.1-1 %description server This FastCGI OGC web map server implements OGC WMS 1.3.0 and 1.1.1. @@ -200,12 +144,10 @@ for styling. Sample configurations for Httpd and Lighttpd are included. Please refer to %{name}-server-README.fedora for details! + %prep %autosetup -p1 -# Remove executable permissions from source code files -find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ - # Readme file for QGIS server configuration and Lighttpd example install -pm0644 %{SOURCE4} . @@ -223,12 +165,6 @@ gzip ChangeLog %build - -# Necessary for the test suite -#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib} - -#TODO: If for EPEL (osgearth, touch) -#Info: TOUCH needs Qt >= 4.5 %cmake \ %{_cmake_skip_rpath} \ -D QGIS_LIB_SUBDIR=%{_lib} \ @@ -244,23 +180,11 @@ gzip ChangeLog -D WITH_QWTPOLAR:BOOL=TRUE \ -D WITH_SERVER:BOOL=TRUE \ -D WITH_3D:BOOL=TRUE \ - %{configure_with_spatialite} \ - . - -#TODO: The cmake scripts are failing for us -# -D WITH_QUICK:BOOL=TRUE \ -# -D WITH_QTMOBILITY:BOOL=TRUE \ -# -D WITH_INTERNAL_MDAL:BOOL=FALSE \ -# -D WITH_INTERNAL_O2:BOOL=FALSE \ - -# Parallel build appears to occasionally result in build failures -# (UI form headers generated too late) + -D WITH_QSPATIALITE:BOOL=TRUE %cmake_build %install -# Necessary for the test suite -#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib} %cmake_install # Install desktop file without connecting proprietary file types @@ -271,8 +195,7 @@ desktop-file-edit \ # Install MIME type definitions install -d %{buildroot}%{_datadir}/mime/packages -install -pm0644 %{SOURCE5} \ - %{buildroot}%{_datadir}/mime/packages/%{name}.xml +install -pm0644 %{SOURCE5} %{buildroot}%{_datadir}/mime/packages/%{name}.xml install -pd %{buildroot}%{_datadir}/pixmaps install -pm0644 images/icons/%{name}-icon-512x512.png %{buildroot}%{_datadir}/pixmaps/%{name}.png @@ -281,8 +204,7 @@ install -pm0644 images/icons/%{name}-mime-icon.png %{buildroot}%{_datadir}/pixma # Install basic QGIS Mapserver configuration for Apache install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d -install -pm0644 %{SOURCE2} \ - %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-server.conf +install -pm0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-server.conf # See qgis-server-README.fedora rm -f %{buildroot}%{_libexecdir}/%{name}/wms_metadata.xml @@ -296,9 +218,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %check # All tests basically run fine, but one fails using mock, while a different one fails when building with rpmbuild alone -#export LD_LIBRARY_PATH=%{buildroot}%{_libdir} +#export LD_LIBRARY_PATH=%%{buildroot}%%{_libdir} #xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" make Experimental -#rm -f %{_bindir}%{name}_bench +#rm -f %%{_bindir}%%{name}_bench %files -f %{name}.lang From b5afc35b35740532c27912ecf8f7847070abcb24 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 13 Jan 2021 14:42:27 +0100 Subject: [PATCH 025/201] Rebuilt for protobuf 3.14 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index db34fdf..218856a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.16.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -293,6 +293,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed Jan 13 14:42:26 CET 2021 Adrian Reber - 3.16.2-2 +- Rebuilt for protobuf 3.14 + * Mon Dec 21 2020 Sandro Mani - 3.16.2-1 - Update to 3.16.2 From 3c7ca005ae0b844ef704f74b1c1f0693b8b03ed1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 15 Jan 2021 21:18:23 +0100 Subject: [PATCH 026/201] Update to 3.16.3 --- .gitignore | 1 + qgis-lib64.patch | 6 +++--- qgis-serverprefix.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 40f6cb7..b1ba665 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ qgis_1.5.0.tar.gz /qgis-3.16.0.tar.bz2 /qgis-3.16.1.tar.bz2 /qgis-3.16.2.tar.bz2 +/qgis-3.16.3.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index b777394..e3af656 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.16.2/cmake/PyQtMacros.cmake qgis-3.16.2-new/cmake/PyQtMacros.cmake ---- qgis-3.16.2/cmake/PyQtMacros.cmake 2020-12-21 00:12:56.000000000 +0100 -+++ qgis-3.16.2-new/cmake/PyQtMacros.cmake 2020-12-21 13:03:26.480455502 +0100 +diff -rupN --no-dereference qgis-3.16.3/cmake/PyQtMacros.cmake qgis-3.16.3-new/cmake/PyQtMacros.cmake +--- qgis-3.16.3/cmake/PyQtMacros.cmake 2021-01-15 13:09:03.000000000 +0100 ++++ qgis-3.16.3-new/cmake/PyQtMacros.cmake 2021-01-15 21:06:50.209228178 +0100 @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 9d2d572..a9998c5 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.16.2/src/core/qgsapplication.cpp qgis-3.16.2-new/src/core/qgsapplication.cpp ---- qgis-3.16.2/src/core/qgsapplication.cpp 2020-12-21 00:12:56.000000000 +0100 -+++ qgis-3.16.2-new/src/core/qgsapplication.cpp 2020-12-21 13:03:28.002449832 +0100 +diff -rupN --no-dereference qgis-3.16.3/src/core/qgsapplication.cpp qgis-3.16.3-new/src/core/qgsapplication.cpp +--- qgis-3.16.3/src/core/qgsapplication.cpp 2021-01-15 13:09:03.000000000 +0100 ++++ qgis-3.16.3-new/src/core/qgsapplication.cpp 2021-01-15 21:06:52.227225440 +0100 @@ -294,6 +294,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis.spec b/qgis.spec index 218856a..56fa4d2 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.16.2 -Release: 2%{?dist} +Version: 3.16.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -293,6 +293,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri Jan 15 2021 Sandro Mani - 3.16.3-1 +- Update to 3.16.3 + * Wed Jan 13 14:42:26 CET 2021 Adrian Reber - 3.16.2-2 - Rebuilt for protobuf 3.14 diff --git a/sources b/sources index c57006c..69f2172 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.16.2.tar.bz2) = 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033 +SHA512 (qgis-3.16.3.tar.bz2) = f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365 From 090da1ba60dba0c272eb39a26c9001d09bdf95a5 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sat, 16 Jan 2021 12:49:20 +0100 Subject: [PATCH 027/201] Rebuilt for protobuf 3.14 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 56fa4d2..f410a35 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.16.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -293,6 +293,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sat Jan 16 12:49:18 CET 2021 Adrian Reber - 3.16.3-2 +- Rebuilt for protobuf 3.14 + * Fri Jan 15 2021 Sandro Mani - 3.16.3-1 - Update to 3.16.3 From f5a1218a5906555de3b1a503c65eb95033f52cb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 14:34:30 +0000 Subject: [PATCH 028/201] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index f410a35..ccdc419 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.16.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -293,6 +293,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.16.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Jan 16 12:49:18 CET 2021 Adrian Reber - 3.16.3-2 - Rebuilt for protobuf 3.14 From 805e28811d08cd9057606b07cf33481ca7727e87 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 8 Feb 2021 10:27:13 +0100 Subject: [PATCH 029/201] rebuild for libpq ABI fix Related: rhbz#1908268 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index ccdc419..b9749a6 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.16.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -293,6 +293,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Mon Feb 08 2021 Pavel Raiskup - 3.16.3-4 +- rebuild for libpq ABI fix rhbz#1908268 + * Wed Jan 27 2021 Fedora Release Engineering - 3.16.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d90126d967c3f78aa756075266de92a698659a6d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 13 Feb 2021 18:28:02 +0100 Subject: [PATCH 030/201] Rebuild (geos) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index b9749a6..6f49c13 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.16.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -293,6 +293,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sat Feb 13 2021 Sandro Mani - 3.16.3-5 +- Rebuild (geos) + * Mon Feb 08 2021 Pavel Raiskup - 3.16.3-4 - rebuild for libpq ABI fix rhbz#1908268 From 8c103724933872a964db94682c000caf0623cb5a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 19 Feb 2021 21:36:31 +0100 Subject: [PATCH 031/201] Update to 3.18.0 --- .gitignore | 1 + qgis-lib64.patch | 6 +++--- qgis-serverprefix.patch | 8 ++++---- qgis.spec | 8 ++++++-- sources | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index b1ba665..299545d 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ qgis_1.5.0.tar.gz /qgis-3.16.1.tar.bz2 /qgis-3.16.2.tar.bz2 /qgis-3.16.3.tar.bz2 +/qgis-3.18.0.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index e3af656..00c416f 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.16.3/cmake/PyQtMacros.cmake qgis-3.16.3-new/cmake/PyQtMacros.cmake ---- qgis-3.16.3/cmake/PyQtMacros.cmake 2021-01-15 13:09:03.000000000 +0100 -+++ qgis-3.16.3-new/cmake/PyQtMacros.cmake 2021-01-15 21:06:50.209228178 +0100 +diff -rupN --no-dereference qgis-3.18.0/cmake/PyQtMacros.cmake qgis-3.18.0-new/cmake/PyQtMacros.cmake +--- qgis-3.18.0/cmake/PyQtMacros.cmake 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/cmake/PyQtMacros.cmake 2021-02-19 18:17:53.426724683 +0100 @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index a9998c5..6914afc 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.16.3/src/core/qgsapplication.cpp qgis-3.16.3-new/src/core/qgsapplication.cpp ---- qgis-3.16.3/src/core/qgsapplication.cpp 2021-01-15 13:09:03.000000000 +0100 -+++ qgis-3.16.3-new/src/core/qgsapplication.cpp 2021-01-15 21:06:52.227225440 +0100 -@@ -294,6 +294,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.18.0/src/core/qgsapplication.cpp qgis-3.18.0-new/src/core/qgsapplication.cpp +--- qgis-3.18.0/src/core/qgsapplication.cpp 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/src/core/qgsapplication.cpp 2021-02-19 18:17:55.300724539 +0100 +@@ -307,6 +307,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis.spec b/qgis.spec index 6f49c13..09bb2a2 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.16.3 -Release: 5%{?dist} +Version: 3.18.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -71,6 +71,7 @@ BuildRequires: qtkeychain-qt5-devel BuildRequires: qwt-qt5-devel BuildRequires: spatialindex-devel BuildRequires: sqlite-devel +BuildRequires: libzstd-devel # Enable for tests #BuildRequires: xorg-x11-server-Xvfb @@ -293,6 +294,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri Feb 19 2021 Sandro Mani - 3.18.0-1 +- Update to 3.18.0 + * Sat Feb 13 2021 Sandro Mani - 3.16.3-5 - Rebuild (geos) diff --git a/sources b/sources index 69f2172..aac6e12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.16.3.tar.bz2) = f45492ee0b1c1d45c9eca390c65ca8a6e7a35aa392beb3b55d7b7813eb7d437621441df251722fc9d0218e8d339f12cff7c1d2db366e1835c0b79236c89de365 +SHA512 (qgis-3.18.0.tar.bz2) = 881709f781f8594153509e622361223608547b211cdfd570511eef563be8c4ac2ca388caf3d46211f583241d0e12435c957a8367218a78255022bc047ba24572 From 1ae3fc9fe14918319f6995b36811f623f8643506 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 7 Mar 2021 11:15:06 +0100 Subject: [PATCH 032/201] Rebuild (proj) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 09bb2a2..b455c49 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -294,6 +294,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sun Mar 07 2021 Sandro Mani - 3.18.0-2 +- Rebuild (proj) + * Fri Feb 19 2021 Sandro Mani - 3.18.0-1 - Update to 3.18.0 From 198bad36a574ec90c4fe232cfceee1779b714c8e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 8 Mar 2021 13:30:11 +0100 Subject: [PATCH 033/201] Add qgis_proj8.patch --- qgis-lib64.patch | 2 +- qgis-serverprefix.patch | 2 +- qgis.spec | 2 ++ qgis_proj8.patch | 16 ++++++++++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 qgis_proj8.patch diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 00c416f..21156b0 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference qgis-3.18.0/cmake/PyQtMacros.cmake qgis-3.18.0-new/cmake/PyQtMacros.cmake --- qgis-3.18.0/cmake/PyQtMacros.cmake 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/cmake/PyQtMacros.cmake 2021-02-19 18:17:53.426724683 +0100 ++++ qgis-3.18.0-new/cmake/PyQtMacros.cmake 2021-03-08 13:28:38.023961052 +0100 @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 6914afc..6c030c7 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference qgis-3.18.0/src/core/qgsapplication.cpp qgis-3.18.0-new/src/core/qgsapplication.cpp --- qgis-3.18.0/src/core/qgsapplication.cpp 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/core/qgsapplication.cpp 2021-02-19 18:17:55.300724539 +0100 ++++ qgis-3.18.0-new/src/core/qgsapplication.cpp 2021-03-08 13:28:40.116960892 +0100 @@ -307,6 +307,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis.spec b/qgis.spec index b455c49..36e9071 100644 --- a/qgis.spec +++ b/qgis.spec @@ -29,6 +29,8 @@ Source5: %{name}-mime.xml Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch +# Backport fix for Proj8 detection +Patch2: %{name}_proj8.patch BuildRequires: cmake diff --git a/qgis_proj8.patch b/qgis_proj8.patch new file mode 100644 index 0000000..0f6d910 --- /dev/null +++ b/qgis_proj8.patch @@ -0,0 +1,16 @@ +diff -rupN --no-dereference qgis-3.18.0/cmake/FindProj.cmake qgis-3.18.0-new/cmake/FindProj.cmake +--- qgis-3.18.0/cmake/FindProj.cmake 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/cmake/FindProj.cmake 2021-03-08 13:28:42.051960743 +0100 +@@ -40,6 +40,12 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h + "$ENV{INCLUDE}" + "$ENV{LIB_DIR}/include" + ) ++IF (NOT PROJ_INCLUDE_DIR) ++ FIND_PATH(PROJ_INCLUDE_DIR proj.h ++ "$ENV{INCLUDE}" ++ "$ENV{LIB_DIR}/include" ++ ) ++ENDIF (NOT PROJ_INCLUDE_DIR) + + FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS + "$ENV{LIB}" From a0f8cdc9b88b669a7f7d8bf76e1ed381c1f9d9c4 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 8 Mar 2021 19:28:56 +0100 Subject: [PATCH 034/201] Update qgis_proj8.patch --- qgis_proj8.patch | 106 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/qgis_proj8.patch b/qgis_proj8.patch index 0f6d910..78c245b 100644 --- a/qgis_proj8.patch +++ b/qgis_proj8.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference qgis-3.18.0/cmake/FindProj.cmake qgis-3.18.0-new/cmake/FindProj.cmake --- qgis-3.18.0/cmake/FindProj.cmake 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/cmake/FindProj.cmake 2021-03-08 13:28:42.051960743 +0100 ++++ qgis-3.18.0-new/cmake/FindProj.cmake 2021-03-08 18:49:13.112929089 +0100 @@ -40,6 +40,12 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h "$ENV{INCLUDE}" "$ENV{LIB_DIR}/include" @@ -14,3 +14,107 @@ diff -rupN --no-dereference qgis-3.18.0/cmake/FindProj.cmake qgis-3.18.0-new/cma FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS "$ENV{LIB}" +diff -rupN --no-dereference qgis-3.18.0/src/plugins/grass/qgsgrassnewmapset.cpp qgis-3.18.0-new/src/plugins/grass/qgsgrassnewmapset.cpp +--- qgis-3.18.0/src/plugins/grass/qgsgrassnewmapset.cpp 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/src/plugins/grass/qgsgrassnewmapset.cpp 2021-03-08 18:49:13.113929089 +0100 +@@ -46,9 +46,6 @@ extern "C" + #if defined(_MSC_VER) && defined(M_PI_4) + #undef M_PI_4 //avoid redefinition warning + #endif +-#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 +-#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +-#endif + #include + } + +diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgis.g.info.c qgis-3.18.0-new/src/providers/grass/qgis.g.info.c +--- qgis-3.18.0/src/providers/grass/qgis.g.info.c 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/src/providers/grass/qgis.g.info.c 2021-03-08 18:49:13.112929089 +0100 +@@ -35,9 +35,6 @@ + #if defined(_MSC_VER) && defined(M_PI_4) + #undef M_PI_4 //avoid redefinition warning + #endif +-#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 +-#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +-#endif + #include + + int main( int argc, char **argv ) +diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrass.cpp qgis-3.18.0-new/src/providers/grass/qgsgrass.cpp +--- qgis-3.18.0/src/providers/grass/qgsgrass.cpp 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/src/providers/grass/qgsgrass.cpp 2021-03-08 18:49:13.113929089 +0100 +@@ -67,9 +67,6 @@ extern "C" + #if defined(_MSC_VER) && defined(M_PI_4) + #undef M_PI_4 //avoid redefinition warning + #endif +-#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 +-#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +-#endif + #include + #include + #include +diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrassprovider.cpp qgis-3.18.0-new/src/providers/grass/qgsgrassprovider.cpp +--- qgis-3.18.0/src/providers/grass/qgsgrassprovider.cpp 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/src/providers/grass/qgsgrassprovider.cpp 2021-03-08 18:49:13.113929089 +0100 +@@ -61,9 +61,6 @@ extern "C" + #if defined(_MSC_VER) && defined(M_PI_4) + #undef M_PI_4 //avoid redefinition warning + #endif +-#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 +-#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +-#endif + #include + #include + #include +diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrassvector.cpp qgis-3.18.0-new/src/providers/grass/qgsgrassvector.cpp +--- qgis-3.18.0/src/providers/grass/qgsgrassvector.cpp 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/src/providers/grass/qgsgrassvector.cpp 2021-03-08 18:49:13.113929089 +0100 +@@ -31,9 +31,6 @@ extern "C" + #if defined(_MSC_VER) && defined(M_PI_4) + #undef M_PI_4 //avoid redefinition warning + #endif +-#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 +-#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +-#endif + #include + #include + #include +diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrassvectormap.cpp qgis-3.18.0-new/src/providers/grass/qgsgrassvectormap.cpp +--- qgis-3.18.0/src/providers/grass/qgsgrassvectormap.cpp 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/src/providers/grass/qgsgrassvectormap.cpp 2021-03-08 18:49:13.114929089 +0100 +@@ -35,9 +35,6 @@ extern "C" + #if defined(_MSC_VER) && defined(M_PI_4) + #undef M_PI_4 //avoid redefinition warning + #endif +-#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 +-#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +-#endif + #include + #include + #include +diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrassvectormaplayer.cpp qgis-3.18.0-new/src/providers/grass/qgsgrassvectormaplayer.cpp +--- qgis-3.18.0/src/providers/grass/qgsgrassvectormaplayer.cpp 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/src/providers/grass/qgsgrassvectormaplayer.cpp 2021-03-08 18:49:13.114929089 +0100 +@@ -30,9 +30,6 @@ extern "C" + #if defined(_MSC_VER) && defined(M_PI_4) + #undef M_PI_4 //avoid redefinition warning + #endif +-#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 +-#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +-#endif + #include + #include + #include +diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrassvectormaplayer.h qgis-3.18.0-new/src/providers/grass/qgsgrassvectormaplayer.h +--- qgis-3.18.0/src/providers/grass/qgsgrassvectormaplayer.h 2021-02-19 13:09:46.000000000 +0100 ++++ qgis-3.18.0-new/src/providers/grass/qgsgrassvectormaplayer.h 2021-03-08 18:49:13.114929089 +0100 +@@ -32,9 +32,6 @@ extern "C" + #if defined(_MSC_VER) && defined(M_PI_4) + #undef M_PI_4 //avoid redefinition warning + #endif +-#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 +-#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +-#endif + #include + #include + #include From 256d2b034f61b9ea86a46eb86d025beaf5f890ad Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 24 Mar 2021 01:00:31 +0100 Subject: [PATCH 035/201] Update to 3.18.1 --- .gitignore | 1 + qgis-lib64.patch | 6 +- qgis-serverprefix.patch | 8 +-- qgis.spec | 9 +-- qgis_proj8.patch | 120 ---------------------------------------- sources | 2 +- 6 files changed, 14 insertions(+), 132 deletions(-) delete mode 100644 qgis_proj8.patch diff --git a/.gitignore b/.gitignore index 299545d..174eeba 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ qgis_1.5.0.tar.gz /qgis-3.16.2.tar.bz2 /qgis-3.16.3.tar.bz2 /qgis-3.18.0.tar.bz2 +/qgis-3.18.1.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 21156b0..5b912c1 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.18.0/cmake/PyQtMacros.cmake qgis-3.18.0-new/cmake/PyQtMacros.cmake ---- qgis-3.18.0/cmake/PyQtMacros.cmake 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/cmake/PyQtMacros.cmake 2021-03-08 13:28:38.023961052 +0100 +diff -rupN --no-dereference qgis-3.18.1/cmake/PyQtMacros.cmake qgis-3.18.1-new/cmake/PyQtMacros.cmake +--- qgis-3.18.1/cmake/PyQtMacros.cmake 2021-03-19 13:09:08.000000000 +0100 ++++ qgis-3.18.1-new/cmake/PyQtMacros.cmake 2021-03-24 00:58:44.476156905 +0100 @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 6c030c7..d85364c 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.18.0/src/core/qgsapplication.cpp qgis-3.18.0-new/src/core/qgsapplication.cpp ---- qgis-3.18.0/src/core/qgsapplication.cpp 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/core/qgsapplication.cpp 2021-03-08 13:28:40.116960892 +0100 -@@ -307,6 +307,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.18.1/src/core/qgsapplication.cpp qgis-3.18.1-new/src/core/qgsapplication.cpp +--- qgis-3.18.1/src/core/qgsapplication.cpp 2021-03-19 13:09:08.000000000 +0100 ++++ qgis-3.18.1-new/src/core/qgsapplication.cpp 2021-03-24 00:58:46.103156947 +0100 +@@ -311,6 +311,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis.spec b/qgis.spec index 36e9071..16e3e66 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.18.0 -Release: 2%{?dist} +Version: 3.18.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -29,8 +29,6 @@ Source5: %{name}-mime.xml Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch -# Backport fix for Proj8 detection -Patch2: %{name}_proj8.patch BuildRequires: cmake @@ -296,6 +294,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed Mar 24 2021 sandro Mani - 3.18.1-1 +- Update to 3.18.1 + * Sun Mar 07 2021 Sandro Mani - 3.18.0-2 - Rebuild (proj) diff --git a/qgis_proj8.patch b/qgis_proj8.patch deleted file mode 100644 index 78c245b..0000000 --- a/qgis_proj8.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -rupN --no-dereference qgis-3.18.0/cmake/FindProj.cmake qgis-3.18.0-new/cmake/FindProj.cmake ---- qgis-3.18.0/cmake/FindProj.cmake 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/cmake/FindProj.cmake 2021-03-08 18:49:13.112929089 +0100 -@@ -40,6 +40,12 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h - "$ENV{INCLUDE}" - "$ENV{LIB_DIR}/include" - ) -+IF (NOT PROJ_INCLUDE_DIR) -+ FIND_PATH(PROJ_INCLUDE_DIR proj.h -+ "$ENV{INCLUDE}" -+ "$ENV{LIB_DIR}/include" -+ ) -+ENDIF (NOT PROJ_INCLUDE_DIR) - - FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS - "$ENV{LIB}" -diff -rupN --no-dereference qgis-3.18.0/src/plugins/grass/qgsgrassnewmapset.cpp qgis-3.18.0-new/src/plugins/grass/qgsgrassnewmapset.cpp ---- qgis-3.18.0/src/plugins/grass/qgsgrassnewmapset.cpp 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/plugins/grass/qgsgrassnewmapset.cpp 2021-03-08 18:49:13.113929089 +0100 -@@ -46,9 +46,6 @@ extern "C" - #if defined(_MSC_VER) && defined(M_PI_4) - #undef M_PI_4 //avoid redefinition warning - #endif --#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 --#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H --#endif - #include - } - -diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgis.g.info.c qgis-3.18.0-new/src/providers/grass/qgis.g.info.c ---- qgis-3.18.0/src/providers/grass/qgis.g.info.c 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/providers/grass/qgis.g.info.c 2021-03-08 18:49:13.112929089 +0100 -@@ -35,9 +35,6 @@ - #if defined(_MSC_VER) && defined(M_PI_4) - #undef M_PI_4 //avoid redefinition warning - #endif --#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 --#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H --#endif - #include - - int main( int argc, char **argv ) -diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrass.cpp qgis-3.18.0-new/src/providers/grass/qgsgrass.cpp ---- qgis-3.18.0/src/providers/grass/qgsgrass.cpp 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/providers/grass/qgsgrass.cpp 2021-03-08 18:49:13.113929089 +0100 -@@ -67,9 +67,6 @@ extern "C" - #if defined(_MSC_VER) && defined(M_PI_4) - #undef M_PI_4 //avoid redefinition warning - #endif --#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 --#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H --#endif - #include - #include - #include -diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrassprovider.cpp qgis-3.18.0-new/src/providers/grass/qgsgrassprovider.cpp ---- qgis-3.18.0/src/providers/grass/qgsgrassprovider.cpp 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/providers/grass/qgsgrassprovider.cpp 2021-03-08 18:49:13.113929089 +0100 -@@ -61,9 +61,6 @@ extern "C" - #if defined(_MSC_VER) && defined(M_PI_4) - #undef M_PI_4 //avoid redefinition warning - #endif --#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 --#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H --#endif - #include - #include - #include -diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrassvector.cpp qgis-3.18.0-new/src/providers/grass/qgsgrassvector.cpp ---- qgis-3.18.0/src/providers/grass/qgsgrassvector.cpp 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/providers/grass/qgsgrassvector.cpp 2021-03-08 18:49:13.113929089 +0100 -@@ -31,9 +31,6 @@ extern "C" - #if defined(_MSC_VER) && defined(M_PI_4) - #undef M_PI_4 //avoid redefinition warning - #endif --#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 --#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H --#endif - #include - #include - #include -diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrassvectormap.cpp qgis-3.18.0-new/src/providers/grass/qgsgrassvectormap.cpp ---- qgis-3.18.0/src/providers/grass/qgsgrassvectormap.cpp 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/providers/grass/qgsgrassvectormap.cpp 2021-03-08 18:49:13.114929089 +0100 -@@ -35,9 +35,6 @@ extern "C" - #if defined(_MSC_VER) && defined(M_PI_4) - #undef M_PI_4 //avoid redefinition warning - #endif --#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 --#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H --#endif - #include - #include - #include -diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrassvectormaplayer.cpp qgis-3.18.0-new/src/providers/grass/qgsgrassvectormaplayer.cpp ---- qgis-3.18.0/src/providers/grass/qgsgrassvectormaplayer.cpp 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/providers/grass/qgsgrassvectormaplayer.cpp 2021-03-08 18:49:13.114929089 +0100 -@@ -30,9 +30,6 @@ extern "C" - #if defined(_MSC_VER) && defined(M_PI_4) - #undef M_PI_4 //avoid redefinition warning - #endif --#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 --#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H --#endif - #include - #include - #include -diff -rupN --no-dereference qgis-3.18.0/src/providers/grass/qgsgrassvectormaplayer.h qgis-3.18.0-new/src/providers/grass/qgsgrassvectormaplayer.h ---- qgis-3.18.0/src/providers/grass/qgsgrassvectormaplayer.h 2021-02-19 13:09:46.000000000 +0100 -+++ qgis-3.18.0-new/src/providers/grass/qgsgrassvectormaplayer.h 2021-03-08 18:49:13.114929089 +0100 -@@ -32,9 +32,6 @@ extern "C" - #if defined(_MSC_VER) && defined(M_PI_4) - #undef M_PI_4 //avoid redefinition warning - #endif --#if defined(PROJ_VERSION_MAJOR) && PROJ_VERSION_MAJOR>=6 --#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H --#endif - #include - #include - #include diff --git a/sources b/sources index aac6e12..1a0beab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.18.0.tar.bz2) = 881709f781f8594153509e622361223608547b211cdfd570511eef563be8c4ac2ca388caf3d46211f583241d0e12435c957a8367218a78255022bc047ba24572 +SHA512 (qgis-3.18.1.tar.bz2) = cf29c73385021a48b78d46fa0d8049de4018a5e21230acd7ac4c24d792216d68ee4dd96816d11c62b1251ad045e28ae87b50de44317161805c04fa563e3d03ef From 4600c39beab997f2516864457b9fca39629e4fe6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 24 Mar 2021 09:37:18 +0100 Subject: [PATCH 036/201] BR: libxml2-devel --- qgis.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qgis.spec b/qgis.spec index 16e3e66..ed366c0 100644 --- a/qgis.spec +++ b/qgis.spec @@ -44,6 +44,7 @@ BuildRequires: grass-devel BuildRequires: gsl-devel BuildRequires: libspatialite-devel BuildRequires: libdxfrw-devel +BuildRequires: libxml2-devel BuildRequires: libzip-devel BuildRequires: make BuildRequires: netcdf-devel From eae42768e3b84d99243fbe0a83c4d140ad83ec14 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 24 Mar 2021 10:07:38 +0100 Subject: [PATCH 037/201] Re-add qgis_proj8.patch --- qgis.spec | 3 ++- qgis_proj8.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 qgis_proj8.patch diff --git a/qgis.spec b/qgis.spec index ed366c0..7804f4a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -29,7 +29,8 @@ Source5: %{name}-mime.xml Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch - +# Fix for Proj8 detection +Patch2: %{name}_proj8.patch BuildRequires: cmake BuildRequires: desktop-file-utils diff --git a/qgis_proj8.patch b/qgis_proj8.patch new file mode 100644 index 0000000..4bf6c59 --- /dev/null +++ b/qgis_proj8.patch @@ -0,0 +1,16 @@ +diff -rupN qgis-3.18.1/cmake/FindProj.cmake qgis-3.18.1-new/cmake/FindProj.cmake +--- qgis-3.18.1/cmake/FindProj.cmake 2021-03-19 13:09:08.000000000 +0100 ++++ qgis-3.18.1-new/cmake/FindProj.cmake 2021-03-24 10:05:30.492088939 +0100 +@@ -40,6 +40,12 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h + "$ENV{INCLUDE}" + "$ENV{LIB_DIR}/include" + ) ++IF (NOT PROJ_INCLUDE_DIR) ++ FIND_PATH(PROJ_INCLUDE_DIR proj.h ++ "$ENV{INCLUDE}" ++ "$ENV{LIB_DIR}/include" ++ ) ++ENDIF (NOT PROJ_INCLUDE_DIR) + + FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS + "$ENV{LIB}" From a7f9aaf9ed25e06e702e62fc815c48f009c79db6 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 31 Mar 2021 17:37:34 +0100 Subject: [PATCH 038/201] Rebuilt for removed libstdc++ symbols (#1937698) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 7804f4a..350d9ae 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.18.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -296,6 +296,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed Mar 31 2021 Jonathan Wakely - 3.18.1-2 +- Rebuilt for removed libstdc++ symbols (#1937698) + * Wed Mar 24 2021 sandro Mani - 3.18.1-1 - Update to 3.18.1 From e4a9f36fb958c111854d7e705b96bb6932a429bb Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 17 Apr 2021 10:20:17 +0200 Subject: [PATCH 039/201] Update to 3.18.2 --- .gitignore | 1 + qgis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 174eeba..bb7632b 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ qgis_1.5.0.tar.gz /qgis-3.16.3.tar.bz2 /qgis-3.18.0.tar.bz2 /qgis-3.18.1.tar.bz2 +/qgis-3.18.2.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 350d9ae..d23ece3 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.18.1 -Release: 2%{?dist} +Version: 3.18.2 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -296,6 +296,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sat Apr 17 2021 Sandro Mani - 3.18.2-1 +- Update to 3.18.2 + * Wed Mar 31 2021 Jonathan Wakely - 3.18.1-2 - Rebuilt for removed libstdc++ symbols (#1937698) diff --git a/sources b/sources index 1a0beab..f7dceb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.18.1.tar.bz2) = cf29c73385021a48b78d46fa0d8049de4018a5e21230acd7ac4c24d792216d68ee4dd96816d11c62b1251ad045e28ae87b50de44317161805c04fa563e3d03ef +SHA512 (qgis-3.18.2.tar.bz2) = e80298f68e1e67e953a35a42e69abf1de3cc0e7d2654e164c5b814f6218a1cea8291d86cb78deb4a21b0df77af34cb4eb9ae5c9739944dc7a6f282d0f61d0caa From dcf4889c9a28171ef1a47165e54dcf9d64656ef3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 7 May 2021 12:15:47 +0200 Subject: [PATCH 040/201] Rebuild (gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index d23ece3..2862f19 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.18.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -296,6 +296,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri May 07 2021 Sandro Mani - 3.18.2-2 +- Rebuild (gdal) + * Sat Apr 17 2021 Sandro Mani - 3.18.2-1 - Update to 3.18.2 From a0934c266def1d9892274919b1408cbeba12d069 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 16 May 2021 10:11:24 +0200 Subject: [PATCH 041/201] Update to 3.18.3 --- .gitignore | 1 + qgis-lib64.patch | 6 +++--- qgis-serverprefix.patch | 6 +++--- qgis.spec | 7 +++++-- qgis_proj8.patch | 6 +++--- sources | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index bb7632b..19bf38f 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ qgis_1.5.0.tar.gz /qgis-3.18.0.tar.bz2 /qgis-3.18.1.tar.bz2 /qgis-3.18.2.tar.bz2 +/qgis-3.18.3.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 5b912c1..830ec61 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.18.1/cmake/PyQtMacros.cmake qgis-3.18.1-new/cmake/PyQtMacros.cmake ---- qgis-3.18.1/cmake/PyQtMacros.cmake 2021-03-19 13:09:08.000000000 +0100 -+++ qgis-3.18.1-new/cmake/PyQtMacros.cmake 2021-03-24 00:58:44.476156905 +0100 +diff -rupN --no-dereference qgis-3.18.3/cmake/PyQtMacros.cmake qgis-3.18.3-new/cmake/PyQtMacros.cmake +--- qgis-3.18.3/cmake/PyQtMacros.cmake 2021-05-14 14:10:19.000000000 +0200 ++++ qgis-3.18.3-new/cmake/PyQtMacros.cmake 2021-05-16 09:54:32.907014158 +0200 @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index d85364c..b7577bf 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.18.1/src/core/qgsapplication.cpp qgis-3.18.1-new/src/core/qgsapplication.cpp ---- qgis-3.18.1/src/core/qgsapplication.cpp 2021-03-19 13:09:08.000000000 +0100 -+++ qgis-3.18.1-new/src/core/qgsapplication.cpp 2021-03-24 00:58:46.103156947 +0100 +diff -rupN --no-dereference qgis-3.18.3/src/core/qgsapplication.cpp qgis-3.18.3-new/src/core/qgsapplication.cpp +--- qgis-3.18.3/src/core/qgsapplication.cpp 2021-05-14 14:10:19.000000000 +0200 ++++ qgis-3.18.3-new/src/core/qgsapplication.cpp 2021-05-16 09:54:34.610014196 +0200 @@ -311,6 +311,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis.spec b/qgis.spec index 2862f19..4dc05c5 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.18.2 -Release: 2%{?dist} +Version: 3.18.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -296,6 +296,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sun May 16 2021 Sandro Mani - 3.18.3-1 +- Update to 3.18.3 + * Fri May 07 2021 Sandro Mani - 3.18.2-2 - Rebuild (gdal) diff --git a/qgis_proj8.patch b/qgis_proj8.patch index 4bf6c59..580367b 100644 --- a/qgis_proj8.patch +++ b/qgis_proj8.patch @@ -1,6 +1,6 @@ -diff -rupN qgis-3.18.1/cmake/FindProj.cmake qgis-3.18.1-new/cmake/FindProj.cmake ---- qgis-3.18.1/cmake/FindProj.cmake 2021-03-19 13:09:08.000000000 +0100 -+++ qgis-3.18.1-new/cmake/FindProj.cmake 2021-03-24 10:05:30.492088939 +0100 +diff -rupN --no-dereference qgis-3.18.3/cmake/FindProj.cmake qgis-3.18.3-new/cmake/FindProj.cmake +--- qgis-3.18.3/cmake/FindProj.cmake 2021-05-14 14:10:19.000000000 +0200 ++++ qgis-3.18.3-new/cmake/FindProj.cmake 2021-05-16 09:54:36.430014237 +0200 @@ -40,6 +40,12 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h "$ENV{INCLUDE}" "$ENV{LIB_DIR}/include" diff --git a/sources b/sources index f7dceb9..6d26b10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.18.2.tar.bz2) = e80298f68e1e67e953a35a42e69abf1de3cc0e7d2654e164c5b814f6218a1cea8291d86cb78deb4a21b0df77af34cb4eb9ae5c9739944dc7a6f282d0f61d0caa +SHA512 (qgis-3.18.3.tar.bz2) = d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef From 2a265d1386539884c0d3dd6aaa250997083eb202 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 21 May 2021 20:29:01 +0200 Subject: [PATCH 042/201] Rebuild (gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 4dc05c5..f7a36cc 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.18.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -296,6 +296,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri May 21 2021 Sandro Mani - 3.18.3-2 +- Rebuild (gdal) + * Sun May 16 2021 Sandro Mani - 3.18.3-1 - Update to 3.18.3 From 285b5c011a1a68315a9ef00d6a1a2b0edf58e16f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:12:29 +0200 Subject: [PATCH 043/201] Rebuilt for Python 3.10 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index f7a36cc..55a63fc 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.18.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -296,6 +296,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri Jun 04 2021 Python Maint - 3.18.3-3 +- Rebuilt for Python 3.10 + * Fri May 21 2021 Sandro Mani - 3.18.3-2 - Rebuild (gdal) From 0da24adff4658d10d3902100caadf729a9fe71b3 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 16 Jun 2021 23:01:19 -0400 Subject: [PATCH 044/201] Update to build with sip5+ --- qgis.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qgis.spec b/qgis.spec index 55a63fc..aaa9f73 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.18.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -59,7 +59,7 @@ BuildRequires: python3-devel BuildRequires: python3-qscintilla-qt5 BuildRequires: python3-qscintilla-qt5-devel BuildRequires: python3-qt5-devel -BuildRequires: python3-sip-devel +BuildRequires: %{py3_dist sip} BuildRequires: qca-qt5-devel BuildRequires: qscintilla-qt5-devel BuildRequires: qt5-qt3d-devel @@ -128,7 +128,6 @@ Requires: python3-pygments Requires: python3-PyYAML Requires: python3-qscintilla-qt5 Requires: python3-qt5-webkit -%{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} %description -n python3-qgis Python integration and plug-ins for QGIS. @@ -296,6 +295,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Tue Jun 08 2021 Scott Talbert - 3.18.3-4 +- Update to build with sip5+ + * Fri Jun 04 2021 Python Maint - 3.18.3-3 - Rebuilt for Python 3.10 From 10b92ed20b7112ff921b1a8efe871e427ab9024e Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 15 Jul 2021 15:34:14 -0400 Subject: [PATCH 045/201] Revert back to building with sip 4 due to no sip 6 support --- qgis.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index aaa9f73..7f926f8 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.18.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -59,7 +59,7 @@ BuildRequires: python3-devel BuildRequires: python3-qscintilla-qt5 BuildRequires: python3-qscintilla-qt5-devel BuildRequires: python3-qt5-devel -BuildRequires: %{py3_dist sip} +BuildRequires: python3-sip-devel BuildRequires: qca-qt5-devel BuildRequires: qscintilla-qt5-devel BuildRequires: qt5-qt3d-devel @@ -128,6 +128,7 @@ Requires: python3-pygments Requires: python3-PyYAML Requires: python3-qscintilla-qt5 Requires: python3-qt5-webkit +%{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} %description -n python3-qgis Python integration and plug-ins for QGIS. @@ -295,6 +296,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Sat Jul 10 2021 Scott Talbert - 3.18.3-5 +- Revert back to building with sip 4 due to no sip 6 support + * Tue Jun 08 2021 Scott Talbert - 3.18.3-4 - Update to build with sip5+ From 2f2476270fa72b7543b7de3ab97a4da679c750de Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 21 Jul 2021 13:43:34 +0200 Subject: [PATCH 046/201] Update to 3.20.1 --- .gitignore | 1 + qgis-lib64.patch | 8 ++++---- qgis-serverprefix.patch | 8 ++++---- qgis-template-instantiations.patch | 17 +++++++++++++++++ qgis.spec | 17 +++++++++++++---- qgis_proj8.patch | 16 ---------------- sources | 2 +- 7 files changed, 40 insertions(+), 29 deletions(-) create mode 100644 qgis-template-instantiations.patch delete mode 100644 qgis_proj8.patch diff --git a/.gitignore b/.gitignore index 19bf38f..265647a 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ qgis_1.5.0.tar.gz /qgis-3.18.1.tar.bz2 /qgis-3.18.2.tar.bz2 /qgis-3.18.3.tar.bz2 +/qgis-3.20.1.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 830ec61..5615eaf 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.18.3/cmake/PyQtMacros.cmake qgis-3.18.3-new/cmake/PyQtMacros.cmake ---- qgis-3.18.3/cmake/PyQtMacros.cmake 2021-05-14 14:10:19.000000000 +0200 -+++ qgis-3.18.3-new/cmake/PyQtMacros.cmake 2021-05-16 09:54:32.907014158 +0200 -@@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) +diff -rupN --no-dereference qgis-3.20.1/cmake/PyQtMacros.cmake qgis-3.20.1-new/cmake/PyQtMacros.cmake +--- qgis-3.20.1/cmake/PyQtMacros.cmake 2021-07-19 15:59:05.000000000 +0200 ++++ qgis-3.20.1-new/cmake/PyQtMacros.cmake 2021-07-21 00:10:11.459083430 +0200 +@@ -28,7 +28,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh") diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index b7577bf..b54091d 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.18.3/src/core/qgsapplication.cpp qgis-3.18.3-new/src/core/qgsapplication.cpp ---- qgis-3.18.3/src/core/qgsapplication.cpp 2021-05-14 14:10:19.000000000 +0200 -+++ qgis-3.18.3-new/src/core/qgsapplication.cpp 2021-05-16 09:54:34.610014196 +0200 -@@ -311,6 +311,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.20.1/src/core/qgsapplication.cpp qgis-3.20.1-new/src/core/qgsapplication.cpp +--- qgis-3.20.1/src/core/qgsapplication.cpp 2021-07-19 15:59:05.000000000 +0200 ++++ qgis-3.20.1-new/src/core/qgsapplication.cpp 2021-07-21 00:10:13.233846807 +0200 +@@ -322,6 +322,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-template-instantiations.patch b/qgis-template-instantiations.patch new file mode 100644 index 0000000..04ac9d6 --- /dev/null +++ b/qgis-template-instantiations.patch @@ -0,0 +1,17 @@ +diff -rupN qgis-3.20.1/src/core/settings/qgssettingsregistrycore.h qgis-3.20.1-new/src/core/settings/qgssettingsregistrycore.h +--- qgis-3.20.1/src/core/settings/qgssettingsregistrycore.h 2021-07-19 15:59:05.000000000 +0200 ++++ qgis-3.20.1-new/src/core/settings/qgssettingsregistrycore.h 2021-07-21 10:08:50.545884410 +0200 +@@ -27,13 +27,6 @@ + #include "qgsgeometry.h" + #include "qgsmaplayerproxymodel.h" + +-template class CORE_EXPORT QgsSettingsEntryEnumFlag SIP_SKIP; +-template class CORE_EXPORT QgsSettingsEntryEnumFlag SIP_SKIP; +-template class CORE_EXPORT QgsSettingsEntryEnumFlag SIP_SKIP; +-template class CORE_EXPORT QgsSettingsEntryEnumFlag SIP_SKIP; +-template class CORE_EXPORT QgsSettingsEntryEnumFlag SIP_SKIP; +-template class CORE_EXPORT QgsSettingsEntryEnumFlag< class QFlags > SIP_SKIP; +- + /** + * \ingroup core + * \class QgsSettingsRegistryCore diff --git a/qgis.spec b/qgis.spec index 7f926f8..a3c9898 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.18.3 -Release: 5%{?dist} +Version: 3.20.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -29,8 +29,8 @@ Source5: %{name}-mime.xml Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch -# Fix for Proj8 detection -Patch2: %{name}_proj8.patch +# Drop explicit template instantiations (fixes ARMv7hl FTBFS) +Patch2: %{name}-template-instantiations.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -216,6 +216,9 @@ rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld # Remove install instructions rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* +# Drop static library +rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a + %find_lang %{name} --with-qt @@ -296,6 +299,12 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed Jul 21 2021 Sandro Mani - 3.20.1-1 +- Update to 3.20.1 + +* Sun Jun 20 2021 Sandro Mani - 3.20.0-1 +- Update to 3.20.0 + * Sat Jul 10 2021 Scott Talbert - 3.18.3-5 - Revert back to building with sip 4 due to no sip 6 support diff --git a/qgis_proj8.patch b/qgis_proj8.patch deleted file mode 100644 index 580367b..0000000 --- a/qgis_proj8.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -rupN --no-dereference qgis-3.18.3/cmake/FindProj.cmake qgis-3.18.3-new/cmake/FindProj.cmake ---- qgis-3.18.3/cmake/FindProj.cmake 2021-05-14 14:10:19.000000000 +0200 -+++ qgis-3.18.3-new/cmake/FindProj.cmake 2021-05-16 09:54:36.430014237 +0200 -@@ -40,6 +40,12 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h - "$ENV{INCLUDE}" - "$ENV{LIB_DIR}/include" - ) -+IF (NOT PROJ_INCLUDE_DIR) -+ FIND_PATH(PROJ_INCLUDE_DIR proj.h -+ "$ENV{INCLUDE}" -+ "$ENV{LIB_DIR}/include" -+ ) -+ENDIF (NOT PROJ_INCLUDE_DIR) - - FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS - "$ENV{LIB}" diff --git a/sources b/sources index 6d26b10..987fac2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.18.3.tar.bz2) = d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef +SHA512 (qgis-3.20.1.tar.bz2) = 5d154e14431a351fbbdbc929d7357eabc3392d035c78e66adc49c670c866312871af72645ab412ebc150f8f3f381a7d3a9daf1728de8f7fe301d7a26ac24757e From 5cca4125828246afc9f3e097140a05715949f798 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 10:38:52 +0000 Subject: [PATCH 047/201] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index a3c9898..2881637 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.20.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.20.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 21 2021 Sandro Mani - 3.20.1-1 - Update to 3.20.1 From daa403be7c4218c9e3305e0a3370ffd67d0ba8dd Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Aug 2021 18:35:47 -0600 Subject: [PATCH 048/201] Rebuild for netcdf 4.8.0 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 2881637..8eafe54 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.20.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Wed Aug 11 2021 Orion Poplawski - 3.20.1-3 +- Rebuild for netcdf 4.8.0 + * Fri Jul 23 2021 Fedora Release Engineering - 3.20.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2c80720cddb55955510b33b0f39fd069f5b01ff3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 14 Aug 2021 10:41:49 +0200 Subject: [PATCH 049/201] Update to 3.20.2 --- .gitignore | 1 + qgis-lib64.patch | 6 +++--- qgis-serverprefix.patch | 6 +++--- qgis-template-instantiations.patch | 17 ----------------- qgis.spec | 9 +++++---- sources | 2 +- 6 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 qgis-template-instantiations.patch diff --git a/.gitignore b/.gitignore index 265647a..962dce0 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ qgis_1.5.0.tar.gz /qgis-3.18.2.tar.bz2 /qgis-3.18.3.tar.bz2 /qgis-3.20.1.tar.bz2 +/qgis-3.20.2.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 5615eaf..f72fc36 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.20.1/cmake/PyQtMacros.cmake qgis-3.20.1-new/cmake/PyQtMacros.cmake ---- qgis-3.20.1/cmake/PyQtMacros.cmake 2021-07-19 15:59:05.000000000 +0200 -+++ qgis-3.20.1-new/cmake/PyQtMacros.cmake 2021-07-21 00:10:11.459083430 +0200 +diff -rupN --no-dereference qgis-3.20.2/cmake/PyQtMacros.cmake qgis-3.20.2-new/cmake/PyQtMacros.cmake +--- qgis-3.20.2/cmake/PyQtMacros.cmake 2021-08-13 14:13:15.000000000 +0200 ++++ qgis-3.20.2-new/cmake/PyQtMacros.cmake 2021-08-14 10:39:03.452540438 +0200 @@ -28,7 +28,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index b54091d..24c5da2 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.20.1/src/core/qgsapplication.cpp qgis-3.20.1-new/src/core/qgsapplication.cpp ---- qgis-3.20.1/src/core/qgsapplication.cpp 2021-07-19 15:59:05.000000000 +0200 -+++ qgis-3.20.1-new/src/core/qgsapplication.cpp 2021-07-21 00:10:13.233846807 +0200 +diff -rupN --no-dereference qgis-3.20.2/src/core/qgsapplication.cpp qgis-3.20.2-new/src/core/qgsapplication.cpp +--- qgis-3.20.2/src/core/qgsapplication.cpp 2021-08-13 14:13:15.000000000 +0200 ++++ qgis-3.20.2-new/src/core/qgsapplication.cpp 2021-08-14 10:39:05.291523399 +0200 @@ -322,6 +322,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-template-instantiations.patch b/qgis-template-instantiations.patch deleted file mode 100644 index 04ac9d6..0000000 --- a/qgis-template-instantiations.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -rupN qgis-3.20.1/src/core/settings/qgssettingsregistrycore.h qgis-3.20.1-new/src/core/settings/qgssettingsregistrycore.h ---- qgis-3.20.1/src/core/settings/qgssettingsregistrycore.h 2021-07-19 15:59:05.000000000 +0200 -+++ qgis-3.20.1-new/src/core/settings/qgssettingsregistrycore.h 2021-07-21 10:08:50.545884410 +0200 -@@ -27,13 +27,6 @@ - #include "qgsgeometry.h" - #include "qgsmaplayerproxymodel.h" - --template class CORE_EXPORT QgsSettingsEntryEnumFlag SIP_SKIP; --template class CORE_EXPORT QgsSettingsEntryEnumFlag SIP_SKIP; --template class CORE_EXPORT QgsSettingsEntryEnumFlag SIP_SKIP; --template class CORE_EXPORT QgsSettingsEntryEnumFlag SIP_SKIP; --template class CORE_EXPORT QgsSettingsEntryEnumFlag SIP_SKIP; --template class CORE_EXPORT QgsSettingsEntryEnumFlag< class QFlags > SIP_SKIP; -- - /** - * \ingroup core - * \class QgsSettingsRegistryCore diff --git a/qgis.spec b/qgis.spec index 8eafe54..1931d8f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.20.1 -Release: 3%{?dist} +Version: 3.20.2 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -29,8 +29,6 @@ Source5: %{name}-mime.xml Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch -# Drop explicit template instantiations (fixes ARMv7hl FTBFS) -Patch2: %{name}-template-instantiations.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -299,6 +297,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Aug 14 2021 Sandro Mani - 3.20.2-1 +- Update to 3.20.2 + * Wed Aug 11 2021 Orion Poplawski - 3.20.1-3 - Rebuild for netcdf 4.8.0 diff --git a/sources b/sources index 987fac2..c15b9bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.20.1.tar.bz2) = 5d154e14431a351fbbdbc929d7357eabc3392d035c78e66adc49c670c866312871af72645ab412ebc150f8f3f381a7d3a9daf1728de8f7fe301d7a26ac24757e +SHA512 (qgis-3.20.2.tar.bz2) = 64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087 From f07d9b5280e8145acbfd6b7257ef4c6d925ed63e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 16 Aug 2021 15:36:54 -0600 Subject: [PATCH 050/201] Rebuild for netcdf 4.8.0 (again) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 1931d8f..cd7672c 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.20.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -297,6 +297,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Aug 16 2021 Orion Poplawski - 3.20.2-2 +- Rebuild for netcdf 4.8.0 (again) + * Sat Aug 14 2021 Sandro Mani - 3.20.2-1 - Update to 3.20.2 From 5595b5cc5aff530b26e445285a8572874cf0106a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 13 Sep 2021 09:23:11 +0200 Subject: [PATCH 051/201] Update to 3.20.3 --- .gitignore | 1 + qgis-lib64.patch | 6 +++--- qgis-serverprefix.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 962dce0..991bcda 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ qgis_1.5.0.tar.gz /qgis-3.18.3.tar.bz2 /qgis-3.20.1.tar.bz2 /qgis-3.20.2.tar.bz2 +/qgis-3.20.3.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index f72fc36..e466ac7 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.20.2/cmake/PyQtMacros.cmake qgis-3.20.2-new/cmake/PyQtMacros.cmake ---- qgis-3.20.2/cmake/PyQtMacros.cmake 2021-08-13 14:13:15.000000000 +0200 -+++ qgis-3.20.2-new/cmake/PyQtMacros.cmake 2021-08-14 10:39:03.452540438 +0200 +diff -rupN --no-dereference qgis-3.20.3/cmake/PyQtMacros.cmake qgis-3.20.3-new/cmake/PyQtMacros.cmake +--- qgis-3.20.3/cmake/PyQtMacros.cmake 2021-09-10 14:13:18.000000000 +0200 ++++ qgis-3.20.3-new/cmake/PyQtMacros.cmake 2021-09-13 09:20:37.091270150 +0200 @@ -28,7 +28,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(CMAKE_HOST_WIN32) # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 24c5da2..a394bf0 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.20.2/src/core/qgsapplication.cpp qgis-3.20.2-new/src/core/qgsapplication.cpp ---- qgis-3.20.2/src/core/qgsapplication.cpp 2021-08-13 14:13:15.000000000 +0200 -+++ qgis-3.20.2-new/src/core/qgsapplication.cpp 2021-08-14 10:39:05.291523399 +0200 +diff -rupN --no-dereference qgis-3.20.3/src/core/qgsapplication.cpp qgis-3.20.3-new/src/core/qgsapplication.cpp +--- qgis-3.20.3/src/core/qgsapplication.cpp 2021-09-10 14:13:18.000000000 +0200 ++++ qgis-3.20.3-new/src/core/qgsapplication.cpp 2021-09-13 09:20:38.719264457 +0200 @@ -322,6 +322,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis.spec b/qgis.spec index cd7672c..f5cb1e7 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.20.2 -Release: 2%{?dist} +Version: 3.20.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -297,6 +297,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Sep 13 2021 Sandro Mani - 3.20.3-1 +- Update to 3.20.3 + * Mon Aug 16 2021 Orion Poplawski - 3.20.2-2 - Rebuild for netcdf 4.8.0 (again) diff --git a/sources b/sources index c15b9bb..44a999b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.20.2.tar.bz2) = 64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087 +SHA512 (qgis-3.20.3.tar.bz2) = abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0 From bd5293e0c67c0cb30cdf8222644525c9e385964f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 21 Oct 2021 11:22:46 +0200 Subject: [PATCH 052/201] Rebuild (geos) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index f5cb1e7..17d64c2 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.20.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -297,6 +297,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Thu Oct 21 2021 Sandro Mani - 3.20.3-2 +- Rebuild (geos) + * Mon Sep 13 2021 Sandro Mani - 3.20.3-1 - Update to 3.20.3 From ba65fde0dbad46e740488a985153517945a7729a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 23 Oct 2021 22:44:28 +0200 Subject: [PATCH 053/201] Update 3.22.0 --- .gitignore | 1 + qgis-lib64.patch | 12 ++++++------ qgis-serverprefix.patch | 8 ++++---- qgis.spec | 16 ++++++++-------- sources | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 991bcda..5a1f2a6 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ qgis_1.5.0.tar.gz /qgis-3.20.1.tar.bz2 /qgis-3.20.2.tar.bz2 /qgis-3.20.3.tar.bz2 +/qgis-3.22.0.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index e466ac7..0d37395 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,12 +1,12 @@ -diff -rupN --no-dereference qgis-3.20.3/cmake/PyQtMacros.cmake qgis-3.20.3-new/cmake/PyQtMacros.cmake ---- qgis-3.20.3/cmake/PyQtMacros.cmake 2021-09-10 14:13:18.000000000 +0200 -+++ qgis-3.20.3-new/cmake/PyQtMacros.cmake 2021-09-13 09:20:37.091270150 +0200 -@@ -28,7 +28,7 @@ MACRO(PYQT_WRAP_UI outfiles ) - ELSE(CMAKE_HOST_WIN32) +diff -rupN --no-dereference qgis-3.22.0/cmake/PyQtMacros.cmake qgis-3.22.0-new/cmake/PyQtMacros.cmake +--- qgis-3.22.0/cmake/PyQtMacros.cmake 2021-10-22 14:12:10.000000000 +0200 ++++ qgis-3.22.0-new/cmake/PyQtMacros.cmake 2021-10-23 11:08:56.405115696 +0200 +@@ -34,7 +34,7 @@ MACRO(PYQT_WRAP_UI outfiles ) + ELSE() # TODO osx 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) + ENDIF() FOREACH(it ${ARGN}) diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index a394bf0..0d264cf 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.20.3/src/core/qgsapplication.cpp qgis-3.20.3-new/src/core/qgsapplication.cpp ---- qgis-3.20.3/src/core/qgsapplication.cpp 2021-09-10 14:13:18.000000000 +0200 -+++ qgis-3.20.3-new/src/core/qgsapplication.cpp 2021-09-13 09:20:38.719264457 +0200 -@@ -322,6 +322,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.22.0/src/core/qgsapplication.cpp qgis-3.22.0-new/src/core/qgsapplication.cpp +--- qgis-3.22.0/src/core/qgsapplication.cpp 2021-10-22 14:12:10.000000000 +0200 ++++ qgis-3.22.0-new/src/core/qgsapplication.cpp 2021-10-23 11:08:58.251112352 +0200 +@@ -348,6 +348,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis.spec b/qgis.spec index 17d64c2..83035ea 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.20.3 -Release: 2%{?dist} +Version: 3.22.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -57,7 +57,8 @@ BuildRequires: python3-devel BuildRequires: python3-qscintilla-qt5 BuildRequires: python3-qscintilla-qt5-devel BuildRequires: python3-qt5-devel -BuildRequires: python3-sip-devel +BuildRequires: %{py3_dist sip} >= 5.3 +BuildRequires: %{py3_dist PyQt-builder} >= 1 BuildRequires: qca-qt5-devel BuildRequires: qscintilla-qt5-devel BuildRequires: qt5-qt3d-devel @@ -257,8 +258,6 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %{_datadir}/%{name}/resources/ %{_datadir}/%{name}/svg/ %exclude %{_libdir}/libqgisgrass*.so.* -%exclude %{_libdir}/%{name}/plugins/libgrassprovider*.so -%exclude %{_libdir}/%{name}/plugins/libgrassrasterprovider*.so %exclude %{_libdir}/%{name}/plugins/libgrassplugin*.so %exclude %{_libdir}/%{name}/server/ %exclude %{_libdir}/%{name}/grass/ @@ -271,8 +270,6 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %files grass %{_libdir}/lib%{name}grass*.so.* -%{_libdir}/%{name}/plugins/libgrassprovider*.so -%{_libdir}/%{name}/plugins/libgrassrasterprovider*.so %{_libdir}/%{name}/plugins/libgrassplugin*.so %{_libdir}/%{name}/grass/ %{_datadir}/%{name}/grass/ @@ -297,6 +294,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Oct 23 2021 Sandro Mani - 3.22.0-1 +- Update to 3.22.0 + * Thu Oct 21 2021 Sandro Mani - 3.20.3-2 - Rebuild (geos) @@ -318,7 +318,7 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a * Wed Jul 21 2021 Sandro Mani - 3.20.1-1 - Update to 3.20.1 -* Sun Jun 20 2021 Sandro Mani - 3.20.0-1 +* Tue Jul 20 2021 Sandro Mani - 3.20.0-1 - Update to 3.20.0 * Sat Jul 10 2021 Scott Talbert - 3.18.3-5 diff --git a/sources b/sources index 44a999b..73d7c5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.20.3.tar.bz2) = abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0 +SHA512 (qgis-3.22.0.tar.bz2) = dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b From 290da253a397ef1bbc3c83417f99a6588536c977 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 25 Oct 2021 17:36:54 +0200 Subject: [PATCH 054/201] Rebuilt for protobuf 3.18.1 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 83035ea..32303ba 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.22.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -294,6 +294,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Oct 25 2021 Adrian Reber - 3.22.0-2 +- Rebuilt for protobuf 3.18.1 + * Sat Oct 23 2021 Sandro Mani - 3.22.0-1 - Update to 3.22.0 From 745a0554679b9e916358a96f55c15a5828548d21 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 25 Oct 2021 22:48:09 +0200 Subject: [PATCH 055/201] Move grass provider plugins to grass subpackage --- qgis.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 32303ba..6208490 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.22.0 -Release: 2%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -259,6 +259,8 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %{_datadir}/%{name}/svg/ %exclude %{_libdir}/libqgisgrass*.so.* %exclude %{_libdir}/%{name}/plugins/libgrassplugin*.so +%exclude %{_libdir}/%{name}/plugins/libprovider_grass7.so +%exclude %{_libdir}/%{name}/plugins/libprovider_grassraster7.so %exclude %{_libdir}/%{name}/server/ %exclude %{_libdir}/%{name}/grass/ @@ -271,6 +273,8 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %files grass %{_libdir}/lib%{name}grass*.so.* %{_libdir}/%{name}/plugins/libgrassplugin*.so +%{_libdir}/%{name}/plugins/libprovider_grass7.so +%{_libdir}/%{name}/plugins/libprovider_grassraster7.so %{_libdir}/%{name}/grass/ %{_datadir}/%{name}/grass/ @@ -294,6 +298,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Oct 25 2021 Sandro Mani - 3.22.0-4 +- Move grass provider plugins to grass subpackage + * Mon Oct 25 2021 Adrian Reber - 3.22.0-2 - Rebuilt for protobuf 3.18.1 From 92b7af1df2f595c11194599bc2aa7560180a07f3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 3 Nov 2021 18:23:08 +0100 Subject: [PATCH 056/201] Backport fix for GIL deadlock --- 45829.patch | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ qgis.spec | 7 ++++- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 45829.patch diff --git a/45829.patch b/45829.patch new file mode 100644 index 0000000..2c3656d --- /dev/null +++ b/45829.patch @@ -0,0 +1,73 @@ +From 66f8f4f279672218d8a6b05dc4f664ce05465e2a Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Wed, 3 Nov 2021 09:31:16 +0100 +Subject: [PATCH] Set release_gil = True when generating bindings + +--- + python/3d/project.py.in | 1 + + python/analysis/project.py.in | 1 + + python/core/project.py.in | 1 + + python/gui/project.py.in | 1 + + python/server/project.py.in | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/python/3d/project.py.in b/python/3d/project.py.in +index ecbdce41f570..df8f76b7f5d6 100644 +--- a/python/3d/project.py.in ++++ b/python/3d/project.py.in +@@ -37,6 +37,7 @@ class Qgis3D(PyQtBindings): + super().__init__(project, '3d') + self.sip_file = '3d.sip' + self.exceptions = True ++ self.release_gil = True + self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";") + + def apply_user_defaults(self, tool): +diff --git a/python/analysis/project.py.in b/python/analysis/project.py.in +index d62cfc8d7c5e..55c65cf0b34b 100644 +--- a/python/analysis/project.py.in ++++ b/python/analysis/project.py.in +@@ -37,6 +37,7 @@ class QgisAnalysis(PyQtBindings): + super().__init__(project, 'analysis') + self.sip_file = 'analysis.sip' + self.exceptions = True ++ self.release_gil = True + self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";") + + def apply_user_defaults(self, tool): +diff --git a/python/core/project.py.in b/python/core/project.py.in +index 1fd92b7f9374..5f383d434d15 100644 +--- a/python/core/project.py.in ++++ b/python/core/project.py.in +@@ -37,6 +37,7 @@ class QgisCore(PyQtBindings): + super().__init__(project, 'core') + self.sip_file = 'core.sip' + self.exceptions = True ++ self.release_gil = True + self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";") + + def apply_user_defaults(self, tool): +diff --git a/python/gui/project.py.in b/python/gui/project.py.in +index aa9cd77f7036..c6a751721136 100644 +--- a/python/gui/project.py.in ++++ b/python/gui/project.py.in +@@ -37,6 +37,7 @@ class QgisGui(PyQtBindings): + super().__init__(project, 'gui') + self.sip_file = 'gui.sip' + self.exceptions = True ++ self.release_gil = True + self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";") + + def apply_user_defaults(self, tool): +diff --git a/python/server/project.py.in b/python/server/project.py.in +index a07045619c15..146d96a56448 100644 +--- a/python/server/project.py.in ++++ b/python/server/project.py.in +@@ -37,6 +37,7 @@ class QgisServer(PyQtBindings): + super().__init__(project, 'server') + self.sip_file = 'server.sip' + self.exceptions = True ++ self.release_gil = True + self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";") + + def apply_user_defaults(self, tool): diff --git a/qgis.spec b/qgis.spec index 6208490..d938273 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.22.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -29,6 +29,8 @@ Source5: %{name}-mime.xml Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch +# Backport fix for GIL deadlock +Patch2: https://github.com/qgis/QGIS/pull/45829.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -298,6 +300,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Wed Nov 03 2021 Sandro Mani - 3.22.0-5 +- Backport fix for GIL deadlock + * Mon Oct 25 2021 Sandro Mani - 3.22.0-4 - Move grass provider plugins to grass subpackage From 792e6214a70d5c36123eb4ee17b227dfcf853fd2 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sat, 6 Nov 2021 13:02:03 +0100 Subject: [PATCH 057/201] Rebuilt for protobuf 3.19.0 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index d938273..8d1825b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.22.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -300,6 +300,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Nov 06 2021 Adrian Reber - 3.22.0-6 +- Rebuilt for protobuf 3.19.0 + * Wed Nov 03 2021 Sandro Mani - 3.22.0-5 - Backport fix for GIL deadlock From ed6472f4485ffff23ef49223fd44ea1efc27b5b3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 11 Nov 2021 12:10:18 +0100 Subject: [PATCH 058/201] Rebuild (gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 8d1825b..6156d3a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.22.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -300,6 +300,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Thu Nov 11 2021 Sandro Mani - 3.22.0-7 +- Rebuild (gdal) + * Sat Nov 06 2021 Adrian Reber - 3.22.0-6 - Rebuilt for protobuf 3.19.0 From fe0c4bd32225dde270cbf264980a0553f4bd0136 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 20 Nov 2021 17:18:59 +0100 Subject: [PATCH 059/201] Update to 3.22.1 --- .gitignore | 1 + 45829.patch | 73 ----------------------------------------- qgis-lib64.patch | 6 ++-- qgis-serverprefix.patch | 6 ++-- qgis.spec | 9 ++--- sources | 2 +- 6 files changed, 13 insertions(+), 84 deletions(-) delete mode 100644 45829.patch diff --git a/.gitignore b/.gitignore index 5a1f2a6..322851e 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ qgis_1.5.0.tar.gz /qgis-3.20.2.tar.bz2 /qgis-3.20.3.tar.bz2 /qgis-3.22.0.tar.bz2 +/qgis-3.22.1.tar.bz2 diff --git a/45829.patch b/45829.patch deleted file mode 100644 index 2c3656d..0000000 --- a/45829.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 66f8f4f279672218d8a6b05dc4f664ce05465e2a Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Wed, 3 Nov 2021 09:31:16 +0100 -Subject: [PATCH] Set release_gil = True when generating bindings - ---- - python/3d/project.py.in | 1 + - python/analysis/project.py.in | 1 + - python/core/project.py.in | 1 + - python/gui/project.py.in | 1 + - python/server/project.py.in | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/python/3d/project.py.in b/python/3d/project.py.in -index ecbdce41f570..df8f76b7f5d6 100644 ---- a/python/3d/project.py.in -+++ b/python/3d/project.py.in -@@ -37,6 +37,7 @@ class Qgis3D(PyQtBindings): - super().__init__(project, '3d') - self.sip_file = '3d.sip' - self.exceptions = True -+ self.release_gil = True - self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";") - - def apply_user_defaults(self, tool): -diff --git a/python/analysis/project.py.in b/python/analysis/project.py.in -index d62cfc8d7c5e..55c65cf0b34b 100644 ---- a/python/analysis/project.py.in -+++ b/python/analysis/project.py.in -@@ -37,6 +37,7 @@ class QgisAnalysis(PyQtBindings): - super().__init__(project, 'analysis') - self.sip_file = 'analysis.sip' - self.exceptions = True -+ self.release_gil = True - self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";") - - def apply_user_defaults(self, tool): -diff --git a/python/core/project.py.in b/python/core/project.py.in -index 1fd92b7f9374..5f383d434d15 100644 ---- a/python/core/project.py.in -+++ b/python/core/project.py.in -@@ -37,6 +37,7 @@ class QgisCore(PyQtBindings): - super().__init__(project, 'core') - self.sip_file = 'core.sip' - self.exceptions = True -+ self.release_gil = True - self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";") - - def apply_user_defaults(self, tool): -diff --git a/python/gui/project.py.in b/python/gui/project.py.in -index aa9cd77f7036..c6a751721136 100644 ---- a/python/gui/project.py.in -+++ b/python/gui/project.py.in -@@ -37,6 +37,7 @@ class QgisGui(PyQtBindings): - super().__init__(project, 'gui') - self.sip_file = 'gui.sip' - self.exceptions = True -+ self.release_gil = True - self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";") - - def apply_user_defaults(self, tool): -diff --git a/python/server/project.py.in b/python/server/project.py.in -index a07045619c15..146d96a56448 100644 ---- a/python/server/project.py.in -+++ b/python/server/project.py.in -@@ -37,6 +37,7 @@ class QgisServer(PyQtBindings): - super().__init__(project, 'server') - self.sip_file = 'server.sip' - self.exceptions = True -+ self.release_gil = True - self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";") - - def apply_user_defaults(self, tool): diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 0d37395..bfa264e 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.22.0/cmake/PyQtMacros.cmake qgis-3.22.0-new/cmake/PyQtMacros.cmake ---- qgis-3.22.0/cmake/PyQtMacros.cmake 2021-10-22 14:12:10.000000000 +0200 -+++ qgis-3.22.0-new/cmake/PyQtMacros.cmake 2021-10-23 11:08:56.405115696 +0200 +diff -rupN --no-dereference qgis-3.22.1/cmake/PyQtMacros.cmake qgis-3.22.1-new/cmake/PyQtMacros.cmake +--- qgis-3.22.1/cmake/PyQtMacros.cmake 2021-11-19 13:08:37.000000000 +0100 ++++ qgis-3.22.1-new/cmake/PyQtMacros.cmake 2021-11-20 17:13:59.004391478 +0100 @@ -34,7 +34,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE() # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 0d264cf..9db9ecd 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.22.0/src/core/qgsapplication.cpp qgis-3.22.0-new/src/core/qgsapplication.cpp ---- qgis-3.22.0/src/core/qgsapplication.cpp 2021-10-22 14:12:10.000000000 +0200 -+++ qgis-3.22.0-new/src/core/qgsapplication.cpp 2021-10-23 11:08:58.251112352 +0200 +diff -rupN --no-dereference qgis-3.22.1/src/core/qgsapplication.cpp qgis-3.22.1-new/src/core/qgsapplication.cpp +--- qgis-3.22.1/src/core/qgsapplication.cpp 2021-11-19 13:08:37.000000000 +0100 ++++ qgis-3.22.1-new/src/core/qgsapplication.cpp 2021-11-20 17:14:00.919883058 +0100 @@ -348,6 +348,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis.spec b/qgis.spec index 6156d3a..99c0a37 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.22.0 -Release: 7%{?dist} +Version: 3.22.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -29,8 +29,6 @@ Source5: %{name}-mime.xml Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch -# Backport fix for GIL deadlock -Patch2: https://github.com/qgis/QGIS/pull/45829.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -300,6 +298,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Nov 20 2021 Sandro Mani - 3.22.1-1 +- Update to 3.22.1 + * Thu Nov 11 2021 Sandro Mani - 3.22.0-7 - Rebuild (gdal) diff --git a/sources b/sources index 73d7c5c..121e3dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.22.0.tar.bz2) = dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b +SHA512 (qgis-3.22.1.tar.bz2) = b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9 From abd6e75da730218948878202130f7a6e36402940 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 21 Nov 2021 19:35:09 -0700 Subject: [PATCH 060/201] Rebuild for hdf5 1.12.1 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 99c0a37..f963cf2 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.22.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -298,6 +298,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Nov 22 2021 Orion Poplawski - 3.22.1-2 +- Rebuild for hdf5 1.12.1 + * Sat Nov 20 2021 Sandro Mani - 3.22.1-1 - Update to 3.22.1 From 3cea10c30b5e4a6d877769bd54aa2a4b6e49419b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 17 Dec 2021 20:56:19 +0100 Subject: [PATCH 061/201] Update to 3.22.2 --- .gitignore | 1 + qgis-lib64.patch | 6 +++--- qgis-serverprefix.patch | 8 ++++---- qgis.spec | 7 +++++-- sources | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 322851e..ac46143 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ qgis_1.5.0.tar.gz /qgis-3.20.3.tar.bz2 /qgis-3.22.0.tar.bz2 /qgis-3.22.1.tar.bz2 +/qgis-3.22.2.tar.bz2 diff --git a/qgis-lib64.patch b/qgis-lib64.patch index bfa264e..5210feb 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.22.1/cmake/PyQtMacros.cmake qgis-3.22.1-new/cmake/PyQtMacros.cmake ---- qgis-3.22.1/cmake/PyQtMacros.cmake 2021-11-19 13:08:37.000000000 +0100 -+++ qgis-3.22.1-new/cmake/PyQtMacros.cmake 2021-11-20 17:13:59.004391478 +0100 +diff -rupN --no-dereference qgis-3.22.2/cmake/PyQtMacros.cmake qgis-3.22.2-new/cmake/PyQtMacros.cmake +--- qgis-3.22.2/cmake/PyQtMacros.cmake 2021-12-17 13:04:51.000000000 +0100 ++++ qgis-3.22.2-new/cmake/PyQtMacros.cmake 2021-12-17 20:52:23.322771252 +0100 @@ -34,7 +34,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE() # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 9db9ecd..fc00ffb 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.22.1/src/core/qgsapplication.cpp qgis-3.22.1-new/src/core/qgsapplication.cpp ---- qgis-3.22.1/src/core/qgsapplication.cpp 2021-11-19 13:08:37.000000000 +0100 -+++ qgis-3.22.1-new/src/core/qgsapplication.cpp 2021-11-20 17:14:00.919883058 +0100 -@@ -348,6 +348,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.22.2/src/core/qgsapplication.cpp qgis-3.22.2-new/src/core/qgsapplication.cpp +--- qgis-3.22.2/src/core/qgsapplication.cpp 2021-12-17 13:04:51.000000000 +0100 ++++ qgis-3.22.2-new/src/core/qgsapplication.cpp 2021-12-17 20:52:25.436776588 +0100 +@@ -351,6 +351,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis.spec b/qgis.spec index f963cf2..0191d2f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.22.1 -Release: 2%{?dist} +Version: 3.22.2 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -298,6 +298,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Dec 17 2021 Sandro Mani - 3.22.2-1 +- Update to 3.22.2 + * Mon Nov 22 2021 Orion Poplawski - 3.22.1-2 - Rebuild for hdf5 1.12.1 diff --git a/sources b/sources index 121e3dd..dfa8d20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.22.1.tar.bz2) = b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9 +SHA512 (qgis-3.22.2.tar.bz2) = 6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74 From 0037c177b1e83b8d8db8e0c269341a1e2f57e175 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 6 Jan 2022 00:12:23 +0100 Subject: [PATCH 062/201] Disable landingpage --- qgis.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/qgis.spec b/qgis.spec index 0191d2f..e89dc5e 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.22.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -153,15 +153,9 @@ Please refer to %{name}-server-README.fedora for details! # Readme file for QGIS server configuration and Lighttpd example install -pm0644 %{SOURCE4} . -# Delete bundled libs -#rm -r src/core/spatialite/ -#rm -r external/mdal* -#rm -r external/qwtpolar* -#rm -r external/libdxfrw* -#rm -rf "python/ext-libs/!(CMakeLists.txt|tests)" -# -#rm -rf src/plugins/dxf2shp_converter/ -#sed -i '/dxf2shp_converter/d' src/plugins/CMakeLists.txt +# Disable landingpage, it ships precompiled js +rm -rf resources/server/api/ogc/static/landingpage/ +sed -i 's|add_subdirectory(landingpage)|#add_subdirectory(landingpage)|' src/server/services/CMakeLists.txt gzip ChangeLog @@ -263,6 +257,7 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %exclude %{_libdir}/%{name}/plugins/libprovider_grassraster7.so %exclude %{_libdir}/%{name}/server/ %exclude %{_libdir}/%{name}/grass/ +%exclude %{_datadir}/%{name}/resources/server/ %files devel %{_datadir}/%{name}/FindQGIS.cmake @@ -295,9 +290,13 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %{_libexecdir}/%{name}/ %{python3_sitearch}/%{name}/server/ %{python3_sitearch}/%{name}/_server.so +%{_datadir}/%{name}/resources/server/ %changelog +* Wed Jan 05 2022 Sandro Mani - 3.22.2-2 +- Disable landingpage + * Fri Dec 17 2021 Sandro Mani - 3.22.2-1 - Update to 3.22.2 From 41500347496e9e23d36a6b7646c276fd8b486b55 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 12 Jan 2022 12:25:09 +0100 Subject: [PATCH 063/201] Update qgis-mime.xml --- qgis-mime.xml | 200 +++++++++++++++++++++++++++++++++++++++++++++++++- qgis.spec | 5 +- 2 files changed, 201 insertions(+), 4 deletions(-) diff --git a/qgis-mime.xml b/qgis-mime.xml index bf8fec6..40c8301 100644 --- a/qgis-mime.xml +++ b/qgis-mime.xml @@ -6,7 +6,7 @@ QGIS-Projekt - + @@ -15,11 +15,25 @@ + + QGIS Project + QGIS-Projekt + + + + + + + + + + + QGIS layer settings - QGIS Layer Einstellungen + QGIS-Layereinstellungen - + @@ -27,4 +41,184 @@ + + + QGIS layer definition + QGIS-Layerdefinition + + + + + + + + + + + + QGIS composer template + QGIS-Druckzusammenstellungsvorlage + + + + + + + + + + + + ESRI shape file + ESRI-Shapedatei + + + + + + + + + + + + + + + + + + + + + + ESRI coordinate reference system + ESRI-Koordinatenreferenzsystem + + + + + + + + + + + TIFF raster data + TIFF-Rasterdaten + + + + + + + + + + + + + + + JPEG raster data + JPEG-Rasterdaten + + + + + + + + + + JPEG2000 raster data + JPEG2000-Rasterdaten + + + + + + + + + + + + + + + + + + + + + + + + AIG raster data + AIG-Rasterdaten + + + + + + ECW raster data + ECW-Rasterdaten + + + + + + MrSID raster data + MrSID-Rasterdaten + + + + + + MapInfo file + MapInfo-Datei + + + + + + + + + + + + + + + Adobe FrameMaker MIF file + + + + + + + + Keyhole Markup Language data + + + + + + + Zipped Keyhole Markup Language data + + + + + + + GeoPackage data + + + + + diff --git a/qgis.spec b/qgis.spec index e89dc5e..8baf79f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.22.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -294,6 +294,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Wed Jan 12 2022 Sandro Mani - 3.22.2-3 +- Update qgis-mime.xml + * Wed Jan 05 2022 Sandro Mani - 3.22.2-2 - Disable landingpage From 6b534d6024c287cf9d3fb0cb15960c774f18b18e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 18 Jan 2022 11:04:35 +0100 Subject: [PATCH 064/201] Update to 3.22.3 --- qgis-lib64.patch | 6 +++--- qgis-serverprefix.patch | 6 +++--- qgis.spec | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 5210feb..61ab608 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.22.2/cmake/PyQtMacros.cmake qgis-3.22.2-new/cmake/PyQtMacros.cmake ---- qgis-3.22.2/cmake/PyQtMacros.cmake 2021-12-17 13:04:51.000000000 +0100 -+++ qgis-3.22.2-new/cmake/PyQtMacros.cmake 2021-12-17 20:52:23.322771252 +0100 +diff -rupN --no-dereference qgis-3.22.3/cmake/PyQtMacros.cmake qgis-3.22.3-new/cmake/PyQtMacros.cmake +--- qgis-3.22.3/cmake/PyQtMacros.cmake 2022-01-14 13:06:34.000000000 +0100 ++++ qgis-3.22.3-new/cmake/PyQtMacros.cmake 2022-01-18 11:03:45.886207810 +0100 @@ -34,7 +34,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE() # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index fc00ffb..4eb48b6 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.22.2/src/core/qgsapplication.cpp qgis-3.22.2-new/src/core/qgsapplication.cpp ---- qgis-3.22.2/src/core/qgsapplication.cpp 2021-12-17 13:04:51.000000000 +0100 -+++ qgis-3.22.2-new/src/core/qgsapplication.cpp 2021-12-17 20:52:25.436776588 +0100 +diff -rupN --no-dereference qgis-3.22.3/src/core/qgsapplication.cpp qgis-3.22.3-new/src/core/qgsapplication.cpp +--- qgis-3.22.3/src/core/qgsapplication.cpp 2022-01-14 13:06:34.000000000 +0100 ++++ qgis-3.22.3-new/src/core/qgsapplication.cpp 2022-01-18 11:03:48.005209176 +0100 @@ -351,6 +351,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis.spec b/qgis.spec index 8baf79f..cc10099 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,8 +7,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.22.2 -Release: 3%{?dist} +Version: 3.22.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -294,6 +294,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Jan 18 2022 Sandro Mani - 3.22.3-1 +- Update to 3.22.3 + * Wed Jan 12 2022 Sandro Mani - 3.22.2-3 - Update qgis-mime.xml From 052923b2d2dc67fa327d759b2abdd02eac0b01e7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 18 Jan 2022 11:41:33 +0100 Subject: [PATCH 065/201] Update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ac46143..3d6031e 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ qgis_1.5.0.tar.gz /qgis-3.22.0.tar.bz2 /qgis-3.22.1.tar.bz2 /qgis-3.22.2.tar.bz2 +/qgis-3.22.3.tar.bz2 diff --git a/sources b/sources index dfa8d20..6f41684 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.22.2.tar.bz2) = 6d893217d54483018ab5de06cc11da5da3faf24fb863da57a608429a75f3e1c4647dd809ae1bc0a7034e28296a116c8ebcb528b4886b2714e75654415b2f4c74 +SHA512 (qgis-3.22.3.tar.bz2) = 8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28 From 353f2b132e79e7b7dc39e6726b2b080b90a87f86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 16:56:47 +0000 Subject: [PATCH 066/201] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index cc10099..5b6c8fc 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.22.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -294,6 +294,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 3.22.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 18 2022 Sandro Mani - 3.22.3-1 - Update to 3.22.3 From ba179ce869931ce32d000ef7dd78614f42b3bd9c Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 30 Jan 2022 18:36:56 +0100 Subject: [PATCH 067/201] Rebuild (grass) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 5b6c8fc..a894404 100644 --- a/qgis.spec +++ b/qgis.spec @@ -8,7 +8,7 @@ Name: qgis Version: 3.22.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -294,6 +294,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Jan 30 2022 Sandro Mani - 3.22.3-3 +- Rebuild (grass) + * Fri Jan 21 2022 Fedora Release Engineering - 3.22.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fdd81a30874f8a162e79437329bcb03ff21589db Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 31 Jan 2022 15:45:56 +0100 Subject: [PATCH 068/201] Add patch for grass8 support --- qgis-grass8.patch | 85 +++++++++++++++++++++++++++++++++++++++++++++++ qgis.spec | 17 +++++----- 2 files changed, 93 insertions(+), 9 deletions(-) create mode 100644 qgis-grass8.patch diff --git a/qgis-grass8.patch b/qgis-grass8.patch new file mode 100644 index 0000000..82111c7 --- /dev/null +++ b/qgis-grass8.patch @@ -0,0 +1,85 @@ +diff -rupN qgis-3.22.3/CMakeLists.txt qgis-3.22.3-new/CMakeLists.txt +--- qgis-3.22.3/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 ++++ qgis-3.22.3-new/CMakeLists.txt 2022-01-31 00:04:21.834722764 +0100 +@@ -121,7 +121,7 @@ mark_as_advanced(WITH_CORE) + if(WITH_CORE) + # Only GRASS 7 is currently supported but we keep dual version support in cmake for possible future switch to GRASS 8. + # Try to configure and build GRASS plugin by default +- foreach (GRASS_SEARCH_VERSION 7) ++ foreach (GRASS_SEARCH_VERSION 7 8) + # Legacy note: + # For GRASS 6 there were used cached variables without version suffix so that existing caches didn't have to be reconfigured. + # Cached variables were: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7 +diff -rupN qgis-3.22.3/src/plugins/grass/8/CMakeLists.txt qgis-3.22.3-new/src/plugins/grass/8/CMakeLists.txt +--- qgis-3.22.3/src/plugins/grass/8/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ qgis-3.22.3-new/src/plugins/grass/8/CMakeLists.txt 2022-01-31 11:17:45.372359290 +0100 +@@ -0,0 +1,2 @@ ++include_directories(${GRASS_INCLUDE_DIR8} ${CMAKE_CURRENT_BINARY_DIR}) ++ADD_GRASSPLUGIN(8) +diff -rupN qgis-3.22.3/src/plugins/grass/CMakeLists.txt qgis-3.22.3-new/src/plugins/grass/CMakeLists.txt +--- qgis-3.22.3/src/plugins/grass/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 ++++ qgis-3.22.3-new/src/plugins/grass/CMakeLists.txt 2022-01-31 11:15:16.004964676 +0100 +@@ -251,7 +251,7 @@ if(NOT WIN32) + install(DIRECTORY qtermwidget/color-schemes/ DESTINATION "${COLORSCHEMES_DIR}" FILES_MATCHING PATTERN "*.*schem*") + endif() + +-foreach(GRASS_BUILD_VERSION 6 7) # GRASS 6 and GRASS 7 ++foreach(GRASS_BUILD_VERSION 6 7 8) # GRASS 6 and GRASS 7 + if(GRASS_FOUND${GRASS_BUILD_VERSION}) + add_subdirectory(${GRASS_BUILD_VERSION}) + endif() +diff -rupN qgis-3.22.3/src/providers/CMakeLists.txt qgis-3.22.3-new/src/providers/CMakeLists.txt +--- qgis-3.22.3/src/providers/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 ++++ qgis-3.22.3-new/src/providers/CMakeLists.txt 2022-01-31 13:10:28.744968199 +0100 +@@ -40,7 +40,7 @@ if (NOT FORCE_STATIC_LIBS) + add_subdirectory(pdal) + endif() + +- if (WITH_GRASS OR WITH_GRASS7) ++ if (WITH_GRASS OR WITH_GRASS7 OR WITH_GRASS8) + add_subdirectory(grass) + endif() + endif() +diff -rupN qgis-3.22.3/src/providers/grass/8/CMakeLists.txt qgis-3.22.3-new/src/providers/grass/8/CMakeLists.txt +--- qgis-3.22.3/src/providers/grass/8/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ qgis-3.22.3-new/src/providers/grass/8/CMakeLists.txt 2022-01-31 11:17:08.383998695 +0100 +@@ -0,0 +1,7 @@ ++include_directories( SYSTEM ++ ${GRASS_INCLUDE_DIR8} ++) ++include_directories( ++ ${CMAKE_CURRENT_BINARY_DIR} ++) ++ADD_GRASSLIB(8) +diff -rupN qgis-3.22.3/src/providers/grass/CMakeLists.txt qgis-3.22.3-new/src/providers/grass/CMakeLists.txt +--- qgis-3.22.3/src/providers/grass/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 ++++ qgis-3.22.3-new/src/providers/grass/CMakeLists.txt 2022-01-31 11:16:03.288388160 +0100 +@@ -319,7 +319,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION) + ) + endmacro(ADD_GRASSLIB) + +-foreach(GRASS_BUILD_VERSION 6 7) # GRASS 6 and GRASS 7 ++foreach(GRASS_BUILD_VERSION 6 7 8) # GRASS 6 and GRASS 7 + if(GRASS_FOUND${GRASS_BUILD_VERSION}) + add_subdirectory(${GRASS_BUILD_VERSION}) + endif() +diff -rupN qgis-3.22.3/tests/src/providers/grass/8/CMakeLists.txt qgis-3.22.3-new/tests/src/providers/grass/8/CMakeLists.txt +--- qgis-3.22.3/tests/src/providers/grass/8/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ qgis-3.22.3-new/tests/src/providers/grass/8/CMakeLists.txt 2022-01-31 11:17:32.954911877 +0100 +@@ -0,0 +1,2 @@ ++include_directories(${GRASS_INCLUDE_DIR8} ${CMAKE_CURRENT_BINARY_DIR}) ++ADD_QGIS_GRASS_TESTS(8) +diff -rupN qgis-3.22.3/tests/src/providers/grass/CMakeLists.txt qgis-3.22.3-new/tests/src/providers/grass/CMakeLists.txt +--- qgis-3.22.3/tests/src/providers/grass/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 ++++ qgis-3.22.3-new/tests/src/providers/grass/CMakeLists.txt 2022-01-31 11:16:21.406143949 +0100 +@@ -86,8 +86,8 @@ macro (ADD_QGIS_GRASS_TESTS version) + endif() + endmacro (ADD_QGIS_GRASS_TESTS) + +-foreach(GRASS_BUILD_VERSION 6 7) ++foreach(GRASS_BUILD_VERSION 6 7 8) + if(GRASS_FOUND${GRASS_BUILD_VERSION}) + add_subdirectory(${GRASS_BUILD_VERSION}) + endif() +-endforeach(GRASS_BUILD_VERSION 6 7) ++endforeach(GRASS_BUILD_VERSION 6 7 8) diff --git a/qgis.spec b/qgis.spec index a894404..8b9e0b9 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,6 +1,3 @@ -%global grass7_prefix $(pkg-config --variable=prefix grass 2>/dev/null || echo '%{_libdir}/grass76') - - # Shared lib calls exit # https://issues.qgis.org/issues/2854 @@ -29,6 +26,8 @@ Source5: %{name}-mime.xml Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch +# Also look for grass8 +Patch2: %{name}-grass8.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -167,8 +166,8 @@ gzip ChangeLog -D QGIS_MANUAL_SUBDIR=/share/man \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ -D WITH_BINDINGS:BOOL=TRUE \ - -D WITH_GRASS7:BOOL=TRUE \ - -D GRASS_PREFIX7=%{grass7_prefix} \ + -D WITH_GRASS8:BOOL=TRUE \ + -D GRASS_PREFIX8=`pkg-config --variable=prefix grass` \ -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \ -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \ -D ENABLE_TESTS:BOOL=FALSE \ @@ -253,8 +252,8 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %{_datadir}/%{name}/svg/ %exclude %{_libdir}/libqgisgrass*.so.* %exclude %{_libdir}/%{name}/plugins/libgrassplugin*.so -%exclude %{_libdir}/%{name}/plugins/libprovider_grass7.so -%exclude %{_libdir}/%{name}/plugins/libprovider_grassraster7.so +%exclude %{_libdir}/%{name}/plugins/libprovider_grass8.so +%exclude %{_libdir}/%{name}/plugins/libprovider_grassraster8.so %exclude %{_libdir}/%{name}/server/ %exclude %{_libdir}/%{name}/grass/ %exclude %{_datadir}/%{name}/resources/server/ @@ -268,8 +267,8 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %files grass %{_libdir}/lib%{name}grass*.so.* %{_libdir}/%{name}/plugins/libgrassplugin*.so -%{_libdir}/%{name}/plugins/libprovider_grass7.so -%{_libdir}/%{name}/plugins/libprovider_grassraster7.so +%{_libdir}/%{name}/plugins/libprovider_grass8.so +%{_libdir}/%{name}/plugins/libprovider_grassraster8.so %{_libdir}/%{name}/grass/ %{_datadir}/%{name}/grass/ From 19561f35db4107cac88ca4ee2138da8b2e190f7e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 2 Feb 2022 16:38:42 +0100 Subject: [PATCH 069/201] Update qgis-grass8.patch --- qgis-grass8.patch | 64 +++++++++++++++++++++++++++++++++++------------ qgis.spec | 5 +++- 2 files changed, 52 insertions(+), 17 deletions(-) diff --git a/qgis-grass8.patch b/qgis-grass8.patch index 82111c7..d533e80 100644 --- a/qgis-grass8.patch +++ b/qgis-grass8.patch @@ -1,6 +1,6 @@ -diff -rupN qgis-3.22.3/CMakeLists.txt qgis-3.22.3-new/CMakeLists.txt +diff -rupN --no-dereference qgis-3.22.3/CMakeLists.txt qgis-3.22.3-new/CMakeLists.txt --- qgis-3.22.3/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/CMakeLists.txt 2022-01-31 00:04:21.834722764 +0100 ++++ qgis-3.22.3-new/CMakeLists.txt 2022-02-02 16:38:09.789109361 +0100 @@ -121,7 +121,7 @@ mark_as_advanced(WITH_CORE) if(WITH_CORE) # Only GRASS 7 is currently supported but we keep dual version support in cmake for possible future switch to GRASS 8. @@ -10,15 +10,47 @@ diff -rupN qgis-3.22.3/CMakeLists.txt qgis-3.22.3-new/CMakeLists.txt # Legacy note: # For GRASS 6 there were used cached variables without version suffix so that existing caches didn't have to be reconfigured. # Cached variables were: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7 -diff -rupN qgis-3.22.3/src/plugins/grass/8/CMakeLists.txt qgis-3.22.3-new/src/plugins/grass/8/CMakeLists.txt +diff -rupN --no-dereference qgis-3.22.3/python/plugins/grassprovider/Grass7Utils.py qgis-3.22.3-new/python/plugins/grassprovider/Grass7Utils.py +--- qgis-3.22.3/python/plugins/grassprovider/Grass7Utils.py 2022-01-14 13:06:34.000000000 +0100 ++++ qgis-3.22.3-new/python/plugins/grassprovider/Grass7Utils.py 2022-02-02 16:38:09.790109363 +0100 +@@ -127,7 +127,7 @@ class Grass7Utils: + for line in lines: + if "GRASS GIS " in line: + line = line.split(" ")[-1].strip() +- if line.startswith("7."): ++ if line.startswith("7.") or line.startswith("8."): + Grass7Utils.version = line + return Grass7Utils.version + except Exception: +@@ -174,8 +174,8 @@ class Grass7Utils: + ] + else: + cmdList = [ +- "grass78", "grass76", "grass74", "grass72", "grass70", "grass", +- "grass78.sh", "grass76.sh", "grass74.sh", "grass72.sh", "grass70.sh", "grass.sh" ++ "grass80", "grass78", "grass76", "grass74", "grass72", "grass70", "grass", ++ "grass80.sh", "grass78.sh", "grass76.sh", "grass74.sh", "grass72.sh", "grass70.sh", "grass.sh" + ] + + # For MS-Windows there is a difference between GRASS Path and GRASS binary +@@ -235,7 +235,7 @@ class Grass7Utils: + folder = os.environ["GISBASE"] + else: + # Find grass folder if it exists inside QGIS bundle +- for version in ['', '7', '78', '76', '74', '72', '71', '70']: ++ for version in ['', '8', '7', '80', '78', '76', '74', '72', '71', '70']: + testfolder = os.path.join(str(QgsApplication.prefixPath()), + 'grass{}'.format(version)) + if os.path.isdir(testfolder): +diff -rupN --no-dereference qgis-3.22.3/src/plugins/grass/8/CMakeLists.txt qgis-3.22.3-new/src/plugins/grass/8/CMakeLists.txt --- qgis-3.22.3/src/plugins/grass/8/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ qgis-3.22.3-new/src/plugins/grass/8/CMakeLists.txt 2022-01-31 11:17:45.372359290 +0100 ++++ qgis-3.22.3-new/src/plugins/grass/8/CMakeLists.txt 2022-02-02 16:38:09.789109361 +0100 @@ -0,0 +1,2 @@ +include_directories(${GRASS_INCLUDE_DIR8} ${CMAKE_CURRENT_BINARY_DIR}) +ADD_GRASSPLUGIN(8) -diff -rupN qgis-3.22.3/src/plugins/grass/CMakeLists.txt qgis-3.22.3-new/src/plugins/grass/CMakeLists.txt +diff -rupN --no-dereference qgis-3.22.3/src/plugins/grass/CMakeLists.txt qgis-3.22.3-new/src/plugins/grass/CMakeLists.txt --- qgis-3.22.3/src/plugins/grass/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/src/plugins/grass/CMakeLists.txt 2022-01-31 11:15:16.004964676 +0100 ++++ qgis-3.22.3-new/src/plugins/grass/CMakeLists.txt 2022-02-02 16:38:09.789109361 +0100 @@ -251,7 +251,7 @@ if(NOT WIN32) install(DIRECTORY qtermwidget/color-schemes/ DESTINATION "${COLORSCHEMES_DIR}" FILES_MATCHING PATTERN "*.*schem*") endif() @@ -28,9 +60,9 @@ diff -rupN qgis-3.22.3/src/plugins/grass/CMakeLists.txt qgis-3.22.3-new/src/plug if(GRASS_FOUND${GRASS_BUILD_VERSION}) add_subdirectory(${GRASS_BUILD_VERSION}) endif() -diff -rupN qgis-3.22.3/src/providers/CMakeLists.txt qgis-3.22.3-new/src/providers/CMakeLists.txt +diff -rupN --no-dereference qgis-3.22.3/src/providers/CMakeLists.txt qgis-3.22.3-new/src/providers/CMakeLists.txt --- qgis-3.22.3/src/providers/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/src/providers/CMakeLists.txt 2022-01-31 13:10:28.744968199 +0100 ++++ qgis-3.22.3-new/src/providers/CMakeLists.txt 2022-02-02 16:38:09.789109361 +0100 @@ -40,7 +40,7 @@ if (NOT FORCE_STATIC_LIBS) add_subdirectory(pdal) endif() @@ -40,9 +72,9 @@ diff -rupN qgis-3.22.3/src/providers/CMakeLists.txt qgis-3.22.3-new/src/provider add_subdirectory(grass) endif() endif() -diff -rupN qgis-3.22.3/src/providers/grass/8/CMakeLists.txt qgis-3.22.3-new/src/providers/grass/8/CMakeLists.txt +diff -rupN --no-dereference qgis-3.22.3/src/providers/grass/8/CMakeLists.txt qgis-3.22.3-new/src/providers/grass/8/CMakeLists.txt --- qgis-3.22.3/src/providers/grass/8/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ qgis-3.22.3-new/src/providers/grass/8/CMakeLists.txt 2022-01-31 11:17:08.383998695 +0100 ++++ qgis-3.22.3-new/src/providers/grass/8/CMakeLists.txt 2022-02-02 16:38:09.790109363 +0100 @@ -0,0 +1,7 @@ +include_directories( SYSTEM + ${GRASS_INCLUDE_DIR8} @@ -51,9 +83,9 @@ diff -rupN qgis-3.22.3/src/providers/grass/8/CMakeLists.txt qgis-3.22.3-new/src/ + ${CMAKE_CURRENT_BINARY_DIR} +) +ADD_GRASSLIB(8) -diff -rupN qgis-3.22.3/src/providers/grass/CMakeLists.txt qgis-3.22.3-new/src/providers/grass/CMakeLists.txt +diff -rupN --no-dereference qgis-3.22.3/src/providers/grass/CMakeLists.txt qgis-3.22.3-new/src/providers/grass/CMakeLists.txt --- qgis-3.22.3/src/providers/grass/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/src/providers/grass/CMakeLists.txt 2022-01-31 11:16:03.288388160 +0100 ++++ qgis-3.22.3-new/src/providers/grass/CMakeLists.txt 2022-02-02 16:38:09.790109363 +0100 @@ -319,7 +319,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION) ) endmacro(ADD_GRASSLIB) @@ -63,15 +95,15 @@ diff -rupN qgis-3.22.3/src/providers/grass/CMakeLists.txt qgis-3.22.3-new/src/pr if(GRASS_FOUND${GRASS_BUILD_VERSION}) add_subdirectory(${GRASS_BUILD_VERSION}) endif() -diff -rupN qgis-3.22.3/tests/src/providers/grass/8/CMakeLists.txt qgis-3.22.3-new/tests/src/providers/grass/8/CMakeLists.txt +diff -rupN --no-dereference qgis-3.22.3/tests/src/providers/grass/8/CMakeLists.txt qgis-3.22.3-new/tests/src/providers/grass/8/CMakeLists.txt --- qgis-3.22.3/tests/src/providers/grass/8/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ qgis-3.22.3-new/tests/src/providers/grass/8/CMakeLists.txt 2022-01-31 11:17:32.954911877 +0100 ++++ qgis-3.22.3-new/tests/src/providers/grass/8/CMakeLists.txt 2022-02-02 16:38:09.790109363 +0100 @@ -0,0 +1,2 @@ +include_directories(${GRASS_INCLUDE_DIR8} ${CMAKE_CURRENT_BINARY_DIR}) +ADD_QGIS_GRASS_TESTS(8) -diff -rupN qgis-3.22.3/tests/src/providers/grass/CMakeLists.txt qgis-3.22.3-new/tests/src/providers/grass/CMakeLists.txt +diff -rupN --no-dereference qgis-3.22.3/tests/src/providers/grass/CMakeLists.txt qgis-3.22.3-new/tests/src/providers/grass/CMakeLists.txt --- qgis-3.22.3/tests/src/providers/grass/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/tests/src/providers/grass/CMakeLists.txt 2022-01-31 11:16:21.406143949 +0100 ++++ qgis-3.22.3-new/tests/src/providers/grass/CMakeLists.txt 2022-02-02 16:38:09.790109363 +0100 @@ -86,8 +86,8 @@ macro (ADD_QGIS_GRASS_TESTS version) endif() endmacro (ADD_QGIS_GRASS_TESTS) diff --git a/qgis.spec b/qgis.spec index 8b9e0b9..948dc65 100644 --- a/qgis.spec +++ b/qgis.spec @@ -5,7 +5,7 @@ Name: qgis Version: 3.22.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -293,6 +293,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Wed Feb 02 2022 Sandro Mani - 3.22.3-4 +- Update qgis-grass8.patch + * Sun Jan 30 2022 Sandro Mani - 3.22.3-3 - Rebuild (grass) From 115e2008ceee0ebcba88dcbe8580eca514f6f08d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 7 Feb 2022 10:04:42 +0100 Subject: [PATCH 070/201] Workaround linking against libgrass_imagery.8.0.so --- qgis.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 948dc65..2b4fd44 100644 --- a/qgis.spec +++ b/qgis.spec @@ -3,9 +3,10 @@ #TODO: Run test suite (see debian/rules) +# FIXME Investigate and attempt to drop FIXME in %%build Name: qgis Version: 3.22.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -176,6 +177,11 @@ gzip ChangeLog -D WITH_SERVER:BOOL=TRUE \ -D WITH_3D:BOOL=TRUE \ -D WITH_QSPATIALITE:BOOL=TRUE +# FIXME +# No idea why libgrass_imagery appears as -lgrass_imagery and not as %%{_libdir}/grass/lib/libgrass_imagery.8.0.so +# like all other grass libs... But it results in a Requires on libgrass_imagery.so rather than libgrass_imagery.8.0.so +# and the former is not provided by grass-libs, hence results in broken dependencies... +find %{_vpath_builddir} -type f -name link.txt -exec sed -i 's|-lgrass_imagery|%{_libdir}/grass80/lib/libgrass_imagery.8.0.so|' {} \; %cmake_build @@ -293,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Feb 07 2022 Sandro Mani - 3.22.3-5 +- Workaround linking against libgrass_imagery.8.0.so + * Wed Feb 02 2022 Sandro Mani - 3.22.3-4 - Update qgis-grass8.patch From ed9640bcde7b62f546fdb00bdacd26b87398bcb8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 9 Feb 2022 09:16:34 +0100 Subject: [PATCH 071/201] Drop common image raster formats from qgis-mime.xml --- qgis-mime.xml | 52 --------------------------------------------------- qgis.spec | 5 ++++- 2 files changed, 4 insertions(+), 53 deletions(-) diff --git a/qgis-mime.xml b/qgis-mime.xml index 40c8301..8d2e214 100644 --- a/qgis-mime.xml +++ b/qgis-mime.xml @@ -103,58 +103,6 @@ - - TIFF raster data - TIFF-Rasterdaten - - - - - - - - - - - - - - - JPEG raster data - JPEG-Rasterdaten - - - - - - - - - - JPEG2000 raster data - JPEG2000-Rasterdaten - - - - - - - - - - - - - - - - - - - - - - AIG raster data AIG-Rasterdaten diff --git a/qgis.spec b/qgis.spec index 2b4fd44..828c3ba 100644 --- a/qgis.spec +++ b/qgis.spec @@ -6,7 +6,7 @@ # FIXME Investigate and attempt to drop FIXME in %%build Name: qgis Version: 3.22.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Wed Feb 09 2022 Sandro Mani - 3.22.3-6 +- Drop common image raster formats from qgis-mime.xml + * Mon Feb 07 2022 Sandro Mani - 3.22.3-5 - Workaround linking against libgrass_imagery.8.0.so From 84f47c42e53787045704ccd57c113884a7f823e7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 19 Feb 2022 18:11:05 +0100 Subject: [PATCH 072/201] Update to 3.24.0 --- .gitignore | 5 ++ qgis-grass8.patch | 117 ---------------------------------------- qgis-lib64.patch | 6 +-- qgis-serverprefix.patch | 8 +-- qgis.spec | 41 ++++++++------ sources | 6 ++- 6 files changed, 42 insertions(+), 141 deletions(-) delete mode 100644 qgis-grass8.patch diff --git a/.gitignore b/.gitignore index 3d6031e..c90b967 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,8 @@ qgis_1.5.0.tar.gz /qgis-3.22.1.tar.bz2 /qgis-3.22.2.tar.bz2 /qgis-3.22.3.tar.bz2 +/qgis-3.24.0-vendor-licenses.txt +/qgis-3.24.0-vendor.tar.xz +/qgis-3.24.0.tar.bz2 +/qgis-yarn-offline.patch +/prepare_vendor.sh diff --git a/qgis-grass8.patch b/qgis-grass8.patch deleted file mode 100644 index d533e80..0000000 --- a/qgis-grass8.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -rupN --no-dereference qgis-3.22.3/CMakeLists.txt qgis-3.22.3-new/CMakeLists.txt ---- qgis-3.22.3/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/CMakeLists.txt 2022-02-02 16:38:09.789109361 +0100 -@@ -121,7 +121,7 @@ mark_as_advanced(WITH_CORE) - if(WITH_CORE) - # Only GRASS 7 is currently supported but we keep dual version support in cmake for possible future switch to GRASS 8. - # Try to configure and build GRASS plugin by default -- foreach (GRASS_SEARCH_VERSION 7) -+ foreach (GRASS_SEARCH_VERSION 7 8) - # Legacy note: - # For GRASS 6 there were used cached variables without version suffix so that existing caches didn't have to be reconfigured. - # Cached variables were: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7 -diff -rupN --no-dereference qgis-3.22.3/python/plugins/grassprovider/Grass7Utils.py qgis-3.22.3-new/python/plugins/grassprovider/Grass7Utils.py ---- qgis-3.22.3/python/plugins/grassprovider/Grass7Utils.py 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/python/plugins/grassprovider/Grass7Utils.py 2022-02-02 16:38:09.790109363 +0100 -@@ -127,7 +127,7 @@ class Grass7Utils: - for line in lines: - if "GRASS GIS " in line: - line = line.split(" ")[-1].strip() -- if line.startswith("7."): -+ if line.startswith("7.") or line.startswith("8."): - Grass7Utils.version = line - return Grass7Utils.version - except Exception: -@@ -174,8 +174,8 @@ class Grass7Utils: - ] - else: - cmdList = [ -- "grass78", "grass76", "grass74", "grass72", "grass70", "grass", -- "grass78.sh", "grass76.sh", "grass74.sh", "grass72.sh", "grass70.sh", "grass.sh" -+ "grass80", "grass78", "grass76", "grass74", "grass72", "grass70", "grass", -+ "grass80.sh", "grass78.sh", "grass76.sh", "grass74.sh", "grass72.sh", "grass70.sh", "grass.sh" - ] - - # For MS-Windows there is a difference between GRASS Path and GRASS binary -@@ -235,7 +235,7 @@ class Grass7Utils: - folder = os.environ["GISBASE"] - else: - # Find grass folder if it exists inside QGIS bundle -- for version in ['', '7', '78', '76', '74', '72', '71', '70']: -+ for version in ['', '8', '7', '80', '78', '76', '74', '72', '71', '70']: - testfolder = os.path.join(str(QgsApplication.prefixPath()), - 'grass{}'.format(version)) - if os.path.isdir(testfolder): -diff -rupN --no-dereference qgis-3.22.3/src/plugins/grass/8/CMakeLists.txt qgis-3.22.3-new/src/plugins/grass/8/CMakeLists.txt ---- qgis-3.22.3/src/plugins/grass/8/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ qgis-3.22.3-new/src/plugins/grass/8/CMakeLists.txt 2022-02-02 16:38:09.789109361 +0100 -@@ -0,0 +1,2 @@ -+include_directories(${GRASS_INCLUDE_DIR8} ${CMAKE_CURRENT_BINARY_DIR}) -+ADD_GRASSPLUGIN(8) -diff -rupN --no-dereference qgis-3.22.3/src/plugins/grass/CMakeLists.txt qgis-3.22.3-new/src/plugins/grass/CMakeLists.txt ---- qgis-3.22.3/src/plugins/grass/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/src/plugins/grass/CMakeLists.txt 2022-02-02 16:38:09.789109361 +0100 -@@ -251,7 +251,7 @@ if(NOT WIN32) - install(DIRECTORY qtermwidget/color-schemes/ DESTINATION "${COLORSCHEMES_DIR}" FILES_MATCHING PATTERN "*.*schem*") - endif() - --foreach(GRASS_BUILD_VERSION 6 7) # GRASS 6 and GRASS 7 -+foreach(GRASS_BUILD_VERSION 6 7 8) # GRASS 6 and GRASS 7 - if(GRASS_FOUND${GRASS_BUILD_VERSION}) - add_subdirectory(${GRASS_BUILD_VERSION}) - endif() -diff -rupN --no-dereference qgis-3.22.3/src/providers/CMakeLists.txt qgis-3.22.3-new/src/providers/CMakeLists.txt ---- qgis-3.22.3/src/providers/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/src/providers/CMakeLists.txt 2022-02-02 16:38:09.789109361 +0100 -@@ -40,7 +40,7 @@ if (NOT FORCE_STATIC_LIBS) - add_subdirectory(pdal) - endif() - -- if (WITH_GRASS OR WITH_GRASS7) -+ if (WITH_GRASS OR WITH_GRASS7 OR WITH_GRASS8) - add_subdirectory(grass) - endif() - endif() -diff -rupN --no-dereference qgis-3.22.3/src/providers/grass/8/CMakeLists.txt qgis-3.22.3-new/src/providers/grass/8/CMakeLists.txt ---- qgis-3.22.3/src/providers/grass/8/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ qgis-3.22.3-new/src/providers/grass/8/CMakeLists.txt 2022-02-02 16:38:09.790109363 +0100 -@@ -0,0 +1,7 @@ -+include_directories( SYSTEM -+ ${GRASS_INCLUDE_DIR8} -+) -+include_directories( -+ ${CMAKE_CURRENT_BINARY_DIR} -+) -+ADD_GRASSLIB(8) -diff -rupN --no-dereference qgis-3.22.3/src/providers/grass/CMakeLists.txt qgis-3.22.3-new/src/providers/grass/CMakeLists.txt ---- qgis-3.22.3/src/providers/grass/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/src/providers/grass/CMakeLists.txt 2022-02-02 16:38:09.790109363 +0100 -@@ -319,7 +319,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION) - ) - endmacro(ADD_GRASSLIB) - --foreach(GRASS_BUILD_VERSION 6 7) # GRASS 6 and GRASS 7 -+foreach(GRASS_BUILD_VERSION 6 7 8) # GRASS 6 and GRASS 7 - if(GRASS_FOUND${GRASS_BUILD_VERSION}) - add_subdirectory(${GRASS_BUILD_VERSION}) - endif() -diff -rupN --no-dereference qgis-3.22.3/tests/src/providers/grass/8/CMakeLists.txt qgis-3.22.3-new/tests/src/providers/grass/8/CMakeLists.txt ---- qgis-3.22.3/tests/src/providers/grass/8/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ qgis-3.22.3-new/tests/src/providers/grass/8/CMakeLists.txt 2022-02-02 16:38:09.790109363 +0100 -@@ -0,0 +1,2 @@ -+include_directories(${GRASS_INCLUDE_DIR8} ${CMAKE_CURRENT_BINARY_DIR}) -+ADD_QGIS_GRASS_TESTS(8) -diff -rupN --no-dereference qgis-3.22.3/tests/src/providers/grass/CMakeLists.txt qgis-3.22.3-new/tests/src/providers/grass/CMakeLists.txt ---- qgis-3.22.3/tests/src/providers/grass/CMakeLists.txt 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/tests/src/providers/grass/CMakeLists.txt 2022-02-02 16:38:09.790109363 +0100 -@@ -86,8 +86,8 @@ macro (ADD_QGIS_GRASS_TESTS version) - endif() - endmacro (ADD_QGIS_GRASS_TESTS) - --foreach(GRASS_BUILD_VERSION 6 7) -+foreach(GRASS_BUILD_VERSION 6 7 8) - if(GRASS_FOUND${GRASS_BUILD_VERSION}) - add_subdirectory(${GRASS_BUILD_VERSION}) - endif() --endforeach(GRASS_BUILD_VERSION 6 7) -+endforeach(GRASS_BUILD_VERSION 6 7 8) diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 61ab608..c826a50 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.22.3/cmake/PyQtMacros.cmake qgis-3.22.3-new/cmake/PyQtMacros.cmake ---- qgis-3.22.3/cmake/PyQtMacros.cmake 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/cmake/PyQtMacros.cmake 2022-01-18 11:03:45.886207810 +0100 +diff -rupN --no-dereference qgis-3.24.0/cmake/PyQtMacros.cmake qgis-3.24.0-new/cmake/PyQtMacros.cmake +--- qgis-3.24.0/cmake/PyQtMacros.cmake 2022-02-18 13:06:10.000000000 +0100 ++++ qgis-3.24.0-new/cmake/PyQtMacros.cmake 2022-02-18 23:20:27.196771140 +0100 @@ -34,7 +34,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE() # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 4eb48b6..af7215c 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.22.3/src/core/qgsapplication.cpp qgis-3.22.3-new/src/core/qgsapplication.cpp ---- qgis-3.22.3/src/core/qgsapplication.cpp 2022-01-14 13:06:34.000000000 +0100 -+++ qgis-3.22.3-new/src/core/qgsapplication.cpp 2022-01-18 11:03:48.005209176 +0100 -@@ -351,6 +351,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.24.0/src/core/qgsapplication.cpp qgis-3.24.0-new/src/core/qgsapplication.cpp +--- qgis-3.24.0/src/core/qgsapplication.cpp 2022-02-18 13:06:10.000000000 +0100 ++++ qgis-3.24.0-new/src/core/qgsapplication.cpp 2022-02-18 23:20:29.290818540 +0100 +@@ -352,6 +352,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis.spec b/qgis.spec index 828c3ba..ecc0888 100644 --- a/qgis.spec +++ b/qgis.spec @@ -5,17 +5,21 @@ # FIXME Investigate and attempt to drop FIXME in %%build Name: qgis -Version: 3.22.3 -Release: 6%{?dist} +Version: 3.24.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 -License: GPLv3+ with exceptions +# QGIS license the bundled JS code (see %%{name}-%%{version}-vendor-licenses.txt) +License: (GPLv3+ with exceptions) and (MIT and ISC and BSD and ASL 2.0 and CC-BY and Python and MPLv2.0) URL: http://www.qgis.org Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 +# ./prepare_vendor.sh +Source1: %{name}-%{version}-vendor.tar.xz +Source2: %{name}-%{version}-vendor-licenses.txt # Sample configuration files for QGIS server -Source2: %{name}-server-httpd.conf +Source3: %{name}-server-httpd.conf Source4: %{name}-server-README.fedora # MIME definitions # Based on debian/qgis.xml but excluding already defined or proprietary types @@ -27,8 +31,8 @@ Source5: %{name}-mime.xml Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation Patch1: %{name}-serverprefix.patch -# Also look for grass8 -Patch2: %{name}-grass8.patch +# Pass --offline to yarn, plus replace deprecated md4 with sha256 in webpack sources +Patch2: %{name}-yarn-offline.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -73,6 +77,7 @@ BuildRequires: qwt-qt5-devel BuildRequires: spatialindex-devel BuildRequires: sqlite-devel BuildRequires: libzstd-devel +BuildRequires: yarnpkg # Enable for tests #BuildRequires: xorg-x11-server-Xvfb @@ -148,15 +153,14 @@ Please refer to %{name}-server-README.fedora for details! %prep -%autosetup -p1 +%autosetup -p1 -a1 + +# %%{name}-%%{version}-vendor-licenses.txt +cp -a %{SOURCE2} . # Readme file for QGIS server configuration and Lighttpd example install -pm0644 %{SOURCE4} . -# Disable landingpage, it ships precompiled js -rm -rf resources/server/api/ogc/static/landingpage/ -sed -i 's|add_subdirectory(landingpage)|#add_subdirectory(landingpage)|' src/server/services/CMakeLists.txt - gzip ChangeLog @@ -176,12 +180,14 @@ gzip ChangeLog -D WITH_QWTPOLAR:BOOL=TRUE \ -D WITH_SERVER:BOOL=TRUE \ -D WITH_3D:BOOL=TRUE \ - -D WITH_QSPATIALITE:BOOL=TRUE + -D WITH_QSPATIALITE:BOOL=TRUE \ + -D WITH_SERVER_LANDINGPAGE_WEBAPP=ON # FIXME # No idea why libgrass_imagery appears as -lgrass_imagery and not as %%{_libdir}/grass/lib/libgrass_imagery.8.0.so # like all other grass libs... But it results in a Requires on libgrass_imagery.so rather than libgrass_imagery.8.0.so # and the former is not provided by grass-libs, hence results in broken dependencies... find %{_vpath_builddir} -type f -name link.txt -exec sed -i 's|-lgrass_imagery|%{_libdir}/grass80/lib/libgrass_imagery.8.0.so|' {} \; +export YARN_CACHE_FOLDER="$PWD/.package-cache" %cmake_build @@ -205,7 +211,7 @@ install -pm0644 images/icons/%{name}-mime-icon.png %{buildroot}%{_datadir}/pixma # Install basic QGIS Mapserver configuration for Apache install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d -install -pm0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-server.conf +install -pm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-server.conf # See qgis-server-README.fedora rm -f %{buildroot}%{_libexecdir}/%{name}/wms_metadata.xml @@ -228,7 +234,7 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %files -f %{name}.lang -%license COPYING +%license COPYING %{name}-%{version}-vendor-licenses.txt %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/ @@ -257,7 +263,7 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %{_datadir}/%{name}/resources/ %{_datadir}/%{name}/svg/ %exclude %{_libdir}/libqgisgrass*.so.* -%exclude %{_libdir}/%{name}/plugins/libgrassplugin*.so +%exclude %{_libdir}/%{name}/plugins/libplugin_grass8.so %exclude %{_libdir}/%{name}/plugins/libprovider_grass8.so %exclude %{_libdir}/%{name}/plugins/libprovider_grassraster8.so %exclude %{_libdir}/%{name}/server/ @@ -272,7 +278,7 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %files grass %{_libdir}/lib%{name}grass*.so.* -%{_libdir}/%{name}/plugins/libgrassplugin*.so +%{_libdir}/%{name}/plugins/libplugin_grass8.so %{_libdir}/%{name}/plugins/libprovider_grass8.so %{_libdir}/%{name}/plugins/libprovider_grassraster8.so %{_libdir}/%{name}/grass/ @@ -299,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Feb 18 2022 Sandro Mani - 3.24.0-1 +- Update to 3.24.0 + * Wed Feb 09 2022 Sandro Mani - 3.22.3-6 - Drop common image raster formats from qgis-mime.xml diff --git a/sources b/sources index 6f41684..b7b8f78 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ -SHA512 (qgis-3.22.3.tar.bz2) = 8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28 +SHA512 (qgis-3.24.0-vendor-licenses.txt) = c0cfa8d343d7ebc1f9555ca993fabe39316228eed85b887298ea451e9925ab5fe44a2b3e6411f2a9a852b4c5fad84e2f4f6f82b8dfe2b4371b145c2366398896 +SHA512 (qgis-3.24.0-vendor.tar.xz) = 8eaaf855f6692fd8f897b03c3dcd4340b1cb82b0c30aa54b4b0c5ef67b44ce867e3e855373a37e8d161e67638d6e4eddf55120ca40002e59191db07cffd25b58 +SHA512 (qgis-3.24.0.tar.bz2) = c804c6464251a88eb0c481465de5f061b532326aab763555caaaf79844401d114f898dee3079e8f67392631ca8149b6bc900d8dc9dc950d681294d7d7814c50a +SHA512 (qgis-yarn-offline.patch) = 3d4d30053f676e75aa31511449a5861d9968d7452617894c31d032bbb81c6771d3f2819eedab5682bdfc080f351f5ade2705341a53063fce34eb280c008d9e25 +SHA512 (prepare_vendor.sh) = 186f246c0be6e3c0d221ca038d7db07c5afcab665f518aad332586481e3bfb0a9b458f9d16b9938682f3a28325eaabd72e76589d1f1010d16072a6801881370b From 00a36778146cf5c7a27665d0bb9581d67b8f6e28 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 19 Feb 2022 18:19:54 +0100 Subject: [PATCH 073/201] Fix files accidentally uploaded as sources --- .gitignore | 3 - prepare_vendor.sh | 102 ++++++++++++++++++++++++++++++++ qgis-3.24.0-vendor-licenses.txt | 26 ++++++++ qgis-yarn-offline.patch | 12 ++++ sources | 5 +- 5 files changed, 141 insertions(+), 7 deletions(-) create mode 100755 prepare_vendor.sh create mode 100644 qgis-3.24.0-vendor-licenses.txt create mode 100644 qgis-yarn-offline.patch diff --git a/.gitignore b/.gitignore index c90b967..fd0bc53 100644 --- a/.gitignore +++ b/.gitignore @@ -70,8 +70,5 @@ qgis_1.5.0.tar.gz /qgis-3.22.1.tar.bz2 /qgis-3.22.2.tar.bz2 /qgis-3.22.3.tar.bz2 -/qgis-3.24.0-vendor-licenses.txt /qgis-3.24.0-vendor.tar.xz /qgis-3.24.0.tar.bz2 -/qgis-yarn-offline.patch -/prepare_vendor.sh diff --git a/prepare_vendor.sh b/prepare_vendor.sh new file mode 100755 index 0000000..89ad343 --- /dev/null +++ b/prepare_vendor.sh @@ -0,0 +1,102 @@ +#!/bin/bash + +PKG_URL=$(spectool *.spec --source 0 | sed -e 's/Source0:[ ]*//g') +PKG_TARBALL=$(basename $PKG_URL) +PKG_NAME=$(rpmspec -q --queryformat="%{NAME}" *.spec --srpm) +PKG_VERSION=$(rpmspec -q --queryformat="%{VERSION}" *.spec --srpm) +PKG_SRCDIR="${PKG_NAME}-${PKG_VERSION}" +PKG_DIR="$(pwd)" +PKG_TMPDIR=$(mktemp --tmpdir -d ${PKG_NAME}-XXXXXXXX) +PKG_PATH="$PKG_TMPDIR/$PKG_SRCDIR/resources/server/src/landingpage/" + +echo "URL: $PKG_URL" +echo "TARBALL: $PKG_TARBALL" +echo "NAME: $PKG_NAME" +echo "VERSION: $PKG_VERSION" +echo "PATH: $PKG_PATH" + +cleanup_tmpdir() { + popd 2>/dev/null + rm -rf $PKG_TMPDIR +} +trap cleanup_tmpdir SIGINT + +cleanup_and_exit() { + cleanup_tmpdir + if test "$1" = 0 -o -z "$1" ; then + exit 0 + else + exit $1 + fi +} + +if [ ! -w "$PKG_TARBALL" ]; then + wget "$PKG_URL" +fi + + +mkdir -p $PKG_TMPDIR +tar -xf $PKG_TARBALL -C $PKG_TMPDIR + + +pushd $PKG_PATH + +export YARN_CACHE_FOLDER="$(pwd)/.package-cache" +echo ">>>>>> Install npm modules" +yarn install --frozen-lockfile +if [ $? -ne 0 ]; then + echo "ERROR: yarn install failed" + cleanup_and_exit 1 +fi + +echo ">>>>>> Cleanup object dirs" +find node_modules/ -type d -name "*.o.d" | xargs rm -rf +find node_modules/ -type d -name "__pycache__" | xargs rm -rf + + +echo ">>>>>> Cleanup object files" +find node_modules/ -name "*.node" | xargs rm -rf + +find node_modules/ -name "*.dll" | grep -v signal-client | xargs rm -f +find node_modules/ -name "*.dylib" -delete +find node_modules/ -name "*.so" -delete +find node_modules/ -name "*.o" -delete +find node_modules/ -name "*.a" -delete +find node_modules/ -name "*.snyk-*.flag" -delete + +echo ">>>>>> Cleanup build info" +find node_modules/ -name "builderror.log" -delete +find node_modules/ -name "yarn-error.log" -delete +find node_modules/ -name "yarn.lock" -delete +find node_modules/ -name ".deps" -type d | xargs rm -rf +find node_modules/ -name "Makefile" -delete +find node_modules/ -name "*.target.mk" -delete +find node_modules/ -name "config.gypi" -delete +find node_modules/ -name "package.json" -exec sed -i "s#$PKG_PATH#/tmp#g" {} \; + +echo ">>>>>> Cleanup yarn taballs" +find node_modules/ -name ".yarn-tarball.tgz" -delete + +echo ">>>>>> Cleanup source maps" +find node_modules/ -name "*.js.map" -delete +find node_modules/ -name "*.ts.map" -delete +find node_modules/ -name "*.mjs.map" -delete +find node_modules/ -name "*.cjs.map" -delete +find node_modules/ -name "*.css.map" -delete +find node_modules/ -name "*.min.map" -delete + +echo ">>>>>> Package vendor files" +rm -f $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz +XZ_OPT="-T$(nproc)" tar cJf $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz .package-cache +if [ $? -ne 0 ]; then + cleanup_and_exit 1 +fi + +yarn add license-checker +yarn license-checker --summary | sed "s#$PKG_PATH#/tmp#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt + + +popd + +rm -rf .package-cache +cleanup_and_exit 0 diff --git a/qgis-3.24.0-vendor-licenses.txt b/qgis-3.24.0-vendor-licenses.txt new file mode 100644 index 0000000..04ef743 --- /dev/null +++ b/qgis-3.24.0-vendor-licenses.txt @@ -0,0 +1,26 @@ +yarn run v1.22.17 +$ /tmpnode_modules/.bin/license-checker --summary +├─ MIT: 1081 +├─ ISC: 74 +├─ BSD-3-Clause: 33 +├─ BSD-2-Clause: 28 +├─ Apache-2.0: 22 +├─ (MIT OR CC0-1.0): 4 +├─ MIT*: 3 +├─ Unlicense: 3 +├─ (MIT OR Apache-2.0): 2 +├─ CC0-1.0: 2 +├─ (MIT AND CC-BY-3.0): 2 +├─ 0BSD: 2 +├─ UNLICENSED: 1 +├─ Python-2.0: 1 +├─ CC-BY-4.0: 1 +├─ BSD*: 1 +├─ (BSD-3-Clause OR GPL-2.0): 1 +├─ (WTFPL OR MIT): 1 +├─ MIT,Apache2: 1 +├─ (MIT AND BSD-3-Clause): 1 +├─ CC-BY-3.0: 1 +└─ MPL-2.0: 1 + +Done in 2.88s. diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch new file mode 100644 index 0000000..5bb98c8 --- /dev/null +++ b/qgis-yarn-offline.patch @@ -0,0 +1,12 @@ +diff -rupN qgis-3.24.0/resources/CMakeLists.txt qgis-3.24.0-new/resources/CMakeLists.txt +--- qgis-3.24.0/resources/CMakeLists.txt 2022-02-18 13:06:10.000000000 +0100 ++++ qgis-3.24.0-new/resources/CMakeLists.txt 2022-02-19 00:06:09.313878739 +0100 +@@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) + ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ + ${LANDINGPAGE_OUTPUT_PATH}/ + COMMAND ${CMAKE_COMMAND} -E touch ${LANDINGPAGE_OUTPUT_PATH}/landingpage.stamp +- COMMAND cd ${LANDINGPAGE_OUTPUT_PATH} && ${YARN} install --frozen-lockfile && ${YARN} build ++ COMMAND cd ${LANDINGPAGE_OUTPUT_PATH} && ${YARN} install --frozen-lockfile --offline && find node_modules -type f -exec sed -i 's|md4|sha256|g' {} \\\\; && ${YARN} build + ) + endif() + diff --git a/sources b/sources index b7b8f78..3821b6d 100644 --- a/sources +++ b/sources @@ -1,5 +1,2 @@ -SHA512 (qgis-3.24.0-vendor-licenses.txt) = c0cfa8d343d7ebc1f9555ca993fabe39316228eed85b887298ea451e9925ab5fe44a2b3e6411f2a9a852b4c5fad84e2f4f6f82b8dfe2b4371b145c2366398896 -SHA512 (qgis-3.24.0-vendor.tar.xz) = 8eaaf855f6692fd8f897b03c3dcd4340b1cb82b0c30aa54b4b0c5ef67b44ce867e3e855373a37e8d161e67638d6e4eddf55120ca40002e59191db07cffd25b58 SHA512 (qgis-3.24.0.tar.bz2) = c804c6464251a88eb0c481465de5f061b532326aab763555caaaf79844401d114f898dee3079e8f67392631ca8149b6bc900d8dc9dc950d681294d7d7814c50a -SHA512 (qgis-yarn-offline.patch) = 3d4d30053f676e75aa31511449a5861d9968d7452617894c31d032bbb81c6771d3f2819eedab5682bdfc080f351f5ade2705341a53063fce34eb280c008d9e25 -SHA512 (prepare_vendor.sh) = 186f246c0be6e3c0d221ca038d7db07c5afcab665f518aad332586481e3bfb0a9b458f9d16b9938682f3a28325eaabd72e76589d1f1010d16072a6801881370b +SHA512 (qgis-3.24.0-vendor.tar.xz) = 8eaaf855f6692fd8f897b03c3dcd4340b1cb82b0c30aa54b4b0c5ef67b44ce867e3e855373a37e8d161e67638d6e4eddf55120ca40002e59191db07cffd25b58 From fb4669d625ae42051b62319a6464292f1517f77d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 8 Mar 2022 08:55:46 +0100 Subject: [PATCH 074/201] Rebuild (qt5) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index ecc0888..c3d1949 100644 --- a/qgis.spec +++ b/qgis.spec @@ -6,7 +6,7 @@ # FIXME Investigate and attempt to drop FIXME in %%build Name: qgis Version: 3.24.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Mar 08 2022 Jan Grulich - 3.24.0-2 +- Rebuild (qt5) + * Fri Feb 18 2022 Sandro Mani - 3.24.0-1 - Update to 3.24.0 From 172ec90d8e0ea0768f2624d48b650f16f983c17e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 10 Mar 2022 21:53:47 +0100 Subject: [PATCH 075/201] Rebuild for proj-9.0.0 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index c3d1949..f764dba 100644 --- a/qgis.spec +++ b/qgis.spec @@ -6,7 +6,7 @@ # FIXME Investigate and attempt to drop FIXME in %%build Name: qgis Version: 3.24.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Thu Mar 03 2022 Sandro Mani - 3.24.0-3 +- Rebuild for proj-9.0.0 + * Tue Mar 08 2022 Jan Grulich - 3.24.0-2 - Rebuild (qt5) From 047b3af9ce7d41204c2c7c7dbb59bfa2e10f30bc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 21 Mar 2022 10:41:08 +0100 Subject: [PATCH 076/201] Update to 3.24.1 --- .gitignore | 2 ++ ...endor-licenses.txt => qgis-3.24.1-vendor-licenses.txt | 2 +- qgis-lib64.patch | 6 +++--- qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 9 ++++++--- sources | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) rename qgis-3.24.0-vendor-licenses.txt => qgis-3.24.1-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index fd0bc53..517e448 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,5 @@ qgis_1.5.0.tar.gz /qgis-3.22.3.tar.bz2 /qgis-3.24.0-vendor.tar.xz /qgis-3.24.0.tar.bz2 +/qgis-3.24.1.tar.bz2 +/qgis-3.24.1-vendor.tar.xz diff --git a/qgis-3.24.0-vendor-licenses.txt b/qgis-3.24.1-vendor-licenses.txt similarity index 97% rename from qgis-3.24.0-vendor-licenses.txt rename to qgis-3.24.1-vendor-licenses.txt index 04ef743..6bb40a7 100644 --- a/qgis-3.24.0-vendor-licenses.txt +++ b/qgis-3.24.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.88s. +Done in 2.85s. diff --git a/qgis-lib64.patch b/qgis-lib64.patch index c826a50..cc11c3b 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.24.0/cmake/PyQtMacros.cmake qgis-3.24.0-new/cmake/PyQtMacros.cmake ---- qgis-3.24.0/cmake/PyQtMacros.cmake 2022-02-18 13:06:10.000000000 +0100 -+++ qgis-3.24.0-new/cmake/PyQtMacros.cmake 2022-02-18 23:20:27.196771140 +0100 +diff -rupN --no-dereference qgis-3.24.1/cmake/PyQtMacros.cmake qgis-3.24.1-new/cmake/PyQtMacros.cmake +--- qgis-3.24.1/cmake/PyQtMacros.cmake 2022-03-18 13:04:18.000000000 +0100 ++++ qgis-3.24.1-new/cmake/PyQtMacros.cmake 2022-03-21 10:35:01.822267030 +0100 @@ -34,7 +34,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE() # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index af7215c..8502f90 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.24.0/src/core/qgsapplication.cpp qgis-3.24.0-new/src/core/qgsapplication.cpp ---- qgis-3.24.0/src/core/qgsapplication.cpp 2022-02-18 13:06:10.000000000 +0100 -+++ qgis-3.24.0-new/src/core/qgsapplication.cpp 2022-02-18 23:20:29.290818540 +0100 +diff -rupN --no-dereference qgis-3.24.1/src/core/qgsapplication.cpp qgis-3.24.1-new/src/core/qgsapplication.cpp +--- qgis-3.24.1/src/core/qgsapplication.cpp 2022-03-18 13:04:18.000000000 +0100 ++++ qgis-3.24.1-new/src/core/qgsapplication.cpp 2022-03-21 10:35:03.425289233 +0100 @@ -352,6 +352,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 5bb98c8..8f3871a 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN qgis-3.24.0/resources/CMakeLists.txt qgis-3.24.0-new/resources/CMakeLists.txt ---- qgis-3.24.0/resources/CMakeLists.txt 2022-02-18 13:06:10.000000000 +0100 -+++ qgis-3.24.0-new/resources/CMakeLists.txt 2022-02-19 00:06:09.313878739 +0100 +diff -rupN --no-dereference qgis-3.24.1/resources/CMakeLists.txt qgis-3.24.1-new/resources/CMakeLists.txt +--- qgis-3.24.1/resources/CMakeLists.txt 2022-03-18 13:04:18.000000000 +0100 ++++ qgis-3.24.1-new/resources/CMakeLists.txt 2022-03-21 10:35:05.025311325 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index f764dba..51d6bb1 100644 --- a/qgis.spec +++ b/qgis.spec @@ -5,8 +5,8 @@ # FIXME Investigate and attempt to drop FIXME in %%build Name: qgis -Version: 3.24.0 -Release: 3%{?dist} +Version: 3.24.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,7 +305,10 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog -* Thu Mar 03 2022 Sandro Mani - 3.24.0-3 +* Mon Mar 21 2022 Sandro Mani - 3.24.1-1 +- Update to 3.24.1 + +* Thu Mar 10 2022 Sandro Mani - 3.24.0-3 - Rebuild for proj-9.0.0 * Tue Mar 08 2022 Jan Grulich - 3.24.0-2 diff --git a/sources b/sources index 3821b6d..95395cc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.24.0.tar.bz2) = c804c6464251a88eb0c481465de5f061b532326aab763555caaaf79844401d114f898dee3079e8f67392631ca8149b6bc900d8dc9dc950d681294d7d7814c50a -SHA512 (qgis-3.24.0-vendor.tar.xz) = 8eaaf855f6692fd8f897b03c3dcd4340b1cb82b0c30aa54b4b0c5ef67b44ce867e3e855373a37e8d161e67638d6e4eddf55120ca40002e59191db07cffd25b58 +SHA512 (qgis-3.24.1.tar.bz2) = 5d259e1b028706357fb16e6f944d2997ed5c28951d8695229cd463d9f0759d0fa41ef14f7df53234419362f4737f0dfd7ce921dd58d4e8159405665433c64655 +SHA512 (qgis-3.24.1-vendor.tar.xz) = c8f7c85a683f2a6ce5ee7d21378243edd6fb13f38194ab38612b47adbd811d23bfd1e3e7232438dc30b72b3a959464e165a069801ee2fc5061032389e61153e1 From 0b4ac8c12f886ad874771a099a8b57a4fd24b65a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 16 Apr 2022 08:41:19 +0200 Subject: [PATCH 077/201] Update to 3.24.2 --- .gitignore | 2 ++ ....1-vendor-licenses.txt => qgis-3.24.2-vendor-licenses.txt | 2 +- qgis.spec | 5 ++++- sources | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) rename qgis-3.24.1-vendor-licenses.txt => qgis-3.24.2-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 517e448..b4b2f1f 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,5 @@ qgis_1.5.0.tar.gz /qgis-3.24.0.tar.bz2 /qgis-3.24.1.tar.bz2 /qgis-3.24.1-vendor.tar.xz +/qgis-3.24.2.tar.bz2 +/qgis-3.24.2-vendor.tar.xz diff --git a/qgis-3.24.1-vendor-licenses.txt b/qgis-3.24.2-vendor-licenses.txt similarity index 97% rename from qgis-3.24.1-vendor-licenses.txt rename to qgis-3.24.2-vendor-licenses.txt index 6bb40a7..6bf333f 100644 --- a/qgis-3.24.1-vendor-licenses.txt +++ b/qgis-3.24.2-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.85s. +Done in 2.62s. diff --git a/qgis.spec b/qgis.spec index 51d6bb1..5c39a84 100644 --- a/qgis.spec +++ b/qgis.spec @@ -5,7 +5,7 @@ # FIXME Investigate and attempt to drop FIXME in %%build Name: qgis -Version: 3.24.1 +Version: 3.24.2 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Apr 16 2022 Sandro Mani - 3.24.2-1 +- Update to 3.24.2 + * Mon Mar 21 2022 Sandro Mani - 3.24.1-1 - Update to 3.24.1 diff --git a/sources b/sources index 95395cc..8afac91 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.24.1.tar.bz2) = 5d259e1b028706357fb16e6f944d2997ed5c28951d8695229cd463d9f0759d0fa41ef14f7df53234419362f4737f0dfd7ce921dd58d4e8159405665433c64655 -SHA512 (qgis-3.24.1-vendor.tar.xz) = c8f7c85a683f2a6ce5ee7d21378243edd6fb13f38194ab38612b47adbd811d23bfd1e3e7232438dc30b72b3a959464e165a069801ee2fc5061032389e61153e1 +SHA512 (qgis-3.24.2.tar.bz2) = ad2df219de6e8a25b7b14a0ec09b3875d798937c7630e1a98cc1bc21b195317ab612f846f8ba6ad15d23d8885091e4bb844e49d05b05d34348ced937fa959b9e +SHA512 (qgis-3.24.2-vendor.tar.xz) = a0ec998878b4cffc4a33d5c00ff07a5d54442b21aa395159b396bec1ba2e2bfd3d7c8d3bf7c95e8bec1a908db23e3ba66c36e8ccbf62b49cfa28cbd68929e2ee From 75365312cd0794d89fe3e52b172c616a26b57de5 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 17 May 2022 13:07:05 +0200 Subject: [PATCH 078/201] Rebuild (qt5) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 5c39a84..24b5f53 100644 --- a/qgis.spec +++ b/qgis.spec @@ -6,7 +6,7 @@ # FIXME Investigate and attempt to drop FIXME in %%build Name: qgis Version: 3.24.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue May 17 2022 Jan Grulich - 3.24.2-2 +- Rebuild (qt5) + * Sat Apr 16 2022 Sandro Mani - 3.24.2-1 - Update to 3.24.2 From 18dbfcc7e16a214bd82a3b814dd5ee376e8dd5fa Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 May 2022 19:19:26 +0200 Subject: [PATCH 079/201] Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 24b5f53..ffb7965 100644 --- a/qgis.spec +++ b/qgis.spec @@ -6,7 +6,7 @@ # FIXME Investigate and attempt to drop FIXME in %%build Name: qgis Version: 3.24.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat May 21 2022 Sandro Mani - 3.24.2-3 +- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 + * Tue May 17 2022 Jan Grulich - 3.24.2-2 - Rebuild (qt5) From 5014e55042a4f625ac591f4a6a443e2f301528e3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 22 May 2022 16:28:30 +0200 Subject: [PATCH 080/201] Update to 3.24.3 --- .gitignore | 2 ++ ...ses.txt => qgis-3.24.3-vendor-licenses.txt | 4 ++-- qgis-lib64.patch | 6 ++--- qgis-serverprefix.patch | 8 +++---- qgis-yarn-offline.patch | 6 ++--- qgis.spec | 23 ++++++++++--------- sources | 4 ++-- 7 files changed, 28 insertions(+), 25 deletions(-) rename qgis-3.24.2-vendor-licenses.txt => qgis-3.24.3-vendor-licenses.txt (94%) diff --git a/.gitignore b/.gitignore index b4b2f1f..a1acd36 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,5 @@ qgis_1.5.0.tar.gz /qgis-3.24.1-vendor.tar.xz /qgis-3.24.2.tar.bz2 /qgis-3.24.2-vendor.tar.xz +/qgis-3.24.3-vendor.tar.xz +/qgis-3.24.3.tar.bz2 diff --git a/qgis-3.24.2-vendor-licenses.txt b/qgis-3.24.3-vendor-licenses.txt similarity index 94% rename from qgis-3.24.2-vendor-licenses.txt rename to qgis-3.24.3-vendor-licenses.txt index 6bf333f..28f1575 100644 --- a/qgis-3.24.2-vendor-licenses.txt +++ b/qgis-3.24.3-vendor-licenses.txt @@ -1,7 +1,7 @@ yarn run v1.22.17 $ /tmpnode_modules/.bin/license-checker --summary ├─ MIT: 1081 -├─ ISC: 74 +├─ ISC: 76 ├─ BSD-3-Clause: 33 ├─ BSD-2-Clause: 28 ├─ Apache-2.0: 22 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.62s. +Done in 2.73s. diff --git a/qgis-lib64.patch b/qgis-lib64.patch index cc11c3b..0e25420 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.24.1/cmake/PyQtMacros.cmake qgis-3.24.1-new/cmake/PyQtMacros.cmake ---- qgis-3.24.1/cmake/PyQtMacros.cmake 2022-03-18 13:04:18.000000000 +0100 -+++ qgis-3.24.1-new/cmake/PyQtMacros.cmake 2022-03-21 10:35:01.822267030 +0100 +diff -rupN --no-dereference qgis-3.24.3/cmake/PyQtMacros.cmake qgis-3.24.3-new/cmake/PyQtMacros.cmake +--- qgis-3.24.3/cmake/PyQtMacros.cmake 2022-05-13 14:04:35.000000000 +0200 ++++ qgis-3.24.3-new/cmake/PyQtMacros.cmake 2022-05-22 00:10:13.050517565 +0200 @@ -34,7 +34,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE() # TODO osx diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 8502f90..b71f743 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.24.1/src/core/qgsapplication.cpp qgis-3.24.1-new/src/core/qgsapplication.cpp ---- qgis-3.24.1/src/core/qgsapplication.cpp 2022-03-18 13:04:18.000000000 +0100 -+++ qgis-3.24.1-new/src/core/qgsapplication.cpp 2022-03-21 10:35:03.425289233 +0100 -@@ -352,6 +352,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.24.3/src/core/qgsapplication.cpp qgis-3.24.3-new/src/core/qgsapplication.cpp +--- qgis-3.24.3/src/core/qgsapplication.cpp 2022-05-13 14:04:35.000000000 +0200 ++++ qgis-3.24.3-new/src/core/qgsapplication.cpp 2022-05-22 00:10:14.956592606 +0200 +@@ -355,6 +355,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 8f3871a..80da623 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.24.1/resources/CMakeLists.txt qgis-3.24.1-new/resources/CMakeLists.txt ---- qgis-3.24.1/resources/CMakeLists.txt 2022-03-18 13:04:18.000000000 +0100 -+++ qgis-3.24.1-new/resources/CMakeLists.txt 2022-03-21 10:35:05.025311325 +0100 +diff -rupN --no-dereference qgis-3.24.3/resources/CMakeLists.txt qgis-3.24.3-new/resources/CMakeLists.txt +--- qgis-3.24.3/resources/CMakeLists.txt 2022-05-13 14:04:35.000000000 +0200 ++++ qgis-3.24.3-new/resources/CMakeLists.txt 2022-05-22 00:10:16.816665505 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index ffb7965..3e33ba5 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,12 +1,8 @@ -# Shared lib calls exit -# https://issues.qgis.org/issues/2854 - #TODO: Run test suite (see debian/rules) -# FIXME Investigate and attempt to drop FIXME in %%build Name: qgis -Version: 3.24.2 -Release: 3%{?dist} +Version: 3.24.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -45,6 +41,7 @@ BuildRequires: gdal-devel BuildRequires: geos-devel BuildRequires: grass-devel BuildRequires: gsl-devel +BuildRequires: laszip-devel BuildRequires: libspatialite-devel BuildRequires: libdxfrw-devel BuildRequires: libxml2-devel @@ -53,6 +50,9 @@ BuildRequires: make BuildRequires: netcdf-devel BuildRequires: ocl-icd-devel BuildRequires: opencl-headers +# PDAL detection relies on pdal executable +BuildRequires: PDAL +BuildRequires: PDAL-devel BuildRequires: poly2tri-devel BuildRequires: postgresql-devel BuildRequires: proj-devel @@ -176,17 +176,14 @@ gzip ChangeLog -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \ -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \ -D ENABLE_TESTS:BOOL=FALSE \ + -D WITH_EPT:BOOL=TRUE \ + -D WITH_PDAL:BOOL=TRUE \ -D WITH_QSPATIALITE:BOOL=TRUE \ -D WITH_QWTPOLAR:BOOL=TRUE \ -D WITH_SERVER:BOOL=TRUE \ -D WITH_3D:BOOL=TRUE \ -D WITH_QSPATIALITE:BOOL=TRUE \ -D WITH_SERVER_LANDINGPAGE_WEBAPP=ON -# FIXME -# No idea why libgrass_imagery appears as -lgrass_imagery and not as %%{_libdir}/grass/lib/libgrass_imagery.8.0.so -# like all other grass libs... But it results in a Requires on libgrass_imagery.so rather than libgrass_imagery.8.0.so -# and the former is not provided by grass-libs, hence results in broken dependencies... -find %{_vpath_builddir} -type f -name link.txt -exec sed -i 's|-lgrass_imagery|%{_libdir}/grass80/lib/libgrass_imagery.8.0.so|' {} \; export YARN_CACHE_FOLDER="$PWD/.package-cache" %cmake_build @@ -305,6 +302,10 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun May 22 2022 Sandro Mani - 3.24.3-1 +- Update to 3.24.3 +- Enable PDAL support + * Sat May 21 2022 Sandro Mani - 3.24.2-3 - Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 diff --git a/sources b/sources index 8afac91..ec2de2c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.24.2.tar.bz2) = ad2df219de6e8a25b7b14a0ec09b3875d798937c7630e1a98cc1bc21b195317ab612f846f8ba6ad15d23d8885091e4bb844e49d05b05d34348ced937fa959b9e -SHA512 (qgis-3.24.2-vendor.tar.xz) = a0ec998878b4cffc4a33d5c00ff07a5d54442b21aa395159b396bec1ba2e2bfd3d7c8d3bf7c95e8bec1a908db23e3ba66c36e8ccbf62b49cfa28cbd68929e2ee +SHA512 (qgis-3.24.3-vendor.tar.xz) = 54559640d4ce17d420e33992dff20a1229d2a4cc60c6a3fb4d4d641397105e5883e93fd55177ccb01efce27c41383ac05ee3756114f34aacc5c71af7113ecec7 +SHA512 (qgis-3.24.3.tar.bz2) = 7c9ba01d8f96f6ce2e6bca479d5142ccf0970590795712db693081dc97a2af040868f8036cbd7d29408db33289de24ed9b2ed7a23f1cee4589e9d4680b0360b8 From 32d0abc99a1e1795d33735a9ad10463f8833cb84 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 23 May 2022 17:47:37 +0200 Subject: [PATCH 081/201] Fix python3-gdal requires --- qgis.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index 3e33ba5..0603097 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.24.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -122,7 +122,7 @@ GRASS plugin for QGIS required to interface with the GRASS system. %{?python_provide:%python_provide python3-qgis} Summary: Python integration and plug-ins for QGIS Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: gdal-python3 +Requires: python3-gdal Requires: python3-httplib2 Requires: python3-jinja2 Requires: python3-matplotlib @@ -302,6 +302,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon May 23 2022 Sandro Mani - 3.24.3-2 +- Fix python3-gdal requires + * Sun May 22 2022 Sandro Mani - 3.24.3-1 - Update to 3.24.3 - Enable PDAL support From cfb4d9387834ddc1d25fcf196a30dbe450d95dc5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 5 Jun 2022 11:10:24 +0200 Subject: [PATCH 082/201] Rebuild (grass) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 0603097..343034d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.24.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -302,6 +302,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Jun 05 2022 Sandro Mani - 3.24.3-3 +- Rebuild (grass) + * Mon May 23 2022 Sandro Mani - 3.24.3-2 - Fix python3-gdal requires From 475f7eb40e4ddde1db2a2ea825201bb408d52cf7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 22:39:29 +0200 Subject: [PATCH 083/201] Rebuilt for Python 3.11 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 343034d..c1f636d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.24.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -302,6 +302,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Jun 13 2022 Python Maint - 3.24.3-4 +- Rebuilt for Python 3.11 + * Sun Jun 05 2022 Sandro Mani - 3.24.3-3 - Rebuild (grass) From 9bace460a0fe0ca00c566c6bed31e5f3edff303d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 17 Jun 2022 21:14:04 +0200 Subject: [PATCH 084/201] Update to 3.26.0 --- .gitignore | 2 ++ ...licenses.txt => qgis-3.26.0-vendor-licenses.txt | 6 +++--- qgis-lib64.patch | 12 ------------ qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 14 +++++++------- sources | 4 ++-- 7 files changed, 21 insertions(+), 31 deletions(-) rename qgis-3.24.3-vendor-licenses.txt => qgis-3.26.0-vendor-licenses.txt (91%) delete mode 100644 qgis-lib64.patch diff --git a/.gitignore b/.gitignore index a1acd36..06025dd 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,5 @@ qgis_1.5.0.tar.gz /qgis-3.24.2-vendor.tar.xz /qgis-3.24.3-vendor.tar.xz /qgis-3.24.3.tar.bz2 +/qgis-3.26.0.tar.bz2 +/qgis-3.26.0-vendor.tar.xz diff --git a/qgis-3.24.3-vendor-licenses.txt b/qgis-3.26.0-vendor-licenses.txt similarity index 91% rename from qgis-3.24.3-vendor-licenses.txt rename to qgis-3.26.0-vendor-licenses.txt index 28f1575..0bc5c9d 100644 --- a/qgis-3.24.3-vendor-licenses.txt +++ b/qgis-3.26.0-vendor-licenses.txt @@ -1,7 +1,7 @@ yarn run v1.22.17 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 1081 -├─ ISC: 76 +├─ MIT: 1083 +├─ ISC: 77 ├─ BSD-3-Clause: 33 ├─ BSD-2-Clause: 28 ├─ Apache-2.0: 22 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.73s. +Done in 3.78s. diff --git a/qgis-lib64.patch b/qgis-lib64.patch deleted file mode 100644 index 0e25420..0000000 --- a/qgis-lib64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN --no-dereference qgis-3.24.3/cmake/PyQtMacros.cmake qgis-3.24.3-new/cmake/PyQtMacros.cmake ---- qgis-3.24.3/cmake/PyQtMacros.cmake 2022-05-13 14:04:35.000000000 +0200 -+++ qgis-3.24.3-new/cmake/PyQtMacros.cmake 2022-05-22 00:10:13.050517565 +0200 -@@ -34,7 +34,7 @@ MACRO(PYQT_WRAP_UI outfiles ) - ELSE() - # TODO osx - 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() - - FOREACH(it ${ARGN}) diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index b71f743..cebf03b 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.24.3/src/core/qgsapplication.cpp qgis-3.24.3-new/src/core/qgsapplication.cpp ---- qgis-3.24.3/src/core/qgsapplication.cpp 2022-05-13 14:04:35.000000000 +0200 -+++ qgis-3.24.3-new/src/core/qgsapplication.cpp 2022-05-22 00:10:14.956592606 +0200 -@@ -355,6 +355,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.26.0/src/core/qgsapplication.cpp qgis-3.26.0-new/src/core/qgsapplication.cpp +--- qgis-3.26.0/src/core/qgsapplication.cpp 2022-06-17 14:05:27.000000000 +0200 ++++ qgis-3.26.0-new/src/core/qgsapplication.cpp 2022-06-17 14:27:09.374812731 +0200 +@@ -360,6 +360,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 80da623..3bddb30 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.24.3/resources/CMakeLists.txt qgis-3.24.3-new/resources/CMakeLists.txt ---- qgis-3.24.3/resources/CMakeLists.txt 2022-05-13 14:04:35.000000000 +0200 -+++ qgis-3.24.3-new/resources/CMakeLists.txt 2022-05-22 00:10:16.816665505 +0200 +diff -rupN --no-dereference qgis-3.26.0/resources/CMakeLists.txt qgis-3.26.0-new/resources/CMakeLists.txt +--- qgis-3.26.0/resources/CMakeLists.txt 2022-06-17 14:05:27.000000000 +0200 ++++ qgis-3.26.0-new/resources/CMakeLists.txt 2022-06-17 14:27:11.093824498 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index c1f636d..7053a42 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.24.3 -Release: 4%{?dist} +Version: 3.26.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -22,13 +22,10 @@ Source4: %{name}-server-README.fedora #TODO: Path; Still necessary? Source5: %{name}-mime.xml -# Fix builds on 64-bit machines -# https://issues.qgis.org/issues/15602 -Patch0: %{name}-lib64.patch # Fix QGIS Server prefix calculation -Patch1: %{name}-serverprefix.patch +Patch0: %{name}-serverprefix.patch # Pass --offline to yarn, plus replace deprecated md4 with sha256 in webpack sources -Patch2: %{name}-yarn-offline.patch +Patch1: %{name}-yarn-offline.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -302,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jun 17 2022 Sandro Mani - 3.26.0-1 +- Update to 3.26.0 + * Mon Jun 13 2022 Python Maint - 3.24.3-4 - Rebuilt for Python 3.11 diff --git a/sources b/sources index ec2de2c..6491264 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.24.3-vendor.tar.xz) = 54559640d4ce17d420e33992dff20a1229d2a4cc60c6a3fb4d4d641397105e5883e93fd55177ccb01efce27c41383ac05ee3756114f34aacc5c71af7113ecec7 -SHA512 (qgis-3.24.3.tar.bz2) = 7c9ba01d8f96f6ce2e6bca479d5142ccf0970590795712db693081dc97a2af040868f8036cbd7d29408db33289de24ed9b2ed7a23f1cee4589e9d4680b0360b8 +SHA512 (qgis-3.26.0.tar.bz2) = 6e8b5eb2c9cc0db6db5caf656e7deddc6049b40a073295027f2d43e5bea5072662ca606c231e41fbcdb8002ff530c1b21bb1b35cbd935d4d6aa5823b753570a4 +SHA512 (qgis-3.26.0-vendor.tar.xz) = 3c9bbbc8163624fa831d31e277a086f67ac0e92802affd0c288d96eccd8b5d02f5573ab33cfbf933e1181358477f302911d2c936810db3f790638b88ecbf02b6 From 4bc5a356a8577b6cd65844000939dcb20ee48561 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 18 Jun 2022 00:41:44 +0200 Subject: [PATCH 085/201] Rebuilt for Python 3.11 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 7053a42..126fdf7 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jun 17 2022 Python Maint - 3.26.0-2 +- Rebuilt for Python 3.11 + * Fri Jun 17 2022 Sandro Mani - 3.26.0-1 - Update to 3.26.0 From 5fe8587027262003f51856e43d89c9e8a8e03dad Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 4 Jul 2022 22:30:26 +0200 Subject: [PATCH 086/201] Rebuild (grass) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 126fdf7..c5b2eff 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.26.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Jul 04 2022 Sandro Mani - 3.26.0-3 +- Rebuild (grass) + * Fri Jun 17 2022 Python Maint - 3.26.0-2 - Rebuilt for Python 3.11 From bc7af23f1113ae8dd015cc36b6a26b76bd4aad2e Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 14 Jul 2022 15:03:24 +0200 Subject: [PATCH 087/201] Rebuild (qt5) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index c5b2eff..7cb903a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.26.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Thu Jul 14 2022 Jan Grulich - 3.26.0-4 +- Rebuild (qt5) + * Mon Jul 04 2022 Sandro Mani - 3.26.0-3 - Rebuild (grass) From c5940ed9611726aaf9ea4f9b06c0478796247bb1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 19 Jul 2022 16:05:10 +0200 Subject: [PATCH 088/201] Update to 3.26.1 --- .gitignore | 2 ++ ...-vendor-licenses.txt => qgis-3.26.1-vendor-licenses.txt | 2 +- qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 6 files changed, 16 insertions(+), 11 deletions(-) rename qgis-3.26.0-vendor-licenses.txt => qgis-3.26.1-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 06025dd..68c5d73 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,5 @@ qgis_1.5.0.tar.gz /qgis-3.24.3.tar.bz2 /qgis-3.26.0.tar.bz2 /qgis-3.26.0-vendor.tar.xz +/qgis-3.26.1.tar.bz2 +/qgis-3.26.1-vendor.tar.xz diff --git a/qgis-3.26.0-vendor-licenses.txt b/qgis-3.26.1-vendor-licenses.txt similarity index 97% rename from qgis-3.26.0-vendor-licenses.txt rename to qgis-3.26.1-vendor-licenses.txt index 0bc5c9d..de7cc48 100644 --- a/qgis-3.26.0-vendor-licenses.txt +++ b/qgis-3.26.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 3.78s. +Done in 2.81s. diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index cebf03b..37f6613 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.26.0/src/core/qgsapplication.cpp qgis-3.26.0-new/src/core/qgsapplication.cpp ---- qgis-3.26.0/src/core/qgsapplication.cpp 2022-06-17 14:05:27.000000000 +0200 -+++ qgis-3.26.0-new/src/core/qgsapplication.cpp 2022-06-17 14:27:09.374812731 +0200 +diff -rupN --no-dereference qgis-3.26.1/src/core/qgsapplication.cpp qgis-3.26.1-new/src/core/qgsapplication.cpp +--- qgis-3.26.1/src/core/qgsapplication.cpp 2022-07-15 14:14:09.000000000 +0200 ++++ qgis-3.26.1-new/src/core/qgsapplication.cpp 2022-07-19 15:57:39.650125510 +0200 @@ -360,6 +360,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 3bddb30..7a1e576 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.26.0/resources/CMakeLists.txt qgis-3.26.0-new/resources/CMakeLists.txt ---- qgis-3.26.0/resources/CMakeLists.txt 2022-06-17 14:05:27.000000000 +0200 -+++ qgis-3.26.0-new/resources/CMakeLists.txt 2022-06-17 14:27:11.093824498 +0200 +diff -rupN --no-dereference qgis-3.26.1/resources/CMakeLists.txt qgis-3.26.1-new/resources/CMakeLists.txt +--- qgis-3.26.1/resources/CMakeLists.txt 2022-07-15 14:14:09.000000000 +0200 ++++ qgis-3.26.1-new/resources/CMakeLists.txt 2022-07-19 15:57:41.443125550 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 7cb903a..0d54dcb 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.26.0 -Release: 4%{?dist} +Version: 3.26.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Jul 19 2022 Sandro Mani - 3.26.1-1 +- Update to 3.26.1 + * Thu Jul 14 2022 Jan Grulich - 3.26.0-4 - Rebuild (qt5) diff --git a/sources b/sources index 6491264..2f233fc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.26.0.tar.bz2) = 6e8b5eb2c9cc0db6db5caf656e7deddc6049b40a073295027f2d43e5bea5072662ca606c231e41fbcdb8002ff530c1b21bb1b35cbd935d4d6aa5823b753570a4 -SHA512 (qgis-3.26.0-vendor.tar.xz) = 3c9bbbc8163624fa831d31e277a086f67ac0e92802affd0c288d96eccd8b5d02f5573ab33cfbf933e1181358477f302911d2c936810db3f790638b88ecbf02b6 +SHA512 (qgis-3.26.1.tar.bz2) = 7faed83fa8f3488f675b4214e7eba51f22171eab0785db34cfde743dc4bbb241900e116652ce31b8615e5d74679924d2caa7da040ea06f296d4cd2f06d6f3d5a +SHA512 (qgis-3.26.1-vendor.tar.xz) = a03a4cd61f925f6cbfd124fde643cf9246e5c5d5bdc12a4f90d04bea07fa25a15a6f3e72be5ab43922761a4f4ff55587b9c2023a3f9699baa649df160ec31d49 From 69eb2323a864ad2e037feed1f5d245c39918a55c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 23:55:01 +0000 Subject: [PATCH 089/201] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 0d54dcb..1aa3e83 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.26.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 3.26.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jul 19 2022 Sandro Mani - 3.26.1-1 - Update to 3.26.1 From 2ce2bb2d91d029e7b73fecd3af9f7bda88bcc77d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 13 Aug 2022 11:38:01 +0200 Subject: [PATCH 090/201] Update to 3.26.2 --- .gitignore | 2 ++ ...-vendor-licenses.txt => qgis-3.26.2-vendor-licenses.txt | 2 +- qgis.spec | 7 +++++-- sources | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) rename qgis-3.26.1-vendor-licenses.txt => qgis-3.26.2-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 68c5d73..4dfd199 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,5 @@ qgis_1.5.0.tar.gz /qgis-3.26.0-vendor.tar.xz /qgis-3.26.1.tar.bz2 /qgis-3.26.1-vendor.tar.xz +/qgis-3.26.2.tar.bz2 +/qgis-3.26.2-vendor.tar.xz diff --git a/qgis-3.26.1-vendor-licenses.txt b/qgis-3.26.2-vendor-licenses.txt similarity index 97% rename from qgis-3.26.1-vendor-licenses.txt rename to qgis-3.26.2-vendor-licenses.txt index de7cc48..96d1ff7 100644 --- a/qgis-3.26.1-vendor-licenses.txt +++ b/qgis-3.26.2-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.81s. +Done in 2.96s. diff --git a/qgis.spec b/qgis.spec index 1aa3e83..6eb2569 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.26.1 -Release: 2%{?dist} +Version: 3.26.2 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Aug 13 2022 Sandro Mani - 3.26.2-1 +- Update to 3.26.2 + * Fri Jul 22 2022 Fedora Release Engineering - 3.26.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 2f233fc..ae8dedf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.26.1.tar.bz2) = 7faed83fa8f3488f675b4214e7eba51f22171eab0785db34cfde743dc4bbb241900e116652ce31b8615e5d74679924d2caa7da040ea06f296d4cd2f06d6f3d5a -SHA512 (qgis-3.26.1-vendor.tar.xz) = a03a4cd61f925f6cbfd124fde643cf9246e5c5d5bdc12a4f90d04bea07fa25a15a6f3e72be5ab43922761a4f4ff55587b9c2023a3f9699baa649df160ec31d49 +SHA512 (qgis-3.26.2.tar.bz2) = 7517910275c0d4ade24a08568dabb4473adac8c6d27eef6010d9b69b3443656b2238cda141421aa0bcd346d4e720efb1956e6b0357f4370e3a10f832e73c9ec6 +SHA512 (qgis-3.26.2-vendor.tar.xz) = 47ed2857aac2a55664fbd246442c51eb8ac7383e6ed5280529493340f359b122a05a66c69f5b0942ae4f0084ccf53eaac6485df0726e214e3c794f42a15c2684 From f29b5db19797ce0dbfe88bffeb0aba87f90a2ebc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Aug 2022 17:36:33 +0900 Subject: [PATCH 091/201] Rebuild for gsl-2.7.1 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 6eb2569..0d3f4cb 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.26.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Aug 23 2022 Mamoru TASAKA - 3.26.2-2 +- Rebuild for gsl-2.7.1 + * Sat Aug 13 2022 Sandro Mani - 3.26.2-1 - Update to 3.26.2 From e30f67ee94527d6666ee9dd970d83ac4b5bb03cf Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 10 Sep 2022 15:00:09 +0200 Subject: [PATCH 092/201] Update to 3.26.3 --- .gitignore | 2 ++ ...-vendor-licenses.txt => qgis-3.26.3-vendor-licenses.txt | 2 +- qgis.spec | 7 +++++-- sources | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) rename qgis-3.26.2-vendor-licenses.txt => qgis-3.26.3-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 4dfd199..0a506d3 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,5 @@ qgis_1.5.0.tar.gz /qgis-3.26.1-vendor.tar.xz /qgis-3.26.2.tar.bz2 /qgis-3.26.2-vendor.tar.xz +/qgis-3.26.3.tar.bz2 +/qgis-3.26.3-vendor.tar.xz diff --git a/qgis-3.26.2-vendor-licenses.txt b/qgis-3.26.3-vendor-licenses.txt similarity index 97% rename from qgis-3.26.2-vendor-licenses.txt rename to qgis-3.26.3-vendor-licenses.txt index 96d1ff7..97aa0d5 100644 --- a/qgis-3.26.2-vendor-licenses.txt +++ b/qgis-3.26.3-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.96s. +Done in 13.14s. diff --git a/qgis.spec b/qgis.spec index 0d3f4cb..31805e9 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.26.2 -Release: 2%{?dist} +Version: 3.26.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Sep 10 2022 Sandro Mani - 3.26.3-1 +- Update to 3.26.3 + * Tue Aug 23 2022 Mamoru TASAKA - 3.26.2-2 - Rebuild for gsl-2.7.1 diff --git a/sources b/sources index ae8dedf..869f04c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.26.2.tar.bz2) = 7517910275c0d4ade24a08568dabb4473adac8c6d27eef6010d9b69b3443656b2238cda141421aa0bcd346d4e720efb1956e6b0357f4370e3a10f832e73c9ec6 -SHA512 (qgis-3.26.2-vendor.tar.xz) = 47ed2857aac2a55664fbd246442c51eb8ac7383e6ed5280529493340f359b122a05a66c69f5b0942ae4f0084ccf53eaac6485df0726e214e3c794f42a15c2684 +SHA512 (qgis-3.26.3.tar.bz2) = 4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76 +SHA512 (qgis-3.26.3-vendor.tar.xz) = defdc3d0941ab89abe50db748407d6968e466184e6038267c38f75471aaf97d3c48bdcea6039951809f09739628b39cfc05b11fa91e2992cf91d66bbd31f8881 From 99471212bc9f4fe8ea7b6b27ecd09dfc1a83519b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 25 Oct 2022 13:12:46 +0200 Subject: [PATCH 093/201] Update to 3.28.0 --- .gitignore | 2 ++ ...3-vendor-licenses.txt => qgis-3.28.0-vendor-licenses.txt | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) rename qgis-3.26.3-vendor-licenses.txt => qgis-3.28.0-vendor-licenses.txt (90%) diff --git a/.gitignore b/.gitignore index 0a506d3..7096439 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,5 @@ qgis_1.5.0.tar.gz /qgis-3.26.2-vendor.tar.xz /qgis-3.26.3.tar.bz2 /qgis-3.26.3-vendor.tar.xz +/qgis-3.28.0.tar.bz2 +/qgis-3.28.0-vendor.tar.xz diff --git a/qgis-3.26.3-vendor-licenses.txt b/qgis-3.28.0-vendor-licenses.txt similarity index 90% rename from qgis-3.26.3-vendor-licenses.txt rename to qgis-3.28.0-vendor-licenses.txt index 97aa0d5..fb28c0c 100644 --- a/qgis-3.26.3-vendor-licenses.txt +++ b/qgis-3.28.0-vendor-licenses.txt @@ -1,8 +1,8 @@ yarn run v1.22.17 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 1083 +├─ MIT: 1089 ├─ ISC: 77 -├─ BSD-3-Clause: 33 +├─ BSD-3-Clause: 32 ├─ BSD-2-Clause: 28 ├─ Apache-2.0: 22 ├─ (MIT OR CC0-1.0): 4 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 13.14s. +Done in 2.78s. diff --git a/qgis.spec b/qgis.spec index 31805e9..22de6d0 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.26.3 +Version: 3.28.0 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Oct 25 2022 Sandro Mani - 3.28.0-1 +- Update to 3.28.0 + * Sat Sep 10 2022 Sandro Mani - 3.26.3-1 - Update to 3.26.3 diff --git a/sources b/sources index 869f04c..e614150 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.26.3.tar.bz2) = 4e239143dc63c773f8c0fd0445a5b18c59832ef978fbc2b132ef13da2f78c7f8aa439956dd88d4eaf1d980f602fd85f842d5e670707cc6e46779e7e5a3c14d76 -SHA512 (qgis-3.26.3-vendor.tar.xz) = defdc3d0941ab89abe50db748407d6968e466184e6038267c38f75471aaf97d3c48bdcea6039951809f09739628b39cfc05b11fa91e2992cf91d66bbd31f8881 +SHA512 (qgis-3.28.0-vendor.tar.xz) = bb19652034a540444d27fae876686a2613f17ba083ebda2a8764384cd0afc823ca83909ce6ba4353164582dc43d1629e3d364d97c78724239b8e95ea20ad881a +SHA512 (qgis-3.28.0.tar.bz2) = 4189dc75628e8ae89817215905da57a4d91d71964a75a2e1750e4082c1cb61a118446eaa0508aa9db58108b7615ad40ed3233078b933a56fa70edf1933f20afe From 216a125f32e54555c648c4f363251a570b45f0f8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 12 Nov 2022 20:29:11 +0100 Subject: [PATCH 094/201] Rebuild (gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 22de6d0..8e23b06 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.28.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Nov 12 2022 Sandro Mani - 3.28.0-2 +- Rebuild (gdal) + * Tue Oct 25 2022 Sandro Mani - 3.28.0-1 - Update to 3.28.0 From 09045210acab970a5a52fd603b845a4102a9732d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 18 Nov 2022 22:52:35 +0100 Subject: [PATCH 095/201] Update to 3.28.1 --- .gitignore | 2 ++ ...vendor-licenses.txt => qgis-3.28.1-vendor-licenses.txt | 2 +- qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 6 files changed, 17 insertions(+), 12 deletions(-) rename qgis-3.28.0-vendor-licenses.txt => qgis-3.28.1-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 7096439..b9241fd 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,5 @@ qgis_1.5.0.tar.gz /qgis-3.26.3-vendor.tar.xz /qgis-3.28.0.tar.bz2 /qgis-3.28.0-vendor.tar.xz +/qgis-3.28.1.tar.bz2 +/qgis-3.28.1-vendor.tar.xz diff --git a/qgis-3.28.0-vendor-licenses.txt b/qgis-3.28.1-vendor-licenses.txt similarity index 97% rename from qgis-3.28.0-vendor-licenses.txt rename to qgis-3.28.1-vendor-licenses.txt index fb28c0c..9799f9d 100644 --- a/qgis-3.28.0-vendor-licenses.txt +++ b/qgis-3.28.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.78s. +Done in 3.32s. diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 37f6613..ad92b8f 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.26.1/src/core/qgsapplication.cpp qgis-3.26.1-new/src/core/qgsapplication.cpp ---- qgis-3.26.1/src/core/qgsapplication.cpp 2022-07-15 14:14:09.000000000 +0200 -+++ qgis-3.26.1-new/src/core/qgsapplication.cpp 2022-07-19 15:57:39.650125510 +0200 -@@ -360,6 +360,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.28.1/src/core/qgsapplication.cpp qgis-3.28.1-new/src/core/qgsapplication.cpp +--- qgis-3.28.1/src/core/qgsapplication.cpp 2022-11-18 13:10:21.000000000 +0100 ++++ qgis-3.28.1-new/src/core/qgsapplication.cpp 2022-11-18 22:47:36.864059524 +0100 +@@ -369,6 +369,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 7a1e576..ac80331 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.26.1/resources/CMakeLists.txt qgis-3.26.1-new/resources/CMakeLists.txt ---- qgis-3.26.1/resources/CMakeLists.txt 2022-07-15 14:14:09.000000000 +0200 -+++ qgis-3.26.1-new/resources/CMakeLists.txt 2022-07-19 15:57:41.443125550 +0200 +diff -rupN --no-dereference qgis-3.28.1/resources/CMakeLists.txt qgis-3.28.1-new/resources/CMakeLists.txt +--- qgis-3.28.1/resources/CMakeLists.txt 2022-11-18 13:10:21.000000000 +0100 ++++ qgis-3.28.1-new/resources/CMakeLists.txt 2022-11-18 22:47:39.354059580 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 8e23b06..27d8828 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.28.0 -Release: 2%{?dist} +Version: 3.28.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Nov 18 2022 Sandro Mani - 3.28.1-1 +- Update to 3.28.1 + * Sat Nov 12 2022 Sandro Mani - 3.28.0-2 - Rebuild (gdal) diff --git a/sources b/sources index e614150..bba0f5a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.28.0-vendor.tar.xz) = bb19652034a540444d27fae876686a2613f17ba083ebda2a8764384cd0afc823ca83909ce6ba4353164582dc43d1629e3d364d97c78724239b8e95ea20ad881a -SHA512 (qgis-3.28.0.tar.bz2) = 4189dc75628e8ae89817215905da57a4d91d71964a75a2e1750e4082c1cb61a118446eaa0508aa9db58108b7615ad40ed3233078b933a56fa70edf1933f20afe +SHA512 (qgis-3.28.1.tar.bz2) = f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514 +SHA512 (qgis-3.28.1-vendor.tar.xz) = 22389ef8df481fd9a3c18a285b03824b7e5d2e96fdb27c019dde0b7ea0524f6fa96c3d83703ee65b784e13ecbebab80601914399a156cf5c565e10ce9cab7e62 From 6031b652a8788f632e636e3735adfa4e5be952af Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 16 Dec 2022 19:20:39 +0100 Subject: [PATCH 096/201] Update to 3.28.2 --- .gitignore | 2 ++ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b9241fd..e4f59c7 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,5 @@ qgis_1.5.0.tar.gz /qgis-3.28.0-vendor.tar.xz /qgis-3.28.1.tar.bz2 /qgis-3.28.1-vendor.tar.xz +/qgis-3.28.2.tar.bz2 +/qgis-3.28.2-vendor.tar.xz diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index ad92b8f..22a4a52 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.1/src/core/qgsapplication.cpp qgis-3.28.1-new/src/core/qgsapplication.cpp ---- qgis-3.28.1/src/core/qgsapplication.cpp 2022-11-18 13:10:21.000000000 +0100 -+++ qgis-3.28.1-new/src/core/qgsapplication.cpp 2022-11-18 22:47:36.864059524 +0100 +diff -rupN --no-dereference qgis-3.28.2/src/core/qgsapplication.cpp qgis-3.28.2-new/src/core/qgsapplication.cpp +--- qgis-3.28.2/src/core/qgsapplication.cpp 2022-12-16 13:04:31.000000000 +0100 ++++ qgis-3.28.2-new/src/core/qgsapplication.cpp 2022-12-16 18:51:24.908156364 +0100 @@ -369,6 +369,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index ac80331..5665097 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.1/resources/CMakeLists.txt qgis-3.28.1-new/resources/CMakeLists.txt ---- qgis-3.28.1/resources/CMakeLists.txt 2022-11-18 13:10:21.000000000 +0100 -+++ qgis-3.28.1-new/resources/CMakeLists.txt 2022-11-18 22:47:39.354059580 +0100 +diff -rupN --no-dereference qgis-3.28.2/resources/CMakeLists.txt qgis-3.28.2-new/resources/CMakeLists.txt +--- qgis-3.28.2/resources/CMakeLists.txt 2022-12-16 13:04:31.000000000 +0100 ++++ qgis-3.28.2-new/resources/CMakeLists.txt 2022-12-16 18:51:27.734156428 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 27d8828..7ee7b43 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.28.1 +Version: 3.28.2 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Dec 16 2022 Sandro Mani - 3.28.2-1 +- Update to 3.28.2 + * Fri Nov 18 2022 Sandro Mani - 3.28.1-1 - Update to 3.28.1 diff --git a/sources b/sources index bba0f5a..f80e5bb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.28.1.tar.bz2) = f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514 -SHA512 (qgis-3.28.1-vendor.tar.xz) = 22389ef8df481fd9a3c18a285b03824b7e5d2e96fdb27c019dde0b7ea0524f6fa96c3d83703ee65b784e13ecbebab80601914399a156cf5c565e10ce9cab7e62 +SHA512 (qgis-3.28.2.tar.bz2) = 287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad +SHA512 (qgis-3.28.2-vendor.tar.xz) = a2d0cf6056aa81bebe889513eb8009e118f28db087a6c34e4028d3d43d0ab2c7924afc001315891a5c35f143f39a3e5d89bc4d727af2290d38b44d47d0153ee2 From d3cc05d857e177540830b7919e8b60ba71cbe839 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 16 Dec 2022 19:29:03 +0100 Subject: [PATCH 097/201] Add qgis-3.28.2-vendor-licenses.txt --- ....28.1-vendor-licenses.txt => qgis-3.28.2-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.28.1-vendor-licenses.txt => qgis-3.28.2-vendor-licenses.txt (97%) diff --git a/qgis-3.28.1-vendor-licenses.txt b/qgis-3.28.2-vendor-licenses.txt similarity index 97% rename from qgis-3.28.1-vendor-licenses.txt rename to qgis-3.28.2-vendor-licenses.txt index 9799f9d..a4112e2 100644 --- a/qgis-3.28.1-vendor-licenses.txt +++ b/qgis-3.28.2-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 3.32s. +Done in 4.96s. From 743b7742878d63ca7c25c29202b0d5d27171a4b1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 21 Dec 2022 15:53:46 +0100 Subject: [PATCH 098/201] Rebuild (qwt) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 7ee7b43..37dfead 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.28.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Wed Dec 21 2022 Sandro Mani - 3.28.2-2 +- Rebuild (qwt) + * Fri Dec 16 2022 Sandro Mani - 3.28.2-1 - Update to 3.28.2 From 1414eb8b81fd7fd1c5dbadbb58e499b9122c4284 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 22 Dec 2022 19:10:43 +0100 Subject: [PATCH 099/201] Fix build against qwt-6.2 --- qgis-qwt.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ qgis.spec | 3 +++ 2 files changed, 61 insertions(+) create mode 100644 qgis-qwt.patch diff --git a/qgis-qwt.patch b/qgis-qwt.patch new file mode 100644 index 0000000..5b5f09c --- /dev/null +++ b/qgis-qwt.patch @@ -0,0 +1,58 @@ +diff -rupN qgis-3.28.2/cmake/FindQwtPolar.cmake qgis-3.28.2-new/cmake/FindQwtPolar.cmake +--- qgis-3.28.2/cmake/FindQwtPolar.cmake 2022-12-16 13:04:31.000000000 +0100 ++++ qgis-3.28.2-new/cmake/FindQwtPolar.cmake 2022-12-22 16:05:00.726606815 +0100 +@@ -5,18 +5,18 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + # +-# Once run this will define: +-# ++# Once run this will define: ++# + # QWTPOLAR_FOUND = system has QwtPolar lib + # QWTPOLAR_LIBRARY = full path to the QwtPolar library +-# QWTPOLAR_INCLUDE_DIR = where to find headers ++# QWTPOLAR_INCLUDE_DIR = where to find headers + # + +-FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar PATHS ++FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar qwt-qt5 PATHS + /usr/lib + /usr/local/lib +- "$ENV{LIB_DIR}/lib" +- "$ENV{LIB}/lib" ++ "$ENV{LIB_DIR}/lib" ++ "$ENV{LIB}/lib" + ) + + SET(_qwtpolar_fw) +@@ -30,7 +30,7 @@ FIND_PATH(QWTPOLAR_INCLUDE_DIR NAMES qwt + /usr/local/include + "$ENV{LIB_DIR}/include" + "$ENV{INCLUDE}" +- PATH_SUFFIXES qwtpolar qwt ++ PATH_SUFFIXES qwtpolar qwt qt5/qwt + ) + + IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) +diff -rupN qgis-3.28.2/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.28.2-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.28.2/src/app/gps/qgsgpsinformationwidget.cpp 2022-12-16 13:04:31.000000000 +0100 ++++ qgis-3.28.2-new/src/app/gps/qgsgpsinformationwidget.cpp 2022-12-22 17:18:41.308322547 +0100 +@@ -825,7 +825,7 @@ void QgsGpsInformationWidget::displayGPS + { + #ifdef WITH_QWTPOLAR + QwtPolarMarker *mypMarker = new QwtPolarMarker(); +-#if (QWT_POLAR_VERSION<0x010000) ++#if defined(QWT_POLAR_VERSION) && (QWT_POLAR_VERSION<0x010000) + mypMarker->setPosition( QwtPolarPoint( currentInfo.azimuth, currentInfo.elevation ) ); + #else + mypMarker->setPosition( QwtPointPolar( currentInfo.azimuth, currentInfo.elevation ) ); +@@ -843,7 +843,7 @@ void QgsGpsInformationWidget::displayGPS + QBrush symbolBrush( Qt::black ); + QSize markerSize( 9, 9 ); + QBrush textBgBrush( bg ); +-#if (QWT_POLAR_VERSION<0x010000) ++#if defined(QWT_POLAR_VERSION) && (QWT_POLAR_VERSION<0x010000) + mypMarker->setSymbol( QwtSymbol( QwtSymbol::Ellipse, + symbolBrush, QPen( myColor ), markerSize ) ); + #else diff --git a/qgis.spec b/qgis.spec index 37dfead..359f54d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -26,6 +26,8 @@ Source5: %{name}-mime.xml Patch0: %{name}-serverprefix.patch # Pass --offline to yarn, plus replace deprecated md4 with sha256 in webpack sources Patch1: %{name}-yarn-offline.patch +# Fix build against qwt-6.2 +Patch2: %{name}-qwt.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -177,6 +179,7 @@ gzip ChangeLog -D WITH_PDAL:BOOL=TRUE \ -D WITH_QSPATIALITE:BOOL=TRUE \ -D WITH_QWTPOLAR:BOOL=TRUE \ + -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \ -D WITH_SERVER:BOOL=TRUE \ -D WITH_3D:BOOL=TRUE \ -D WITH_QSPATIALITE:BOOL=TRUE \ From 2745fccf7f1673e29af944ed4aca7c149bfd8443 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 18:52:57 +0000 Subject: [PATCH 100/201] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 359f54d..57513ea 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.28.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -302,6 +302,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 3.28.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 21 2022 Sandro Mani - 3.28.2-2 - Rebuild (qwt) From 0cbbfeae920c4dbb245ca06e84e03ae4bd96a769 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 Jan 2023 00:15:06 +0100 Subject: [PATCH 101/201] Add qgis-gcc13.patch --- qgis-gcc13.patch | 32 ++++++++++++++++++++++++++++++++ qgis.spec | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 qgis-gcc13.patch diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch new file mode 100644 index 0000000..353ba2b --- /dev/null +++ b/qgis-gcc13.patch @@ -0,0 +1,32 @@ +diff -rupN qgis-3.28.2/external/lazperf/Extractor.hpp qgis-3.28.2-new/external/lazperf/Extractor.hpp +--- qgis-3.28.2/external/lazperf/Extractor.hpp 2022-12-16 13:04:31.000000000 +0100 ++++ qgis-3.28.2-new/external/lazperf/Extractor.hpp 2023-01-20 21:42:05.172793756 +0100 +@@ -34,6 +34,7 @@ + + #pragma once + ++#include + #include + #include + +diff -rupN qgis-3.28.2/external/untwine/api/QgisUntwine.hpp qgis-3.28.2-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.28.2/external/untwine/api/QgisUntwine.hpp 2022-12-16 13:04:31.000000000 +0100 ++++ qgis-3.28.2-new/external/untwine/api/QgisUntwine.hpp 2023-01-20 22:35:19.827300165 +0100 +@@ -1,5 +1,6 @@ + #pragma once + ++#include + #include + #include + #include +diff -rupN qgis-3.28.2/external/untwine/untwine/VoxelKey.hpp qgis-3.28.2-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.28.2/external/untwine/untwine/VoxelKey.hpp 2022-12-16 13:04:31.000000000 +0100 ++++ qgis-3.28.2-new/external/untwine/untwine/VoxelKey.hpp 2023-01-20 21:20:18.264009376 +0100 +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + #pragma once + diff --git a/qgis.spec b/qgis.spec index 57513ea..37c75ee 100644 --- a/qgis.spec +++ b/qgis.spec @@ -28,6 +28,8 @@ Patch0: %{name}-serverprefix.patch Patch1: %{name}-yarn-offline.patch # Fix build against qwt-6.2 Patch2: %{name}-qwt.patch +# Fix GCC13 FTBFS +Patch3: %{name}-gcc13.patch BuildRequires: cmake BuildRequires: desktop-file-utils From 8084042a666a2f2a50b3599978f60ee18bc008a7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 22 Jan 2023 09:41:02 +0100 Subject: [PATCH 102/201] Rebuild (PDAL) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 37c75ee..c18b9bb 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.28.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Jan 22 2023 Sandro Mani - 3.28.2-4 +- Rebuild (PDAL) + * Fri Jan 20 2023 Fedora Release Engineering - 3.28.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3ef8c897beac1be599828040520463e6a9bc4caa Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 28 Jan 2023 23:24:41 +0100 Subject: [PATCH 103/201] Update to 3.28.3 --- .gitignore | 2 ++ qgis-gcc13.patch | 18 +++++++++--------- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 7 files changed, 30 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index e4f59c7..eff29a0 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,5 @@ qgis_1.5.0.tar.gz /qgis-3.28.1-vendor.tar.xz /qgis-3.28.2.tar.bz2 /qgis-3.28.2-vendor.tar.xz +/qgis-3.28.3.tar.bz2 +/qgis-3.28.3-vendor.tar.xz diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index 353ba2b..e30f16e 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN qgis-3.28.2/external/lazperf/Extractor.hpp qgis-3.28.2-new/external/lazperf/Extractor.hpp ---- qgis-3.28.2/external/lazperf/Extractor.hpp 2022-12-16 13:04:31.000000000 +0100 -+++ qgis-3.28.2-new/external/lazperf/Extractor.hpp 2023-01-20 21:42:05.172793756 +0100 +diff -rupN --no-dereference qgis-3.28.3/external/lazperf/Extractor.hpp qgis-3.28.3-new/external/lazperf/Extractor.hpp +--- qgis-3.28.3/external/lazperf/Extractor.hpp 2023-01-27 13:04:06.000000000 +0100 ++++ qgis-3.28.3-new/external/lazperf/Extractor.hpp 2023-01-27 14:51:19.274996167 +0100 @@ -34,6 +34,7 @@ #pragma once @@ -9,9 +9,9 @@ diff -rupN qgis-3.28.2/external/lazperf/Extractor.hpp qgis-3.28.2-new/external/l #include #include -diff -rupN qgis-3.28.2/external/untwine/api/QgisUntwine.hpp qgis-3.28.2-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.28.2/external/untwine/api/QgisUntwine.hpp 2022-12-16 13:04:31.000000000 +0100 -+++ qgis-3.28.2-new/external/untwine/api/QgisUntwine.hpp 2023-01-20 22:35:19.827300165 +0100 +diff -rupN --no-dereference qgis-3.28.3/external/untwine/api/QgisUntwine.hpp qgis-3.28.3-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.28.3/external/untwine/api/QgisUntwine.hpp 2023-01-27 13:04:06.000000000 +0100 ++++ qgis-3.28.3-new/external/untwine/api/QgisUntwine.hpp 2023-01-27 14:51:19.275996168 +0100 @@ -1,5 +1,6 @@ #pragma once @@ -19,9 +19,9 @@ diff -rupN qgis-3.28.2/external/untwine/api/QgisUntwine.hpp qgis-3.28.2-new/exte #include #include #include -diff -rupN qgis-3.28.2/external/untwine/untwine/VoxelKey.hpp qgis-3.28.2-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.28.2/external/untwine/untwine/VoxelKey.hpp 2022-12-16 13:04:31.000000000 +0100 -+++ qgis-3.28.2-new/external/untwine/untwine/VoxelKey.hpp 2023-01-20 21:20:18.264009376 +0100 +diff -rupN --no-dereference qgis-3.28.3/external/untwine/untwine/VoxelKey.hpp qgis-3.28.3-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.28.3/external/untwine/untwine/VoxelKey.hpp 2023-01-27 13:04:06.000000000 +0100 ++++ qgis-3.28.3-new/external/untwine/untwine/VoxelKey.hpp 2023-01-27 14:51:19.275996168 +0100 @@ -12,6 +12,7 @@ #include diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 5b5f09c..ccc5810 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN qgis-3.28.2/cmake/FindQwtPolar.cmake qgis-3.28.2-new/cmake/FindQwtPolar.cmake ---- qgis-3.28.2/cmake/FindQwtPolar.cmake 2022-12-16 13:04:31.000000000 +0100 -+++ qgis-3.28.2-new/cmake/FindQwtPolar.cmake 2022-12-22 16:05:00.726606815 +0100 +diff -rupN --no-dereference qgis-3.28.3/cmake/FindQwtPolar.cmake qgis-3.28.3-new/cmake/FindQwtPolar.cmake +--- qgis-3.28.3/cmake/FindQwtPolar.cmake 2023-01-27 13:04:06.000000000 +0100 ++++ qgis-3.28.3-new/cmake/FindQwtPolar.cmake 2023-01-27 14:51:14.223989557 +0100 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN qgis-3.28.2/cmake/FindQwtPolar.cmake qgis-3.28.2-new/cmake/FindQwtPol ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN qgis-3.28.2/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.28.2-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.28.2/src/app/gps/qgsgpsinformationwidget.cpp 2022-12-16 13:04:31.000000000 +0100 -+++ qgis-3.28.2-new/src/app/gps/qgsgpsinformationwidget.cpp 2022-12-22 17:18:41.308322547 +0100 +diff -rupN --no-dereference qgis-3.28.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.28.3-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.28.3/src/app/gps/qgsgpsinformationwidget.cpp 2023-01-27 13:04:06.000000000 +0100 ++++ qgis-3.28.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-01-27 14:51:14.224989558 +0100 @@ -825,7 +825,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 22a4a52..0f10e01 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.2/src/core/qgsapplication.cpp qgis-3.28.2-new/src/core/qgsapplication.cpp ---- qgis-3.28.2/src/core/qgsapplication.cpp 2022-12-16 13:04:31.000000000 +0100 -+++ qgis-3.28.2-new/src/core/qgsapplication.cpp 2022-12-16 18:51:24.908156364 +0100 +diff -rupN --no-dereference qgis-3.28.3/src/core/qgsapplication.cpp qgis-3.28.3-new/src/core/qgsapplication.cpp +--- qgis-3.28.3/src/core/qgsapplication.cpp 2023-01-27 13:04:06.000000000 +0100 ++++ qgis-3.28.3-new/src/core/qgsapplication.cpp 2023-01-27 14:51:03.832975820 +0100 @@ -369,6 +369,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 5665097..82231b1 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.2/resources/CMakeLists.txt qgis-3.28.2-new/resources/CMakeLists.txt ---- qgis-3.28.2/resources/CMakeLists.txt 2022-12-16 13:04:31.000000000 +0100 -+++ qgis-3.28.2-new/resources/CMakeLists.txt 2022-12-16 18:51:27.734156428 +0100 +diff -rupN --no-dereference qgis-3.28.3/resources/CMakeLists.txt qgis-3.28.3-new/resources/CMakeLists.txt +--- qgis-3.28.3/resources/CMakeLists.txt 2023-01-27 13:04:06.000000000 +0100 ++++ qgis-3.28.3-new/resources/CMakeLists.txt 2023-01-27 14:51:09.171982902 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index c18b9bb..1f46e22 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.28.2 -Release: 4%{?dist} +Version: 3.28.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jan 27 2023 Sandro Mani - 3.28.3-1 +- Update to 3.28.3 + * Sun Jan 22 2023 Sandro Mani - 3.28.2-4 - Rebuild (PDAL) diff --git a/sources b/sources index f80e5bb..ebc6762 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.28.2.tar.bz2) = 287de9041fe1ad55059904ecd99e3ac3a172c566faafd3d113b21e07f63b01afc2536391365dd372baa328fa5976aea6cfbcbc1030e8c61dee8f3a3f409724ad -SHA512 (qgis-3.28.2-vendor.tar.xz) = a2d0cf6056aa81bebe889513eb8009e118f28db087a6c34e4028d3d43d0ab2c7924afc001315891a5c35f143f39a3e5d89bc4d727af2290d38b44d47d0153ee2 +SHA512 (qgis-3.28.3.tar.bz2) = 04b082aaa913095a2789e847c71ef36f2d8ad2781b644f70b64369fd96e4cc896004e8ad63329e90dc742d2b82c131789037b91d1bc50b728e6b5928b9042580 +SHA512 (qgis-3.28.3-vendor.tar.xz) = 8c1249c6814ead1eb77d02eb4808b8a4bd3d267dde81f308e926213764ef3e52359841dbb71175f83ded4122d2c9b36c296a97aa7e0a48472d3239756bc0fab2 From dea8143cbb7106995426c7e1679cce07acec6751 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 28 Jan 2023 23:25:32 +0100 Subject: [PATCH 104/201] Update license file --- ...8.2-vendor-licenses.txt => qgis-3.28.3-vendor-licenses.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename qgis-3.28.2-vendor-licenses.txt => qgis-3.28.3-vendor-licenses.txt (94%) diff --git a/qgis-3.28.2-vendor-licenses.txt b/qgis-3.28.3-vendor-licenses.txt similarity index 94% rename from qgis-3.28.2-vendor-licenses.txt rename to qgis-3.28.3-vendor-licenses.txt index a4112e2..e6d02b9 100644 --- a/qgis-3.28.2-vendor-licenses.txt +++ b/qgis-3.28.3-vendor-licenses.txt @@ -1,4 +1,4 @@ -yarn run v1.22.17 +yarn run v1.22.19 $ /tmpnode_modules/.bin/license-checker --summary ├─ MIT: 1089 ├─ ISC: 77 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 4.96s. +Done in 3.71s. From ae600beaf1b2d60d073913e9b6d4b258ffe98599 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 4 Mar 2023 06:29:49 +0100 Subject: [PATCH 105/201] Update to 3.30.0 --- .gitignore | 2 ++ ...dor-licenses.txt => qgis-3.30.0-vendor-licenses.txt | 10 +++++----- qgis.spec | 5 ++++- sources | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) rename qgis-3.28.3-vendor-licenses.txt => qgis-3.30.0-vendor-licenses.txt (85%) diff --git a/.gitignore b/.gitignore index eff29a0..3a90510 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,5 @@ qgis_1.5.0.tar.gz /qgis-3.28.2-vendor.tar.xz /qgis-3.28.3.tar.bz2 /qgis-3.28.3-vendor.tar.xz +/qgis-3.30.0.tar.bz2 +/qgis-3.30.0-vendor.tar.xz diff --git a/qgis-3.28.3-vendor-licenses.txt b/qgis-3.30.0-vendor-licenses.txt similarity index 85% rename from qgis-3.28.3-vendor-licenses.txt rename to qgis-3.30.0-vendor-licenses.txt index e6d02b9..b19f645 100644 --- a/qgis-3.28.3-vendor-licenses.txt +++ b/qgis-3.30.0-vendor-licenses.txt @@ -1,12 +1,12 @@ yarn run v1.22.19 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 1089 -├─ ISC: 77 +├─ MIT: 1037 +├─ ISC: 75 ├─ BSD-3-Clause: 32 ├─ BSD-2-Clause: 28 -├─ Apache-2.0: 22 +├─ Apache-2.0: 25 +├─ MIT*: 4 ├─ (MIT OR CC0-1.0): 4 -├─ MIT*: 3 ├─ Unlicense: 3 ├─ (MIT OR Apache-2.0): 2 ├─ CC0-1.0: 2 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 3.71s. +Done in 2.69s. diff --git a/qgis.spec b/qgis.spec index 1f46e22..1653561 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.28.3 +Version: 3.30.0 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Mar 04 2023 Sandro Mani - 3.30.0-1 +- Update to 3.30.0 + * Fri Jan 27 2023 Sandro Mani - 3.28.3-1 - Update to 3.28.3 diff --git a/sources b/sources index ebc6762..e0cebaf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.28.3.tar.bz2) = 04b082aaa913095a2789e847c71ef36f2d8ad2781b644f70b64369fd96e4cc896004e8ad63329e90dc742d2b82c131789037b91d1bc50b728e6b5928b9042580 -SHA512 (qgis-3.28.3-vendor.tar.xz) = 8c1249c6814ead1eb77d02eb4808b8a4bd3d267dde81f308e926213764ef3e52359841dbb71175f83ded4122d2c9b36c296a97aa7e0a48472d3239756bc0fab2 +SHA512 (qgis-3.30.0.tar.bz2) = d59fb546fda2981f8bace939cdd61474c70ac26bf4fcaf3e987ce1012a1782630eb34b65710e22ac925158c9ca95a73c9030ebcea1e3c64adeb49aca4b77b9af +SHA512 (qgis-3.30.0-vendor.tar.xz) = ad4deb2c5b0ab75b876773fcbf772db8a291777a990dedf8338b490d1f6541877a6fad15d1f2e9a9d8ad6b0a70090ff821c097cdcd9ac418396793e4dd8ecfd3 From b87ed33e1c6fdf84acdb47f5fcef5ac4d2ae6269 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 4 Mar 2023 06:54:59 +0100 Subject: [PATCH 106/201] BR: qt5-qtmultimedia-devel --- qgis.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qgis.spec b/qgis.spec index 1653561..54f5d61 100644 --- a/qgis.spec +++ b/qgis.spec @@ -70,6 +70,7 @@ BuildRequires: qt5-qt3d-devel BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qtlocation-devel +BuildRequires: qt5-qtmultimedia-devel BuildRequires: qt5-qtserialport-devel BuildRequires: qt5-qttools-static BuildRequires: qt5-qtwebkit-devel From a037924aa088f0ca96c4f7a635250fcf97b6febd Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 31 Mar 2023 14:53:48 +0200 Subject: [PATCH 107/201] Update to 3.30.1 --- .gitignore | 2 ++ ....0-vendor-licenses.txt => qgis-3.30.1-vendor-licenses.txt | 2 +- qgis.spec | 5 ++++- sources | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) rename qgis-3.30.0-vendor-licenses.txt => qgis-3.30.1-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 3a90510..0e28aa3 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,5 @@ qgis_1.5.0.tar.gz /qgis-3.28.3-vendor.tar.xz /qgis-3.30.0.tar.bz2 /qgis-3.30.0-vendor.tar.xz +/qgis-3.30.1.tar.bz2 +/qgis-3.30.1-vendor.tar.xz diff --git a/qgis-3.30.0-vendor-licenses.txt b/qgis-3.30.1-vendor-licenses.txt similarity index 97% rename from qgis-3.30.0-vendor-licenses.txt rename to qgis-3.30.1-vendor-licenses.txt index b19f645..6acd54d 100644 --- a/qgis-3.30.0-vendor-licenses.txt +++ b/qgis-3.30.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.69s. +Done in 3.03s. diff --git a/qgis.spec b/qgis.spec index 54f5d61..1884ee2 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.30.0 +Version: 3.30.1 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Mar 31 2023 Sandro Mani - 3.30.1-1 +- Update to 3.30.1 + * Sat Mar 04 2023 Sandro Mani - 3.30.0-1 - Update to 3.30.0 diff --git a/sources b/sources index e0cebaf..7fb2e38 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.30.0.tar.bz2) = d59fb546fda2981f8bace939cdd61474c70ac26bf4fcaf3e987ce1012a1782630eb34b65710e22ac925158c9ca95a73c9030ebcea1e3c64adeb49aca4b77b9af -SHA512 (qgis-3.30.0-vendor.tar.xz) = ad4deb2c5b0ab75b876773fcbf772db8a291777a990dedf8338b490d1f6541877a6fad15d1f2e9a9d8ad6b0a70090ff821c097cdcd9ac418396793e4dd8ecfd3 +SHA512 (qgis-3.30.1.tar.bz2) = 11fe1b42a22be1cdf2761077ec817c1a3075a482123f58883e8f4a3913d848b964c5cfdfa7b431a5a7f76f609599b2d2772e71e43f1247f739413ad46c4c104b +SHA512 (qgis-3.30.1-vendor.tar.xz) = 452073d86d3d67d690c4f39a5da987cf8fd1884b6b0488e9458bce5f0b929293f6430f146a5683fdbe572575f61a532569b311f2649ec2a42392947e57db41a3 From 15c440254984add3386f0f8572244682c8ba8003 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 31 Mar 2023 15:12:41 +0200 Subject: [PATCH 108/201] Rebase patches --- qgis-gcc13.patch | 20 ++++++++++---------- qgis-qwt.patch | 16 ++++++++-------- qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index e30f16e..0a704f5 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.3/external/lazperf/Extractor.hpp qgis-3.28.3-new/external/lazperf/Extractor.hpp ---- qgis-3.28.3/external/lazperf/Extractor.hpp 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/external/lazperf/Extractor.hpp 2023-01-27 14:51:19.274996167 +0100 +diff -rupN --no-dereference qgis-3.30.1/external/lazperf/Extractor.hpp qgis-3.30.1-new/external/lazperf/Extractor.hpp +--- qgis-3.30.1/external/lazperf/Extractor.hpp 2023-03-31 14:29:15.000000000 +0200 ++++ qgis-3.30.1-new/external/lazperf/Extractor.hpp 2023-03-31 15:06:13.502823958 +0200 @@ -34,6 +34,7 @@ #pragma once @@ -8,10 +8,10 @@ diff -rupN --no-dereference qgis-3.28.3/external/lazperf/Extractor.hpp qgis-3.28 +#include #include #include - -diff -rupN --no-dereference qgis-3.28.3/external/untwine/api/QgisUntwine.hpp qgis-3.28.3-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.28.3/external/untwine/api/QgisUntwine.hpp 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/external/untwine/api/QgisUntwine.hpp 2023-01-27 14:51:19.275996168 +0100 + #include +diff -rupN --no-dereference qgis-3.30.1/external/untwine/api/QgisUntwine.hpp qgis-3.30.1-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.30.1/external/untwine/api/QgisUntwine.hpp 2023-03-31 14:29:15.000000000 +0200 ++++ qgis-3.30.1-new/external/untwine/api/QgisUntwine.hpp 2023-03-31 15:06:13.503823955 +0200 @@ -1,5 +1,6 @@ #pragma once @@ -19,9 +19,9 @@ diff -rupN --no-dereference qgis-3.28.3/external/untwine/api/QgisUntwine.hpp qgi #include #include #include -diff -rupN --no-dereference qgis-3.28.3/external/untwine/untwine/VoxelKey.hpp qgis-3.28.3-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.28.3/external/untwine/untwine/VoxelKey.hpp 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/external/untwine/untwine/VoxelKey.hpp 2023-01-27 14:51:19.275996168 +0100 +diff -rupN --no-dereference qgis-3.30.1/external/untwine/untwine/VoxelKey.hpp qgis-3.30.1-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.30.1/external/untwine/untwine/VoxelKey.hpp 2023-03-31 14:29:15.000000000 +0200 ++++ qgis-3.30.1-new/external/untwine/untwine/VoxelKey.hpp 2023-03-31 15:06:13.503823955 +0200 @@ -12,6 +12,7 @@ #include diff --git a/qgis-qwt.patch b/qgis-qwt.patch index ccc5810..f4ab0de 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.3/cmake/FindQwtPolar.cmake qgis-3.28.3-new/cmake/FindQwtPolar.cmake ---- qgis-3.28.3/cmake/FindQwtPolar.cmake 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/cmake/FindQwtPolar.cmake 2023-01-27 14:51:14.223989557 +0100 +diff -rupN --no-dereference qgis-3.30.1/cmake/FindQwtPolar.cmake qgis-3.30.1-new/cmake/FindQwtPolar.cmake +--- qgis-3.30.1/cmake/FindQwtPolar.cmake 2023-03-31 14:29:15.000000000 +0200 ++++ qgis-3.30.1-new/cmake/FindQwtPolar.cmake 2023-03-31 15:06:09.650833526 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,10 +35,10 @@ diff -rupN --no-dereference qgis-3.28.3/cmake/FindQwtPolar.cmake qgis-3.28.3-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.28.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.28.3-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.28.3/src/app/gps/qgsgpsinformationwidget.cpp 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-01-27 14:51:14.224989558 +0100 -@@ -825,7 +825,7 @@ void QgsGpsInformationWidget::displayGPS +diff -rupN --no-dereference qgis-3.30.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.30.1-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.30.1/src/app/gps/qgsgpsinformationwidget.cpp 2023-03-31 14:29:15.000000000 +0200 ++++ qgis-3.30.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-03-31 15:06:09.650833526 +0200 +@@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR QwtPolarMarker *mypMarker = new QwtPolarMarker(); @@ -47,7 +47,7 @@ diff -rupN --no-dereference qgis-3.28.3/src/app/gps/qgsgpsinformationwidget.cpp mypMarker->setPosition( QwtPolarPoint( currentInfo.azimuth, currentInfo.elevation ) ); #else mypMarker->setPosition( QwtPointPolar( currentInfo.azimuth, currentInfo.elevation ) ); -@@ -843,7 +843,7 @@ void QgsGpsInformationWidget::displayGPS +@@ -426,7 +426,7 @@ void QgsGpsInformationWidget::displayGPS QBrush symbolBrush( Qt::black ); QSize markerSize( 9, 9 ); QBrush textBgBrush( bg ); diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 0f10e01..3a06ffd 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.28.3/src/core/qgsapplication.cpp qgis-3.28.3-new/src/core/qgsapplication.cpp ---- qgis-3.28.3/src/core/qgsapplication.cpp 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/src/core/qgsapplication.cpp 2023-01-27 14:51:03.832975820 +0100 -@@ -369,6 +369,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.30.1/src/core/qgsapplication.cpp qgis-3.30.1-new/src/core/qgsapplication.cpp +--- qgis-3.30.1/src/core/qgsapplication.cpp 2023-03-31 14:29:15.000000000 +0200 ++++ qgis-3.30.1-new/src/core/qgsapplication.cpp 2023-03-31 15:05:58.429861613 +0200 +@@ -386,6 +386,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 82231b1..559a062 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.3/resources/CMakeLists.txt qgis-3.28.3-new/resources/CMakeLists.txt ---- qgis-3.28.3/resources/CMakeLists.txt 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/resources/CMakeLists.txt 2023-01-27 14:51:09.171982902 +0100 +diff -rupN --no-dereference qgis-3.30.1/resources/CMakeLists.txt qgis-3.30.1-new/resources/CMakeLists.txt +--- qgis-3.30.1/resources/CMakeLists.txt 2023-03-31 14:29:15.000000000 +0200 ++++ qgis-3.30.1-new/resources/CMakeLists.txt 2023-03-31 15:06:04.965845214 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ From 6ec8d66b918e71e7997ba45b645b6a3e55581068 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 4 Apr 2023 15:48:17 +0200 Subject: [PATCH 109/201] Disable parallel build --- qgis.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qgis.spec b/qgis.spec index 1884ee2..d1a7123 100644 --- a/qgis.spec +++ b/qgis.spec @@ -188,6 +188,7 @@ gzip ChangeLog -D WITH_QSPATIALITE:BOOL=TRUE \ -D WITH_SERVER_LANDINGPAGE_WEBAPP=ON export YARN_CACHE_FOLDER="$PWD/.package-cache" +%global _smp_mflags -j1 %cmake_build From d8475c4a2bd5c475f6f76adbae4191271a16581f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 30 Apr 2023 15:34:23 +0200 Subject: [PATCH 110/201] Update to 3.30.2 --- .gitignore | 2 ++ ....1-vendor-licenses.txt => qgis-3.30.2-vendor-licenses.txt | 2 +- qgis.spec | 5 ++++- sources | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) rename qgis-3.30.1-vendor-licenses.txt => qgis-3.30.2-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 0e28aa3..e1ec4e6 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,5 @@ qgis_1.5.0.tar.gz /qgis-3.30.0-vendor.tar.xz /qgis-3.30.1.tar.bz2 /qgis-3.30.1-vendor.tar.xz +/qgis-3.30.2.tar.bz2 +/qgis-3.30.2-vendor.tar.xz diff --git a/qgis-3.30.1-vendor-licenses.txt b/qgis-3.30.2-vendor-licenses.txt similarity index 97% rename from qgis-3.30.1-vendor-licenses.txt rename to qgis-3.30.2-vendor-licenses.txt index 6acd54d..1ca310f 100644 --- a/qgis-3.30.1-vendor-licenses.txt +++ b/qgis-3.30.2-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 3.03s. +Done in 2.96s. diff --git a/qgis.spec b/qgis.spec index d1a7123..39402e5 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.30.1 +Version: 3.30.2 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -306,6 +306,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Apr 30 2023 Sandro Mani - 3.30.2-1 +- Update to 3.30.2 + * Fri Mar 31 2023 Sandro Mani - 3.30.1-1 - Update to 3.30.1 diff --git a/sources b/sources index 7fb2e38..eeafbd8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.30.1.tar.bz2) = 11fe1b42a22be1cdf2761077ec817c1a3075a482123f58883e8f4a3913d848b964c5cfdfa7b431a5a7f76f609599b2d2772e71e43f1247f739413ad46c4c104b -SHA512 (qgis-3.30.1-vendor.tar.xz) = 452073d86d3d67d690c4f39a5da987cf8fd1884b6b0488e9458bce5f0b929293f6430f146a5683fdbe572575f61a532569b311f2649ec2a42392947e57db41a3 +SHA512 (qgis-3.30.2.tar.bz2) = 03b879dc0a1df2ffc5284642f81b885c29a2d6b9a73e3ce1022009f410abf8e440652f774e1e4f26b8e2511d37897a7414b88d29ec107deddb71fc171d6b019e +SHA512 (qgis-3.30.2-vendor.tar.xz) = f007a4d8512866df688ec1d3a5e056e9b0dc5a112fe74f528432d41024793d45b08e30176bc3f0627e4f088ca2502f14be161535ea87c5e94fa416929d4c21b2 From 777b9ff88346fb95967874397b546394e6cd3ba0 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 4 May 2023 10:20:30 +0200 Subject: [PATCH 111/201] Hackishly relax node requirement --- qgis.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qgis.spec b/qgis.spec index 39402e5..a92773b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -165,6 +165,8 @@ install -pm0644 %{SOURCE4} . gzip ChangeLog +sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19"/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19 || 20"/' $(find "$PWD/.package-cache" | grep 'node_modules/@achrinza/node-ipc/package.json') +sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19"/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19 || 20"/' $(find "$PWD/.package-cache" | grep 'node_modules/@achrinza/node-ipc/.yarn-metadata.json') %build %cmake \ From 40c8c7d3fd4fcc6c7cdb61a329610c67c2c5cb6f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 11 May 2023 20:34:47 +0200 Subject: [PATCH 112/201] Rebuild (gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index a92773b..0698dae 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.30.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Thu May 11 2023 Sandro Mani - 3.30.2-2 +- Rebuild (gdal) + * Sun Apr 30 2023 Sandro Mani - 3.30.2-1 - Update to 3.30.2 From d1b7ff3477e2871d331c30d884a102b1e6c6c33e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 26 May 2023 23:46:24 +0200 Subject: [PATCH 113/201] Update to 3.30.3 --- .gitignore | 2 ++ prepare_vendor.sh | 4 ++-- ...nses.txt => qgis-3.30.3-vendor-licenses.txt | 2 +- qgis-gcc13.patch | 18 +++++++++--------- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 9 files changed, 33 insertions(+), 28 deletions(-) rename qgis-3.30.2-vendor-licenses.txt => qgis-3.30.3-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index e1ec4e6..e34e4ba 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,5 @@ qgis_1.5.0.tar.gz /qgis-3.30.1-vendor.tar.xz /qgis-3.30.2.tar.bz2 /qgis-3.30.2-vendor.tar.xz +/qgis-3.30.3.tar.bz2 +/qgis-3.30.3-vendor.tar.xz diff --git a/prepare_vendor.sh b/prepare_vendor.sh index 89ad343..c40de44 100755 --- a/prepare_vendor.sh +++ b/prepare_vendor.sh @@ -43,7 +43,7 @@ pushd $PKG_PATH export YARN_CACHE_FOLDER="$(pwd)/.package-cache" echo ">>>>>> Install npm modules" -yarn install --frozen-lockfile +yarn install --frozen-lockfile --ignore-engines if [ $? -ne 0 ]; then echo "ERROR: yarn install failed" cleanup_and_exit 1 @@ -92,7 +92,7 @@ if [ $? -ne 0 ]; then cleanup_and_exit 1 fi -yarn add license-checker +yarn add license-checker --ignore-engines yarn license-checker --summary | sed "s#$PKG_PATH#/tmp#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt diff --git a/qgis-3.30.2-vendor-licenses.txt b/qgis-3.30.3-vendor-licenses.txt similarity index 97% rename from qgis-3.30.2-vendor-licenses.txt rename to qgis-3.30.3-vendor-licenses.txt index 1ca310f..a7e3197 100644 --- a/qgis-3.30.2-vendor-licenses.txt +++ b/qgis-3.30.3-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.96s. +Done in 2.74s. diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index 0a704f5..1caed8d 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.30.1/external/lazperf/Extractor.hpp qgis-3.30.1-new/external/lazperf/Extractor.hpp ---- qgis-3.30.1/external/lazperf/Extractor.hpp 2023-03-31 14:29:15.000000000 +0200 -+++ qgis-3.30.1-new/external/lazperf/Extractor.hpp 2023-03-31 15:06:13.502823958 +0200 +diff -rupN --no-dereference qgis-3.30.3/external/lazperf/Extractor.hpp qgis-3.30.3-new/external/lazperf/Extractor.hpp +--- qgis-3.30.3/external/lazperf/Extractor.hpp 2023-05-26 14:01:43.000000000 +0200 ++++ qgis-3.30.3-new/external/lazperf/Extractor.hpp 2023-05-26 23:35:03.552333965 +0200 @@ -34,6 +34,7 @@ #pragma once @@ -9,9 +9,9 @@ diff -rupN --no-dereference qgis-3.30.1/external/lazperf/Extractor.hpp qgis-3.30 #include #include #include -diff -rupN --no-dereference qgis-3.30.1/external/untwine/api/QgisUntwine.hpp qgis-3.30.1-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.30.1/external/untwine/api/QgisUntwine.hpp 2023-03-31 14:29:15.000000000 +0200 -+++ qgis-3.30.1-new/external/untwine/api/QgisUntwine.hpp 2023-03-31 15:06:13.503823955 +0200 +diff -rupN --no-dereference qgis-3.30.3/external/untwine/api/QgisUntwine.hpp qgis-3.30.3-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.30.3/external/untwine/api/QgisUntwine.hpp 2023-05-26 14:01:43.000000000 +0200 ++++ qgis-3.30.3-new/external/untwine/api/QgisUntwine.hpp 2023-05-26 23:35:03.552333965 +0200 @@ -1,5 +1,6 @@ #pragma once @@ -19,9 +19,9 @@ diff -rupN --no-dereference qgis-3.30.1/external/untwine/api/QgisUntwine.hpp qgi #include #include #include -diff -rupN --no-dereference qgis-3.30.1/external/untwine/untwine/VoxelKey.hpp qgis-3.30.1-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.30.1/external/untwine/untwine/VoxelKey.hpp 2023-03-31 14:29:15.000000000 +0200 -+++ qgis-3.30.1-new/external/untwine/untwine/VoxelKey.hpp 2023-03-31 15:06:13.503823955 +0200 +diff -rupN --no-dereference qgis-3.30.3/external/untwine/untwine/VoxelKey.hpp qgis-3.30.3-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.30.3/external/untwine/untwine/VoxelKey.hpp 2023-05-26 14:01:43.000000000 +0200 ++++ qgis-3.30.3-new/external/untwine/untwine/VoxelKey.hpp 2023-05-26 23:35:03.552333965 +0200 @@ -12,6 +12,7 @@ #include diff --git a/qgis-qwt.patch b/qgis-qwt.patch index f4ab0de..13e06b9 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.30.1/cmake/FindQwtPolar.cmake qgis-3.30.1-new/cmake/FindQwtPolar.cmake ---- qgis-3.30.1/cmake/FindQwtPolar.cmake 2023-03-31 14:29:15.000000000 +0200 -+++ qgis-3.30.1-new/cmake/FindQwtPolar.cmake 2023-03-31 15:06:09.650833526 +0200 +diff -rupN --no-dereference qgis-3.30.3/cmake/FindQwtPolar.cmake qgis-3.30.3-new/cmake/FindQwtPolar.cmake +--- qgis-3.30.3/cmake/FindQwtPolar.cmake 2023-05-26 14:01:43.000000000 +0200 ++++ qgis-3.30.3-new/cmake/FindQwtPolar.cmake 2023-05-26 23:35:00.703268326 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.30.1/cmake/FindQwtPolar.cmake qgis-3.30.1-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.30.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.30.1-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.30.1/src/app/gps/qgsgpsinformationwidget.cpp 2023-03-31 14:29:15.000000000 +0200 -+++ qgis-3.30.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-03-31 15:06:09.650833526 +0200 +diff -rupN --no-dereference qgis-3.30.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.30.3-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.30.3/src/app/gps/qgsgpsinformationwidget.cpp 2023-05-26 14:01:43.000000000 +0200 ++++ qgis-3.30.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-05-26 23:35:00.704268349 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 3a06ffd..fc20795 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.30.1/src/core/qgsapplication.cpp qgis-3.30.1-new/src/core/qgsapplication.cpp ---- qgis-3.30.1/src/core/qgsapplication.cpp 2023-03-31 14:29:15.000000000 +0200 -+++ qgis-3.30.1-new/src/core/qgsapplication.cpp 2023-03-31 15:05:58.429861613 +0200 +diff -rupN --no-dereference qgis-3.30.3/src/core/qgsapplication.cpp qgis-3.30.3-new/src/core/qgsapplication.cpp +--- qgis-3.30.3/src/core/qgsapplication.cpp 2023-05-26 14:01:43.000000000 +0200 ++++ qgis-3.30.3-new/src/core/qgsapplication.cpp 2023-05-26 23:34:55.053138231 +0200 @@ -386,6 +386,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 559a062..5e9a4ba 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.30.1/resources/CMakeLists.txt qgis-3.30.1-new/resources/CMakeLists.txt ---- qgis-3.30.1/resources/CMakeLists.txt 2023-03-31 14:29:15.000000000 +0200 -+++ qgis-3.30.1-new/resources/CMakeLists.txt 2023-03-31 15:06:04.965845214 +0200 +diff -rupN --no-dereference qgis-3.30.3/resources/CMakeLists.txt qgis-3.30.3-new/resources/CMakeLists.txt +--- qgis-3.30.3/resources/CMakeLists.txt 2023-05-26 14:01:43.000000000 +0200 ++++ qgis-3.30.3-new/resources/CMakeLists.txt 2023-05-26 23:34:57.858202805 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 0698dae..ac75dc9 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.30.2 -Release: 2%{?dist} +Version: 3.30.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri May 26 2023 Sandro Mani - 3.30.3-1 +- Update to 3.30.3 + * Thu May 11 2023 Sandro Mani - 3.30.2-2 - Rebuild (gdal) diff --git a/sources b/sources index eeafbd8..e6e1e9d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.30.2.tar.bz2) = 03b879dc0a1df2ffc5284642f81b885c29a2d6b9a73e3ce1022009f410abf8e440652f774e1e4f26b8e2511d37897a7414b88d29ec107deddb71fc171d6b019e -SHA512 (qgis-3.30.2-vendor.tar.xz) = f007a4d8512866df688ec1d3a5e056e9b0dc5a112fe74f528432d41024793d45b08e30176bc3f0627e4f088ca2502f14be161535ea87c5e94fa416929d4c21b2 +SHA512 (qgis-3.30.3.tar.bz2) = f8d95f8676db4b649fa6e669cee8b9ae30485a8cfbde8eaa3530618b0902fd71313bdb87f282d1b4ad3a05d1efc52da3805f9bf9b157691b0571f0a12dee3f9a +SHA512 (qgis-3.30.3-vendor.tar.xz) = a5f9eb58bd9c08baf500e3526eecd648cff486f7e9f6f362e5d0044e6473f4486f47eb7695747cd9d9229de01dc6a652427696d98fe179f7dfe6a9f3818642f8 From 67875dd943434abed6de26f5a3c42d59ca440801 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 18:21:30 +0200 Subject: [PATCH 114/201] Rebuilt for Python 3.12 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index ac75dc9..c86aa8b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.30.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jun 16 2023 Python Maint - 3.30.3-2 +- Rebuilt for Python 3.12 + * Fri May 26 2023 Sandro Mani - 3.30.3-1 - Update to 3.30.3 From d82319409de315ce83cd20efd51c0cf5dd6b6d0d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 18 Jul 2023 09:58:59 +0200 Subject: [PATCH 115/201] Update to 3.32.0 --- .gitignore | 2 ++ qgis-gcc13.patch | 22 +++++++++++----------- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 7 files changed, 33 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index e34e4ba..dd443f3 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,5 @@ qgis_1.5.0.tar.gz /qgis-3.30.2-vendor.tar.xz /qgis-3.30.3.tar.bz2 /qgis-3.30.3-vendor.tar.xz +/qgis-3.32.0.tar.bz2 +/qgis-3.32.0-vendor.tar.xz diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index 1caed8d..e331b25 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.30.3/external/lazperf/Extractor.hpp qgis-3.30.3-new/external/lazperf/Extractor.hpp ---- qgis-3.30.3/external/lazperf/Extractor.hpp 2023-05-26 14:01:43.000000000 +0200 -+++ qgis-3.30.3-new/external/lazperf/Extractor.hpp 2023-05-26 23:35:03.552333965 +0200 +diff -rupN --no-dereference qgis-3.32.0/external/lazperf/Extractor.hpp qgis-3.32.0-new/external/lazperf/Extractor.hpp +--- qgis-3.32.0/external/lazperf/Extractor.hpp 2023-06-23 14:40:51.000000000 +0200 ++++ qgis-3.32.0-new/external/lazperf/Extractor.hpp 2023-06-26 09:34:06.008775993 +0200 @@ -34,6 +34,7 @@ #pragma once @@ -9,9 +9,9 @@ diff -rupN --no-dereference qgis-3.30.3/external/lazperf/Extractor.hpp qgis-3.30 #include #include #include -diff -rupN --no-dereference qgis-3.30.3/external/untwine/api/QgisUntwine.hpp qgis-3.30.3-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.30.3/external/untwine/api/QgisUntwine.hpp 2023-05-26 14:01:43.000000000 +0200 -+++ qgis-3.30.3-new/external/untwine/api/QgisUntwine.hpp 2023-05-26 23:35:03.552333965 +0200 +diff -rupN --no-dereference qgis-3.32.0/external/untwine/api/QgisUntwine.hpp qgis-3.32.0-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.32.0/external/untwine/api/QgisUntwine.hpp 2023-06-23 14:40:51.000000000 +0200 ++++ qgis-3.32.0-new/external/untwine/api/QgisUntwine.hpp 2023-06-26 09:34:06.008775993 +0200 @@ -1,5 +1,6 @@ #pragma once @@ -19,12 +19,12 @@ diff -rupN --no-dereference qgis-3.30.3/external/untwine/api/QgisUntwine.hpp qgi #include #include #include -diff -rupN --no-dereference qgis-3.30.3/external/untwine/untwine/VoxelKey.hpp qgis-3.30.3-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.30.3/external/untwine/untwine/VoxelKey.hpp 2023-05-26 14:01:43.000000000 +0200 -+++ qgis-3.30.3-new/external/untwine/untwine/VoxelKey.hpp 2023-05-26 23:35:03.552333965 +0200 -@@ -12,6 +12,7 @@ - +diff -rupN --no-dereference qgis-3.32.0/external/untwine/untwine/VoxelKey.hpp qgis-3.32.0-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.32.0/external/untwine/untwine/VoxelKey.hpp 2023-06-23 14:40:51.000000000 +0200 ++++ qgis-3.32.0-new/external/untwine/untwine/VoxelKey.hpp 2023-06-26 09:34:06.008775993 +0200 +@@ -13,6 +13,7 @@ #include + #include #include +#include diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 13e06b9..9923df3 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.30.3/cmake/FindQwtPolar.cmake qgis-3.30.3-new/cmake/FindQwtPolar.cmake ---- qgis-3.30.3/cmake/FindQwtPolar.cmake 2023-05-26 14:01:43.000000000 +0200 -+++ qgis-3.30.3-new/cmake/FindQwtPolar.cmake 2023-05-26 23:35:00.703268326 +0200 +diff -rupN --no-dereference qgis-3.32.0/cmake/FindQwtPolar.cmake qgis-3.32.0-new/cmake/FindQwtPolar.cmake +--- qgis-3.32.0/cmake/FindQwtPolar.cmake 2023-06-23 14:40:51.000000000 +0200 ++++ qgis-3.32.0-new/cmake/FindQwtPolar.cmake 2023-06-26 09:34:03.421816762 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.30.3/cmake/FindQwtPolar.cmake qgis-3.30.3-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.30.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.30.3-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.30.3/src/app/gps/qgsgpsinformationwidget.cpp 2023-05-26 14:01:43.000000000 +0200 -+++ qgis-3.30.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-05-26 23:35:00.704268349 +0200 +diff -rupN --no-dereference qgis-3.32.0/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.32.0-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.32.0/src/app/gps/qgsgpsinformationwidget.cpp 2023-06-23 14:40:51.000000000 +0200 ++++ qgis-3.32.0-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-06-26 09:34:03.421816762 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index fc20795..6c7c5d9 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.30.3/src/core/qgsapplication.cpp qgis-3.30.3-new/src/core/qgsapplication.cpp ---- qgis-3.30.3/src/core/qgsapplication.cpp 2023-05-26 14:01:43.000000000 +0200 -+++ qgis-3.30.3-new/src/core/qgsapplication.cpp 2023-05-26 23:34:55.053138231 +0200 -@@ -386,6 +386,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.32.0/src/core/qgsapplication.cpp qgis-3.32.0-new/src/core/qgsapplication.cpp +--- qgis-3.32.0/src/core/qgsapplication.cpp 2023-06-23 14:40:51.000000000 +0200 ++++ qgis-3.32.0-new/src/core/qgsapplication.cpp 2023-06-26 09:33:57.864894199 +0200 +@@ -356,6 +356,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 5e9a4ba..8b604ec 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.30.3/resources/CMakeLists.txt qgis-3.30.3-new/resources/CMakeLists.txt ---- qgis-3.30.3/resources/CMakeLists.txt 2023-05-26 14:01:43.000000000 +0200 -+++ qgis-3.30.3-new/resources/CMakeLists.txt 2023-05-26 23:34:57.858202805 +0200 +diff -rupN --no-dereference qgis-3.32.0/resources/CMakeLists.txt qgis-3.32.0-new/resources/CMakeLists.txt +--- qgis-3.32.0/resources/CMakeLists.txt 2023-06-23 14:40:51.000000000 +0200 ++++ qgis-3.32.0-new/resources/CMakeLists.txt 2023-06-26 09:34:00.758855644 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index c86aa8b..234810d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.30.3 -Release: 2%{?dist} +Version: 3.32.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Jun 26 2023 Sandro Mani - 3.32.0-1 +- Update to 3.32.0 + * Fri Jun 16 2023 Python Maint - 3.30.3-2 - Rebuilt for Python 3.12 diff --git a/sources b/sources index e6e1e9d..c65d746 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.30.3.tar.bz2) = f8d95f8676db4b649fa6e669cee8b9ae30485a8cfbde8eaa3530618b0902fd71313bdb87f282d1b4ad3a05d1efc52da3805f9bf9b157691b0571f0a12dee3f9a -SHA512 (qgis-3.30.3-vendor.tar.xz) = a5f9eb58bd9c08baf500e3526eecd648cff486f7e9f6f362e5d0044e6473f4486f47eb7695747cd9d9229de01dc6a652427696d98fe179f7dfe6a9f3818642f8 +SHA512 (qgis-3.32.0.tar.bz2) = 5d94e4d877f1d1a3539a4829e9b65025cb46a83fba41e5616c65c82ec9e376f112c1b585ccabb974d16d7e4a1ee6ad335b7c45837357d1a446686a28154484d3 +SHA512 (qgis-3.32.0-vendor.tar.xz) = 9453e58a20f597a29fed69fa95ab373de0dfcaf19294fedb9d9b113ade26721993ad687d14fd3e7fbcc34eb332cd365cfe81693ba5aea85e5f2388df8083cb5e From a71bb3f1eb592c38bf0d03338a06b48c660e5656 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 18 Jul 2023 10:18:04 +0200 Subject: [PATCH 116/201] Add qgis-3.32.0-vendor-licenses.txt --- ....30.3-vendor-licenses.txt => qgis-3.32.0-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.30.3-vendor-licenses.txt => qgis-3.32.0-vendor-licenses.txt (97%) diff --git a/qgis-3.30.3-vendor-licenses.txt b/qgis-3.32.0-vendor-licenses.txt similarity index 97% rename from qgis-3.30.3-vendor-licenses.txt rename to qgis-3.32.0-vendor-licenses.txt index a7e3197..5e3d691 100644 --- a/qgis-3.30.3-vendor-licenses.txt +++ b/qgis-3.32.0-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.74s. +Done in 2.37s. From 1d809dfda12e86a1bc6e8ae0cd04d132aae87fee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 15:52:08 +0000 Subject: [PATCH 117/201] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 234810d..7238ea6 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.32.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 3.32.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 26 2023 Sandro Mani - 3.32.0-1 - Update to 3.32.0 From 3bd4d4df825fc8ebb2efa7f24d1c15685a9a0cd6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 26 Jul 2023 11:00:55 +0200 Subject: [PATCH 118/201] Update to 3.32.1 --- .gitignore | 2 ++ qgis-gcc13.patch | 18 +++++++++--------- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 7 files changed, 30 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index dd443f3..4c16295 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,5 @@ qgis_1.5.0.tar.gz /qgis-3.30.3-vendor.tar.xz /qgis-3.32.0.tar.bz2 /qgis-3.32.0-vendor.tar.xz +/qgis-3.32.1.tar.bz2 +/qgis-3.32.1-vendor.tar.xz diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index e331b25..cd11d00 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.0/external/lazperf/Extractor.hpp qgis-3.32.0-new/external/lazperf/Extractor.hpp ---- qgis-3.32.0/external/lazperf/Extractor.hpp 2023-06-23 14:40:51.000000000 +0200 -+++ qgis-3.32.0-new/external/lazperf/Extractor.hpp 2023-06-26 09:34:06.008775993 +0200 +diff -rupN --no-dereference qgis-3.32.1/external/lazperf/Extractor.hpp qgis-3.32.1-new/external/lazperf/Extractor.hpp +--- qgis-3.32.1/external/lazperf/Extractor.hpp 2023-07-21 14:13:30.000000000 +0200 ++++ qgis-3.32.1-new/external/lazperf/Extractor.hpp 2023-07-26 10:17:02.431337256 +0200 @@ -34,6 +34,7 @@ #pragma once @@ -9,9 +9,9 @@ diff -rupN --no-dereference qgis-3.32.0/external/lazperf/Extractor.hpp qgis-3.32 #include #include #include -diff -rupN --no-dereference qgis-3.32.0/external/untwine/api/QgisUntwine.hpp qgis-3.32.0-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.32.0/external/untwine/api/QgisUntwine.hpp 2023-06-23 14:40:51.000000000 +0200 -+++ qgis-3.32.0-new/external/untwine/api/QgisUntwine.hpp 2023-06-26 09:34:06.008775993 +0200 +diff -rupN --no-dereference qgis-3.32.1/external/untwine/api/QgisUntwine.hpp qgis-3.32.1-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.32.1/external/untwine/api/QgisUntwine.hpp 2023-07-21 14:13:30.000000000 +0200 ++++ qgis-3.32.1-new/external/untwine/api/QgisUntwine.hpp 2023-07-26 10:17:02.431337256 +0200 @@ -1,5 +1,6 @@ #pragma once @@ -19,9 +19,9 @@ diff -rupN --no-dereference qgis-3.32.0/external/untwine/api/QgisUntwine.hpp qgi #include #include #include -diff -rupN --no-dereference qgis-3.32.0/external/untwine/untwine/VoxelKey.hpp qgis-3.32.0-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.32.0/external/untwine/untwine/VoxelKey.hpp 2023-06-23 14:40:51.000000000 +0200 -+++ qgis-3.32.0-new/external/untwine/untwine/VoxelKey.hpp 2023-06-26 09:34:06.008775993 +0200 +diff -rupN --no-dereference qgis-3.32.1/external/untwine/untwine/VoxelKey.hpp qgis-3.32.1-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.32.1/external/untwine/untwine/VoxelKey.hpp 2023-07-21 14:13:30.000000000 +0200 ++++ qgis-3.32.1-new/external/untwine/untwine/VoxelKey.hpp 2023-07-26 10:17:02.431337256 +0200 @@ -13,6 +13,7 @@ #include #include diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 9923df3..97af45b 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.0/cmake/FindQwtPolar.cmake qgis-3.32.0-new/cmake/FindQwtPolar.cmake ---- qgis-3.32.0/cmake/FindQwtPolar.cmake 2023-06-23 14:40:51.000000000 +0200 -+++ qgis-3.32.0-new/cmake/FindQwtPolar.cmake 2023-06-26 09:34:03.421816762 +0200 +diff -rupN --no-dereference qgis-3.32.1/cmake/FindQwtPolar.cmake qgis-3.32.1-new/cmake/FindQwtPolar.cmake +--- qgis-3.32.1/cmake/FindQwtPolar.cmake 2023-07-21 14:13:30.000000000 +0200 ++++ qgis-3.32.1-new/cmake/FindQwtPolar.cmake 2023-07-26 10:16:59.929335761 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.32.0/cmake/FindQwtPolar.cmake qgis-3.32.0-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.32.0/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.32.0-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.32.0/src/app/gps/qgsgpsinformationwidget.cpp 2023-06-23 14:40:51.000000000 +0200 -+++ qgis-3.32.0-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-06-26 09:34:03.421816762 +0200 +diff -rupN --no-dereference qgis-3.32.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.32.1-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.32.1/src/app/gps/qgsgpsinformationwidget.cpp 2023-07-21 14:13:30.000000000 +0200 ++++ qgis-3.32.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-07-26 10:16:59.930335761 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 6c7c5d9..1533524 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.0/src/core/qgsapplication.cpp qgis-3.32.0-new/src/core/qgsapplication.cpp ---- qgis-3.32.0/src/core/qgsapplication.cpp 2023-06-23 14:40:51.000000000 +0200 -+++ qgis-3.32.0-new/src/core/qgsapplication.cpp 2023-06-26 09:33:57.864894199 +0200 +diff -rupN --no-dereference qgis-3.32.1/src/core/qgsapplication.cpp qgis-3.32.1-new/src/core/qgsapplication.cpp +--- qgis-3.32.1/src/core/qgsapplication.cpp 2023-07-21 14:13:30.000000000 +0200 ++++ qgis-3.32.1-new/src/core/qgsapplication.cpp 2023-07-26 10:16:54.630332413 +0200 @@ -356,6 +356,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 8b604ec..f2e5456 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.0/resources/CMakeLists.txt qgis-3.32.0-new/resources/CMakeLists.txt ---- qgis-3.32.0/resources/CMakeLists.txt 2023-06-23 14:40:51.000000000 +0200 -+++ qgis-3.32.0-new/resources/CMakeLists.txt 2023-06-26 09:34:00.758855644 +0200 +diff -rupN --no-dereference qgis-3.32.1/resources/CMakeLists.txt qgis-3.32.1-new/resources/CMakeLists.txt +--- qgis-3.32.1/resources/CMakeLists.txt 2023-07-21 14:13:30.000000000 +0200 ++++ qgis-3.32.1-new/resources/CMakeLists.txt 2023-07-26 10:16:57.269334110 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 7238ea6..6f14a11 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.32.0 -Release: 2%{?dist} +Version: 3.32.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Jul 25 2023 Sandro Mani - 3.32.1-1 +- Update to 3.32.1 + * Fri Jul 21 2023 Fedora Release Engineering - 3.32.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index c65d746..ba4b0f7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.32.0.tar.bz2) = 5d94e4d877f1d1a3539a4829e9b65025cb46a83fba41e5616c65c82ec9e376f112c1b585ccabb974d16d7e4a1ee6ad335b7c45837357d1a446686a28154484d3 -SHA512 (qgis-3.32.0-vendor.tar.xz) = 9453e58a20f597a29fed69fa95ab373de0dfcaf19294fedb9d9b113ade26721993ad687d14fd3e7fbcc34eb332cd365cfe81693ba5aea85e5f2388df8083cb5e +SHA512 (qgis-3.32.1.tar.bz2) = ae92755986ca339ba2a4c655e9c9bbdf97515790d0900bf09d436f79f9260b21b92b4f6e1a7f7e20727c3aa0a0233756e57bed85a9b9a06b2cc52537df33b4b6 +SHA512 (qgis-3.32.1-vendor.tar.xz) = 885ab7f9dbd4b845201f0aa6670a8ebfd08c093c9d36513d3b24fc30ab072fe8bdbabb2deb425a20ab954ccdabe600b911e9a15af72655295ac683f8bad17754 From e28e73c9c076171f6826b5204b8af50e81b7907e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 26 Jul 2023 11:02:01 +0200 Subject: [PATCH 119/201] Add qgis-3.32.1-vendor-licenses.txt --- ....32.0-vendor-licenses.txt => qgis-3.32.1-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.32.0-vendor-licenses.txt => qgis-3.32.1-vendor-licenses.txt (97%) diff --git a/qgis-3.32.0-vendor-licenses.txt b/qgis-3.32.1-vendor-licenses.txt similarity index 97% rename from qgis-3.32.0-vendor-licenses.txt rename to qgis-3.32.1-vendor-licenses.txt index 5e3d691..71c59aa 100644 --- a/qgis-3.32.0-vendor-licenses.txt +++ b/qgis-3.32.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.37s. +Done in 3.16s. From 6998dde5ea489b51aaff88c137173ae90c2c7db0 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 16 Aug 2023 00:43:27 +0200 Subject: [PATCH 120/201] Rebuild (libspatialite) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 6f14a11..7e1e76c 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.32.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Aug 15 2023 Sandro Mani - 3.32.1-2 +- Rebuild (libspatialite) + * Tue Jul 25 2023 Sandro Mani - 3.32.1-1 - Update to 3.32.1 From e8c15132d5ed520179ecca7eb7a217a6ae0a10e6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 20 Aug 2023 20:12:02 +0200 Subject: [PATCH 121/201] Update to 3.22.2 --- .gitignore | 2 ++ ...-vendor-licenses.txt => qgis-3.32.2-vendor-licenses.txt | 2 +- qgis.spec | 7 +++++-- sources | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) rename qgis-3.32.1-vendor-licenses.txt => qgis-3.32.2-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 4c16295..76426d4 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,5 @@ qgis_1.5.0.tar.gz /qgis-3.32.0-vendor.tar.xz /qgis-3.32.1.tar.bz2 /qgis-3.32.1-vendor.tar.xz +/qgis-3.32.2.tar.bz2 +/qgis-3.32.2-vendor.tar.xz diff --git a/qgis-3.32.1-vendor-licenses.txt b/qgis-3.32.2-vendor-licenses.txt similarity index 97% rename from qgis-3.32.1-vendor-licenses.txt rename to qgis-3.32.2-vendor-licenses.txt index 71c59aa..6d1e6f6 100644 --- a/qgis-3.32.1-vendor-licenses.txt +++ b/qgis-3.32.2-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 3.16s. +Done in 2.32s. diff --git a/qgis.spec b/qgis.spec index 7e1e76c..eb2cd70 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.32.1 -Release: 2%{?dist} +Version: 3.32.2 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Aug 19 2023 Sandro Mani - 3.32.2-1 +- Update to 3.32.2 + * Tue Aug 15 2023 Sandro Mani - 3.32.1-2 - Rebuild (libspatialite) diff --git a/sources b/sources index ba4b0f7..4945329 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.32.1.tar.bz2) = ae92755986ca339ba2a4c655e9c9bbdf97515790d0900bf09d436f79f9260b21b92b4f6e1a7f7e20727c3aa0a0233756e57bed85a9b9a06b2cc52537df33b4b6 -SHA512 (qgis-3.32.1-vendor.tar.xz) = 885ab7f9dbd4b845201f0aa6670a8ebfd08c093c9d36513d3b24fc30ab072fe8bdbabb2deb425a20ab954ccdabe600b911e9a15af72655295ac683f8bad17754 +SHA512 (qgis-3.32.2.tar.bz2) = 5b8766506e129259c840ffa1b56c8f78ed6af3c05e42bb064b8f14f3ce60bcbbe74e499f98aed1d564392527fd25fdabc0326da074e726a2f5a7fd7cf9a9c3ea +SHA512 (qgis-3.32.2-vendor.tar.xz) = eedd483fc34885344f4e0990fb17f4f49be7acf3480fe898e3809b8ed7dc44333a282760fea54f2d4df3eee4dd202fd688cfaeac345b5ae46f54b94ef2270ae6 From 32f53bdcc94564e7a807dfc8867ddbac35a7f29f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 18 Sep 2023 10:34:56 +0200 Subject: [PATCH 122/201] Update to 3.32.3 --- .gitignore | 2 ++ qgis-gcc13.patch | 18 +++++++++--------- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 7 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 76426d4..1b94a9d 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,5 @@ qgis_1.5.0.tar.gz /qgis-3.32.1-vendor.tar.xz /qgis-3.32.2.tar.bz2 /qgis-3.32.2-vendor.tar.xz +/qgis-3.32.3-vendor.tar.xz +/qgis-3.32.3.tar.bz2 diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index cd11d00..dcff5b8 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.1/external/lazperf/Extractor.hpp qgis-3.32.1-new/external/lazperf/Extractor.hpp ---- qgis-3.32.1/external/lazperf/Extractor.hpp 2023-07-21 14:13:30.000000000 +0200 -+++ qgis-3.32.1-new/external/lazperf/Extractor.hpp 2023-07-26 10:17:02.431337256 +0200 +diff -rupN --no-dereference qgis-3.32.3/external/lazperf/Extractor.hpp qgis-3.32.3-new/external/lazperf/Extractor.hpp +--- qgis-3.32.3/external/lazperf/Extractor.hpp 2023-09-15 14:04:20.000000000 +0200 ++++ qgis-3.32.3-new/external/lazperf/Extractor.hpp 2023-09-18 10:18:19.702678112 +0200 @@ -34,6 +34,7 @@ #pragma once @@ -9,9 +9,9 @@ diff -rupN --no-dereference qgis-3.32.1/external/lazperf/Extractor.hpp qgis-3.32 #include #include #include -diff -rupN --no-dereference qgis-3.32.1/external/untwine/api/QgisUntwine.hpp qgis-3.32.1-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.32.1/external/untwine/api/QgisUntwine.hpp 2023-07-21 14:13:30.000000000 +0200 -+++ qgis-3.32.1-new/external/untwine/api/QgisUntwine.hpp 2023-07-26 10:17:02.431337256 +0200 +diff -rupN --no-dereference qgis-3.32.3/external/untwine/api/QgisUntwine.hpp qgis-3.32.3-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.32.3/external/untwine/api/QgisUntwine.hpp 2023-09-15 14:04:20.000000000 +0200 ++++ qgis-3.32.3-new/external/untwine/api/QgisUntwine.hpp 2023-09-18 10:18:19.703678089 +0200 @@ -1,5 +1,6 @@ #pragma once @@ -19,9 +19,9 @@ diff -rupN --no-dereference qgis-3.32.1/external/untwine/api/QgisUntwine.hpp qgi #include #include #include -diff -rupN --no-dereference qgis-3.32.1/external/untwine/untwine/VoxelKey.hpp qgis-3.32.1-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.32.1/external/untwine/untwine/VoxelKey.hpp 2023-07-21 14:13:30.000000000 +0200 -+++ qgis-3.32.1-new/external/untwine/untwine/VoxelKey.hpp 2023-07-26 10:17:02.431337256 +0200 +diff -rupN --no-dereference qgis-3.32.3/external/untwine/untwine/VoxelKey.hpp qgis-3.32.3-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.32.3/external/untwine/untwine/VoxelKey.hpp 2023-09-15 14:04:20.000000000 +0200 ++++ qgis-3.32.3-new/external/untwine/untwine/VoxelKey.hpp 2023-09-18 10:18:19.704678066 +0200 @@ -13,6 +13,7 @@ #include #include diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 97af45b..7feb24b 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.1/cmake/FindQwtPolar.cmake qgis-3.32.1-new/cmake/FindQwtPolar.cmake ---- qgis-3.32.1/cmake/FindQwtPolar.cmake 2023-07-21 14:13:30.000000000 +0200 -+++ qgis-3.32.1-new/cmake/FindQwtPolar.cmake 2023-07-26 10:16:59.929335761 +0200 +diff -rupN --no-dereference qgis-3.32.3/cmake/FindQwtPolar.cmake qgis-3.32.3-new/cmake/FindQwtPolar.cmake +--- qgis-3.32.3/cmake/FindQwtPolar.cmake 2023-09-15 14:04:20.000000000 +0200 ++++ qgis-3.32.3-new/cmake/FindQwtPolar.cmake 2023-09-18 10:18:17.088738442 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.32.1/cmake/FindQwtPolar.cmake qgis-3.32.1-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.32.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.32.1-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.32.1/src/app/gps/qgsgpsinformationwidget.cpp 2023-07-21 14:13:30.000000000 +0200 -+++ qgis-3.32.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-07-26 10:16:59.930335761 +0200 +diff -rupN --no-dereference qgis-3.32.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.32.3-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.32.3/src/app/gps/qgsgpsinformationwidget.cpp 2023-09-15 14:04:20.000000000 +0200 ++++ qgis-3.32.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-09-18 10:18:17.088738442 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 1533524..dd2804e 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.1/src/core/qgsapplication.cpp qgis-3.32.1-new/src/core/qgsapplication.cpp ---- qgis-3.32.1/src/core/qgsapplication.cpp 2023-07-21 14:13:30.000000000 +0200 -+++ qgis-3.32.1-new/src/core/qgsapplication.cpp 2023-07-26 10:16:54.630332413 +0200 +diff -rupN --no-dereference qgis-3.32.3/src/core/qgsapplication.cpp qgis-3.32.3-new/src/core/qgsapplication.cpp +--- qgis-3.32.3/src/core/qgsapplication.cpp 2023-09-15 14:04:20.000000000 +0200 ++++ qgis-3.32.3-new/src/core/qgsapplication.cpp 2023-09-18 10:18:11.852860827 +0200 @@ -356,6 +356,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index f2e5456..46835bb 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.1/resources/CMakeLists.txt qgis-3.32.1-new/resources/CMakeLists.txt ---- qgis-3.32.1/resources/CMakeLists.txt 2023-07-21 14:13:30.000000000 +0200 -+++ qgis-3.32.1-new/resources/CMakeLists.txt 2023-07-26 10:16:57.269334110 +0200 +diff -rupN --no-dereference qgis-3.32.3/resources/CMakeLists.txt qgis-3.32.3-new/resources/CMakeLists.txt +--- qgis-3.32.3/resources/CMakeLists.txt 2023-09-15 14:04:20.000000000 +0200 ++++ qgis-3.32.3-new/resources/CMakeLists.txt 2023-09-18 10:18:14.476799243 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index eb2cd70..4d99818 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.32.2 +Version: 3.32.3 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Sep 18 2023 Sandro Mani - 3.32.3-1 +- Update to 3.32.3 + * Sat Aug 19 2023 Sandro Mani - 3.32.2-1 - Update to 3.32.2 diff --git a/sources b/sources index 4945329..a5fa797 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.32.2.tar.bz2) = 5b8766506e129259c840ffa1b56c8f78ed6af3c05e42bb064b8f14f3ce60bcbbe74e499f98aed1d564392527fd25fdabc0326da074e726a2f5a7fd7cf9a9c3ea -SHA512 (qgis-3.32.2-vendor.tar.xz) = eedd483fc34885344f4e0990fb17f4f49be7acf3480fe898e3809b8ed7dc44333a282760fea54f2d4df3eee4dd202fd688cfaeac345b5ae46f54b94ef2270ae6 +SHA512 (qgis-3.32.3-vendor.tar.xz) = 797c931541249c03717091d517f6920cdd254c3f840d1830c3a062f1891bbd2635f051a9d6577fcac0a07e2edf088dde330099a032d70119d36b363b2294c8ee +SHA512 (qgis-3.32.3.tar.bz2) = 11c7f9e513bb16297587b6ff433058b329d3ce0860ca6c2ea57d62a42d5614f4e47c3297f7d63d60f698c68412e4d2fb2702d5b2204c9dac1f7cd61733b88681 From 1684de76bfbf0b8cd08f7042efd5245b073a004c Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 18 Sep 2023 10:40:17 +0200 Subject: [PATCH 123/201] Add qgis-3.32.3-vendor-licenses.txt --- ....32.2-vendor-licenses.txt => qgis-3.32.3-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.32.2-vendor-licenses.txt => qgis-3.32.3-vendor-licenses.txt (97%) diff --git a/qgis-3.32.2-vendor-licenses.txt b/qgis-3.32.3-vendor-licenses.txt similarity index 97% rename from qgis-3.32.2-vendor-licenses.txt rename to qgis-3.32.3-vendor-licenses.txt index 6d1e6f6..7c2e2fb 100644 --- a/qgis-3.32.2-vendor-licenses.txt +++ b/qgis-3.32.3-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.32s. +Done in 2.57s. From 612e012385293010b12e2d9b19e1158280022c9d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 15 Oct 2023 16:41:26 +0200 Subject: [PATCH 124/201] Rebuild (PDAL) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 4d99818..55aaa6f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.32.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Oct 15 2023 Sandro Mani - 3.32.3-2 +- Rebuild (PDAL) + * Mon Sep 18 2023 Sandro Mani - 3.32.3-1 - Update to 3.32.3 From 5b46383adeefe6f0d42a8adf16ec0b2ccc54e1b9 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 15 Oct 2023 19:07:32 +0200 Subject: [PATCH 125/201] Add qgis-pdal.patch --- qgis-pdal.patch | 31 +++++++++++++++++++++++++++++++ qgis.spec | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 qgis-pdal.patch diff --git a/qgis-pdal.patch b/qgis-pdal.patch new file mode 100644 index 0000000..4410681 --- /dev/null +++ b/qgis-pdal.patch @@ -0,0 +1,31 @@ +diff -rupN qgis-3.32.3/cmake/FindPDAL.cmake qgis-3.32.3-new/cmake/FindPDAL.cmake +--- qgis-3.32.3/cmake/FindPDAL.cmake 2023-09-15 14:04:20.000000000 +0200 ++++ qgis-3.32.3-new/cmake/FindPDAL.cmake 2023-10-15 19:04:55.834769424 +0200 +@@ -33,13 +33,6 @@ FIND_LIBRARY(PDAL_CPP_LIBRARY NAMES pdal + ) + FIND_LIBRARY(PDAL_CPP_LIBRARY NAMES pdalcpp libpdalcpp) + +-FIND_LIBRARY(PDAL_UTIL_LIBRARY NAMES pdal_util libpdal_util PATHS +- "$ENV{LIB_DIR}/lib" +- c:/msys/local/lib +- NO_DEFAULT_PATH +- ) +-FIND_LIBRARY(PDAL_UTIL_LIBRARY NAMES pdal_util libpdal_util) +- + FIND_PROGRAM(PDAL_BIN pdal + $ENV{LIB_DIR}/bin + /usr/local/bin/ +@@ -48,10 +41,10 @@ FIND_PROGRAM(PDAL_BIN pdal + ) + FIND_PROGRAM(PDAL_BIN pdal) + +-IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN) ++IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_BIN) + SET(PDAL_FOUND TRUE) +- SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY} ${PDAL_UTIL_LIBRARY}) +-ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN) ++ SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY}) ++ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_BIN) + + IF (PDAL_FOUND) + # extract PDAL version diff --git a/qgis.spec b/qgis.spec index 55aaa6f..66c483b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -30,6 +30,8 @@ Patch1: %{name}-yarn-offline.patch Patch2: %{name}-qwt.patch # Fix GCC13 FTBFS Patch3: %{name}-gcc13.patch +# Adapt PDAL deteection for PDAL-2.6.0 +Patch4: %{name}-pdal.patch BuildRequires: cmake BuildRequires: desktop-file-utils From 1ca657f5a5614c7b8c93a6f5769b04c9d4736561 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 28 Oct 2023 14:31:59 +0200 Subject: [PATCH 126/201] Update to 3.34.0 --- .gitignore | 2 ++ ...nses.txt => qgis-3.34.0-vendor-licenses.txt | 4 ++-- qgis-gcc13.patch | 18 +++++++++--------- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 14 ++++++++------ sources | 4 ++-- 8 files changed, 36 insertions(+), 32 deletions(-) rename qgis-3.32.3-vendor-licenses.txt => qgis-3.34.0-vendor-licenses.txt (94%) diff --git a/.gitignore b/.gitignore index 1b94a9d..3faf8ef 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,5 @@ qgis_1.5.0.tar.gz /qgis-3.32.2-vendor.tar.xz /qgis-3.32.3-vendor.tar.xz /qgis-3.32.3.tar.bz2 +/qgis-3.34.0-vendor.tar.xz +/qgis-3.34.0.tar.bz2 diff --git a/qgis-3.32.3-vendor-licenses.txt b/qgis-3.34.0-vendor-licenses.txt similarity index 94% rename from qgis-3.32.3-vendor-licenses.txt rename to qgis-3.34.0-vendor-licenses.txt index 7c2e2fb..08ffca3 100644 --- a/qgis-3.32.3-vendor-licenses.txt +++ b/qgis-3.34.0-vendor-licenses.txt @@ -1,6 +1,6 @@ yarn run v1.22.19 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 1037 +├─ MIT: 1054 ├─ ISC: 75 ├─ BSD-3-Clause: 32 ├─ BSD-2-Clause: 28 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.57s. +Done in 2.30s. diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index dcff5b8..17350cf 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.3/external/lazperf/Extractor.hpp qgis-3.32.3-new/external/lazperf/Extractor.hpp ---- qgis-3.32.3/external/lazperf/Extractor.hpp 2023-09-15 14:04:20.000000000 +0200 -+++ qgis-3.32.3-new/external/lazperf/Extractor.hpp 2023-09-18 10:18:19.702678112 +0200 +diff -rupN --no-dereference qgis-3.34.0/external/lazperf/Extractor.hpp qgis-3.34.0-new/external/lazperf/Extractor.hpp +--- qgis-3.34.0/external/lazperf/Extractor.hpp 2023-10-27 14:02:22.000000000 +0200 ++++ qgis-3.34.0-new/external/lazperf/Extractor.hpp 2023-10-27 16:54:43.277265026 +0200 @@ -34,6 +34,7 @@ #pragma once @@ -9,9 +9,9 @@ diff -rupN --no-dereference qgis-3.32.3/external/lazperf/Extractor.hpp qgis-3.32 #include #include #include -diff -rupN --no-dereference qgis-3.32.3/external/untwine/api/QgisUntwine.hpp qgis-3.32.3-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.32.3/external/untwine/api/QgisUntwine.hpp 2023-09-15 14:04:20.000000000 +0200 -+++ qgis-3.32.3-new/external/untwine/api/QgisUntwine.hpp 2023-09-18 10:18:19.703678089 +0200 +diff -rupN --no-dereference qgis-3.34.0/external/untwine/api/QgisUntwine.hpp qgis-3.34.0-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.34.0/external/untwine/api/QgisUntwine.hpp 2023-10-27 14:02:22.000000000 +0200 ++++ qgis-3.34.0-new/external/untwine/api/QgisUntwine.hpp 2023-10-27 16:54:43.278265036 +0200 @@ -1,5 +1,6 @@ #pragma once @@ -19,9 +19,9 @@ diff -rupN --no-dereference qgis-3.32.3/external/untwine/api/QgisUntwine.hpp qgi #include #include #include -diff -rupN --no-dereference qgis-3.32.3/external/untwine/untwine/VoxelKey.hpp qgis-3.32.3-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.32.3/external/untwine/untwine/VoxelKey.hpp 2023-09-15 14:04:20.000000000 +0200 -+++ qgis-3.32.3-new/external/untwine/untwine/VoxelKey.hpp 2023-09-18 10:18:19.704678066 +0200 +diff -rupN --no-dereference qgis-3.34.0/external/untwine/untwine/VoxelKey.hpp qgis-3.34.0-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.34.0/external/untwine/untwine/VoxelKey.hpp 2023-10-27 14:02:22.000000000 +0200 ++++ qgis-3.34.0-new/external/untwine/untwine/VoxelKey.hpp 2023-10-27 16:54:43.278265036 +0200 @@ -13,6 +13,7 @@ #include #include diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 7feb24b..d57260d 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.3/cmake/FindQwtPolar.cmake qgis-3.32.3-new/cmake/FindQwtPolar.cmake ---- qgis-3.32.3/cmake/FindQwtPolar.cmake 2023-09-15 14:04:20.000000000 +0200 -+++ qgis-3.32.3-new/cmake/FindQwtPolar.cmake 2023-09-18 10:18:17.088738442 +0200 +diff -rupN --no-dereference qgis-3.34.0/cmake/FindQwtPolar.cmake qgis-3.34.0-new/cmake/FindQwtPolar.cmake +--- qgis-3.34.0/cmake/FindQwtPolar.cmake 2023-10-27 14:02:22.000000000 +0200 ++++ qgis-3.34.0-new/cmake/FindQwtPolar.cmake 2023-10-27 16:54:40.582237852 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.32.3/cmake/FindQwtPolar.cmake qgis-3.32.3-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.32.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.32.3-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.32.3/src/app/gps/qgsgpsinformationwidget.cpp 2023-09-15 14:04:20.000000000 +0200 -+++ qgis-3.32.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-09-18 10:18:17.088738442 +0200 +diff -rupN --no-dereference qgis-3.34.0/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.0-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.34.0/src/app/gps/qgsgpsinformationwidget.cpp 2023-10-27 14:02:22.000000000 +0200 ++++ qgis-3.34.0-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-10-27 16:54:40.603238064 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index dd2804e..a3edcba 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.32.3/src/core/qgsapplication.cpp qgis-3.32.3-new/src/core/qgsapplication.cpp ---- qgis-3.32.3/src/core/qgsapplication.cpp 2023-09-15 14:04:20.000000000 +0200 -+++ qgis-3.32.3-new/src/core/qgsapplication.cpp 2023-09-18 10:18:11.852860827 +0200 -@@ -356,6 +356,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.34.0/src/core/qgsapplication.cpp qgis-3.34.0-new/src/core/qgsapplication.cpp +--- qgis-3.34.0/src/core/qgsapplication.cpp 2023-10-27 14:02:22.000000000 +0200 ++++ qgis-3.34.0-new/src/core/qgsapplication.cpp 2023-10-27 16:54:35.683188707 +0200 +@@ -357,6 +357,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 46835bb..764085d 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.32.3/resources/CMakeLists.txt qgis-3.32.3-new/resources/CMakeLists.txt ---- qgis-3.32.3/resources/CMakeLists.txt 2023-09-15 14:04:20.000000000 +0200 -+++ qgis-3.32.3-new/resources/CMakeLists.txt 2023-09-18 10:18:14.476799243 +0200 +diff -rupN --no-dereference qgis-3.34.0/resources/CMakeLists.txt qgis-3.34.0-new/resources/CMakeLists.txt +--- qgis-3.34.0/resources/CMakeLists.txt 2023-10-27 14:02:22.000000000 +0200 ++++ qgis-3.34.0-new/resources/CMakeLists.txt 2023-10-27 16:54:38.147213384 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 66c483b..5f20d85 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,13 +1,13 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.32.3 -Release: 2%{?dist} +Version: 3.34.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 -# QGIS license the bundled JS code (see %%{name}-%%{version}-vendor-licenses.txt) -License: (GPLv3+ with exceptions) and (MIT and ISC and BSD and ASL 2.0 and CC-BY and Python and MPLv2.0) +# QGIS license the bundled JS code (see %%{name}-%%{version}-vendor-licenses.txt) +License: GPL-2.0-or-later AND MIT AND ISC AND BSD-3-Clause AND BSD-2-Clause AND Apache-2.0 AND MIT AND (MIT OR CC0-1.0) AND Unlicense AND (MIT OR Apache-2.0) AND CC0-1.0 AND (MIT AND CC-BY-3.0) AND Python-2.0.1 AND CC-BY-4.0 AND (BSD-3-Clause OR GPL-2.0-only) AND (WTFPL OR MIT) AND (MIT AND BSD-3-Clause) AND CC-BY-3.0 AND MPL-2.0 URL: http://www.qgis.org Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 @@ -30,11 +30,10 @@ Patch1: %{name}-yarn-offline.patch Patch2: %{name}-qwt.patch # Fix GCC13 FTBFS Patch3: %{name}-gcc13.patch -# Adapt PDAL deteection for PDAL-2.6.0 -Patch4: %{name}-pdal.patch BuildRequires: cmake BuildRequires: desktop-file-utils +BuildRequires: draco-devel BuildRequires: exiv2-devel BuildRequires: expat-devel BuildRequires: fcgi-devel @@ -310,6 +309,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Oct 27 2023 Sandro Mani - 3.34.0-1 +- Update to 3.34.0 + * Sun Oct 15 2023 Sandro Mani - 3.32.3-2 - Rebuild (PDAL) diff --git a/sources b/sources index a5fa797..dd07818 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.32.3-vendor.tar.xz) = 797c931541249c03717091d517f6920cdd254c3f840d1830c3a062f1891bbd2635f051a9d6577fcac0a07e2edf088dde330099a032d70119d36b363b2294c8ee -SHA512 (qgis-3.32.3.tar.bz2) = 11c7f9e513bb16297587b6ff433058b329d3ce0860ca6c2ea57d62a42d5614f4e47c3297f7d63d60f698c68412e4d2fb2702d5b2204c9dac1f7cd61733b88681 +SHA512 (qgis-3.34.0-vendor.tar.xz) = 6ab5f665e2fba924e87db5ae036c0ddd8f906159d1ca851594ce0b228838409cf618748e4197e4fff1362e6399a29270e055e9ebf497a222fad3420e01037924 +SHA512 (qgis-3.34.0.tar.bz2) = 48892d3c7974f2250b819d146c337c67865ba4eafbc24d97adf09146eb742e991d82692fe7dde0b79df1ba76b92701b148b0309b6626473591d2978358a61e59 From 2265ed83bf6f816c52509210150e0d6471334ab1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 28 Oct 2023 20:46:08 +0200 Subject: [PATCH 127/201] Rebuild (grass) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 5f20d85..a95f81c 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.34.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -309,6 +309,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Oct 28 2023 Sandro Mani - 3.34.0-2 +- Rebuild (grass) + * Fri Oct 27 2023 Sandro Mani - 3.34.0-1 - Update to 3.34.0 From 0fb2d94c46c61c22cae80e51b812c40f93a6e2da Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 3 Nov 2023 18:37:25 +0100 Subject: [PATCH 128/201] Add supplements qgis to python3-qgis subpackage --- qgis.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index a95f81c..960e0ea 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.34.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -136,6 +136,7 @@ Requires: python3-PyYAML Requires: python3-qscintilla-qt5 Requires: python3-qt5-webkit %{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} +Supplements: %{name}%{?_isa} = %{version}-%{release} %description -n python3-qgis Python integration and plug-ins for QGIS. @@ -309,6 +310,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Nov 03 2023 Sandro Mani - 3.34.0-3 +- Add supplements qgis to python3-qgis subpackage + * Sat Oct 28 2023 Sandro Mani - 3.34.0-2 - Rebuild (grass) From 078a3b35544db7d7444359d9c572f036d430d5b3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 15 Nov 2023 22:07:45 +0100 Subject: [PATCH 129/201] Rebuild (gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 960e0ea..096f86f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.34.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -310,6 +310,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Wed Nov 15 2023 Sandro Mani - 3.34.0-4 +- Rebuild (gdal) + * Fri Nov 03 2023 Sandro Mani - 3.34.0-3 - Add supplements qgis to python3-qgis subpackage From 99f5e93215a7a121e0953cba8134440d9795d34f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 28 Nov 2023 07:53:49 +0100 Subject: [PATCH 130/201] Update to 3.34.1 --- .gitignore | 2 ++ qgis-gcc13.patch | 18 +++++++++--------- qgis-pdal.patch | 31 ------------------------------- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 8 files changed, 30 insertions(+), 56 deletions(-) delete mode 100644 qgis-pdal.patch diff --git a/.gitignore b/.gitignore index 3faf8ef..1ad7b18 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,5 @@ qgis_1.5.0.tar.gz /qgis-3.32.3.tar.bz2 /qgis-3.34.0-vendor.tar.xz /qgis-3.34.0.tar.bz2 +/qgis-3.34.1.tar.bz2 +/qgis-3.34.1-vendor.tar.xz diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index 17350cf..ca150d7 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.0/external/lazperf/Extractor.hpp qgis-3.34.0-new/external/lazperf/Extractor.hpp ---- qgis-3.34.0/external/lazperf/Extractor.hpp 2023-10-27 14:02:22.000000000 +0200 -+++ qgis-3.34.0-new/external/lazperf/Extractor.hpp 2023-10-27 16:54:43.277265026 +0200 +diff -rupN --no-dereference qgis-3.34.1/external/lazperf/Extractor.hpp qgis-3.34.1-new/external/lazperf/Extractor.hpp +--- qgis-3.34.1/external/lazperf/Extractor.hpp 2023-11-24 13:06:13.000000000 +0100 ++++ qgis-3.34.1-new/external/lazperf/Extractor.hpp 2023-11-28 07:51:02.030226596 +0100 @@ -34,6 +34,7 @@ #pragma once @@ -9,9 +9,9 @@ diff -rupN --no-dereference qgis-3.34.0/external/lazperf/Extractor.hpp qgis-3.34 #include #include #include -diff -rupN --no-dereference qgis-3.34.0/external/untwine/api/QgisUntwine.hpp qgis-3.34.0-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.34.0/external/untwine/api/QgisUntwine.hpp 2023-10-27 14:02:22.000000000 +0200 -+++ qgis-3.34.0-new/external/untwine/api/QgisUntwine.hpp 2023-10-27 16:54:43.278265036 +0200 +diff -rupN --no-dereference qgis-3.34.1/external/untwine/api/QgisUntwine.hpp qgis-3.34.1-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.34.1/external/untwine/api/QgisUntwine.hpp 2023-11-24 13:06:13.000000000 +0100 ++++ qgis-3.34.1-new/external/untwine/api/QgisUntwine.hpp 2023-11-28 07:51:02.030226596 +0100 @@ -1,5 +1,6 @@ #pragma once @@ -19,9 +19,9 @@ diff -rupN --no-dereference qgis-3.34.0/external/untwine/api/QgisUntwine.hpp qgi #include #include #include -diff -rupN --no-dereference qgis-3.34.0/external/untwine/untwine/VoxelKey.hpp qgis-3.34.0-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.34.0/external/untwine/untwine/VoxelKey.hpp 2023-10-27 14:02:22.000000000 +0200 -+++ qgis-3.34.0-new/external/untwine/untwine/VoxelKey.hpp 2023-10-27 16:54:43.278265036 +0200 +diff -rupN --no-dereference qgis-3.34.1/external/untwine/untwine/VoxelKey.hpp qgis-3.34.1-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.34.1/external/untwine/untwine/VoxelKey.hpp 2023-11-24 13:06:13.000000000 +0100 ++++ qgis-3.34.1-new/external/untwine/untwine/VoxelKey.hpp 2023-11-28 07:51:02.030226596 +0100 @@ -13,6 +13,7 @@ #include #include diff --git a/qgis-pdal.patch b/qgis-pdal.patch deleted file mode 100644 index 4410681..0000000 --- a/qgis-pdal.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -rupN qgis-3.32.3/cmake/FindPDAL.cmake qgis-3.32.3-new/cmake/FindPDAL.cmake ---- qgis-3.32.3/cmake/FindPDAL.cmake 2023-09-15 14:04:20.000000000 +0200 -+++ qgis-3.32.3-new/cmake/FindPDAL.cmake 2023-10-15 19:04:55.834769424 +0200 -@@ -33,13 +33,6 @@ FIND_LIBRARY(PDAL_CPP_LIBRARY NAMES pdal - ) - FIND_LIBRARY(PDAL_CPP_LIBRARY NAMES pdalcpp libpdalcpp) - --FIND_LIBRARY(PDAL_UTIL_LIBRARY NAMES pdal_util libpdal_util PATHS -- "$ENV{LIB_DIR}/lib" -- c:/msys/local/lib -- NO_DEFAULT_PATH -- ) --FIND_LIBRARY(PDAL_UTIL_LIBRARY NAMES pdal_util libpdal_util) -- - FIND_PROGRAM(PDAL_BIN pdal - $ENV{LIB_DIR}/bin - /usr/local/bin/ -@@ -48,10 +41,10 @@ FIND_PROGRAM(PDAL_BIN pdal - ) - FIND_PROGRAM(PDAL_BIN pdal) - --IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN) -+IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_BIN) - SET(PDAL_FOUND TRUE) -- SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY} ${PDAL_UTIL_LIBRARY}) --ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN) -+ SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY}) -+ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_BIN) - - IF (PDAL_FOUND) - # extract PDAL version diff --git a/qgis-qwt.patch b/qgis-qwt.patch index d57260d..64a0c57 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.0/cmake/FindQwtPolar.cmake qgis-3.34.0-new/cmake/FindQwtPolar.cmake ---- qgis-3.34.0/cmake/FindQwtPolar.cmake 2023-10-27 14:02:22.000000000 +0200 -+++ qgis-3.34.0-new/cmake/FindQwtPolar.cmake 2023-10-27 16:54:40.582237852 +0200 +diff -rupN --no-dereference qgis-3.34.1/cmake/FindQwtPolar.cmake qgis-3.34.1-new/cmake/FindQwtPolar.cmake +--- qgis-3.34.1/cmake/FindQwtPolar.cmake 2023-11-24 13:06:13.000000000 +0100 ++++ qgis-3.34.1-new/cmake/FindQwtPolar.cmake 2023-11-28 07:50:59.540750522 +0100 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.34.0/cmake/FindQwtPolar.cmake qgis-3.34.0-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.34.0/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.0-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.34.0/src/app/gps/qgsgpsinformationwidget.cpp 2023-10-27 14:02:22.000000000 +0200 -+++ qgis-3.34.0-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-10-27 16:54:40.603238064 +0200 +diff -rupN --no-dereference qgis-3.34.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.1-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.34.1/src/app/gps/qgsgpsinformationwidget.cpp 2023-11-24 13:06:13.000000000 +0100 ++++ qgis-3.34.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-11-28 07:50:59.568755634 +0100 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index a3edcba..0c0138f 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.0/src/core/qgsapplication.cpp qgis-3.34.0-new/src/core/qgsapplication.cpp ---- qgis-3.34.0/src/core/qgsapplication.cpp 2023-10-27 14:02:22.000000000 +0200 -+++ qgis-3.34.0-new/src/core/qgsapplication.cpp 2023-10-27 16:54:35.683188707 +0200 +diff -rupN --no-dereference qgis-3.34.1/src/core/qgsapplication.cpp qgis-3.34.1-new/src/core/qgsapplication.cpp +--- qgis-3.34.1/src/core/qgsapplication.cpp 2023-11-24 13:06:13.000000000 +0100 ++++ qgis-3.34.1-new/src/core/qgsapplication.cpp 2023-11-28 07:50:54.750969072 +0100 @@ -357,6 +357,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 764085d..ebb4571 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.0/resources/CMakeLists.txt qgis-3.34.0-new/resources/CMakeLists.txt ---- qgis-3.34.0/resources/CMakeLists.txt 2023-10-27 14:02:22.000000000 +0200 -+++ qgis-3.34.0-new/resources/CMakeLists.txt 2023-10-27 16:54:38.147213384 +0200 +diff -rupN --no-dereference qgis-3.34.1/resources/CMakeLists.txt qgis-3.34.1-new/resources/CMakeLists.txt +--- qgis-3.34.1/resources/CMakeLists.txt 2023-11-24 13:06:13.000000000 +0100 ++++ qgis-3.34.1-new/resources/CMakeLists.txt 2023-11-28 07:50:57.156336340 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 096f86f..5ec6f94 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.0 -Release: 4%{?dist} +Version: 3.34.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -310,6 +310,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Nov 26 2023 Sandro Mani - 3.34.1-1 +- Update to 3.34.1 + * Wed Nov 15 2023 Sandro Mani - 3.34.0-4 - Rebuild (gdal) diff --git a/sources b/sources index dd07818..fb56d30 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.0-vendor.tar.xz) = 6ab5f665e2fba924e87db5ae036c0ddd8f906159d1ca851594ce0b228838409cf618748e4197e4fff1362e6399a29270e055e9ebf497a222fad3420e01037924 -SHA512 (qgis-3.34.0.tar.bz2) = 48892d3c7974f2250b819d146c337c67865ba4eafbc24d97adf09146eb742e991d82692fe7dde0b79df1ba76b92701b148b0309b6626473591d2978358a61e59 +SHA512 (qgis-3.34.1.tar.bz2) = b8729b09717cf11e05a74a8ea0d566ccb804fd4fae8141a1be19cb21e16f05dcd31e519be2486ef18dae723514cf066a0fad63f9a8dfde178c6d2ba8050a4225 +SHA512 (qgis-3.34.1-vendor.tar.xz) = 0fd294a83f3d3ee82021147b39d24eef3761a189d4e0eb4f9550293a6f4a7466494e92262a6f6cca98fdb472bd3edfd6b0dda9ea1bf05d199f43f7b623362963 From 5a3c396462ca7825ea4dce37b70e24df30ecbfe0 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 28 Nov 2023 08:00:05 +0100 Subject: [PATCH 131/201] Add qgis-3.34.1-vendor-licenses.txt --- ....34.0-vendor-licenses.txt => qgis-3.34.1-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.34.0-vendor-licenses.txt => qgis-3.34.1-vendor-licenses.txt (97%) diff --git a/qgis-3.34.0-vendor-licenses.txt b/qgis-3.34.1-vendor-licenses.txt similarity index 97% rename from qgis-3.34.0-vendor-licenses.txt rename to qgis-3.34.1-vendor-licenses.txt index 08ffca3..5247a73 100644 --- a/qgis-3.34.0-vendor-licenses.txt +++ b/qgis-3.34.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.30s. +Done in 2.68s. From 2639eb4dabec948764d5d56e5d80b45cee15d988 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 23 Dec 2023 20:43:24 +0100 Subject: [PATCH 132/201] Update to 3.34.2 --- .gitignore | 2 ++ qgis-gcc13.patch | 18 +++++++++--------- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 7 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 1ad7b18..81b863b 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,5 @@ qgis_1.5.0.tar.gz /qgis-3.34.0.tar.bz2 /qgis-3.34.1.tar.bz2 /qgis-3.34.1-vendor.tar.xz +/qgis-3.34.2-vendor.tar.xz +/qgis-3.34.2.tar.bz2 diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index ca150d7..ed18404 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.1/external/lazperf/Extractor.hpp qgis-3.34.1-new/external/lazperf/Extractor.hpp ---- qgis-3.34.1/external/lazperf/Extractor.hpp 2023-11-24 13:06:13.000000000 +0100 -+++ qgis-3.34.1-new/external/lazperf/Extractor.hpp 2023-11-28 07:51:02.030226596 +0100 +diff -rupN --no-dereference qgis-3.34.2/external/lazperf/Extractor.hpp qgis-3.34.2-new/external/lazperf/Extractor.hpp +--- qgis-3.34.2/external/lazperf/Extractor.hpp 2023-12-22 13:04:08.000000000 +0100 ++++ qgis-3.34.2-new/external/lazperf/Extractor.hpp 2023-12-23 11:27:24.620143601 +0100 @@ -34,6 +34,7 @@ #pragma once @@ -9,9 +9,9 @@ diff -rupN --no-dereference qgis-3.34.1/external/lazperf/Extractor.hpp qgis-3.34 #include #include #include -diff -rupN --no-dereference qgis-3.34.1/external/untwine/api/QgisUntwine.hpp qgis-3.34.1-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.34.1/external/untwine/api/QgisUntwine.hpp 2023-11-24 13:06:13.000000000 +0100 -+++ qgis-3.34.1-new/external/untwine/api/QgisUntwine.hpp 2023-11-28 07:51:02.030226596 +0100 +diff -rupN --no-dereference qgis-3.34.2/external/untwine/api/QgisUntwine.hpp qgis-3.34.2-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.34.2/external/untwine/api/QgisUntwine.hpp 2023-12-22 13:04:08.000000000 +0100 ++++ qgis-3.34.2-new/external/untwine/api/QgisUntwine.hpp 2023-12-23 11:27:24.624145064 +0100 @@ -1,5 +1,6 @@ #pragma once @@ -19,9 +19,9 @@ diff -rupN --no-dereference qgis-3.34.1/external/untwine/api/QgisUntwine.hpp qgi #include #include #include -diff -rupN --no-dereference qgis-3.34.1/external/untwine/untwine/VoxelKey.hpp qgis-3.34.1-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.34.1/external/untwine/untwine/VoxelKey.hpp 2023-11-24 13:06:13.000000000 +0100 -+++ qgis-3.34.1-new/external/untwine/untwine/VoxelKey.hpp 2023-11-28 07:51:02.030226596 +0100 +diff -rupN --no-dereference qgis-3.34.2/external/untwine/untwine/VoxelKey.hpp qgis-3.34.2-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.34.2/external/untwine/untwine/VoxelKey.hpp 2023-12-22 13:04:08.000000000 +0100 ++++ qgis-3.34.2-new/external/untwine/untwine/VoxelKey.hpp 2023-12-23 11:27:24.629146893 +0100 @@ -13,6 +13,7 @@ #include #include diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 64a0c57..7b5d07c 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.1/cmake/FindQwtPolar.cmake qgis-3.34.1-new/cmake/FindQwtPolar.cmake ---- qgis-3.34.1/cmake/FindQwtPolar.cmake 2023-11-24 13:06:13.000000000 +0100 -+++ qgis-3.34.1-new/cmake/FindQwtPolar.cmake 2023-11-28 07:50:59.540750522 +0100 +diff -rupN --no-dereference qgis-3.34.2/cmake/FindQwtPolar.cmake qgis-3.34.2-new/cmake/FindQwtPolar.cmake +--- qgis-3.34.2/cmake/FindQwtPolar.cmake 2023-12-22 13:04:08.000000000 +0100 ++++ qgis-3.34.2-new/cmake/FindQwtPolar.cmake 2023-12-23 11:27:21.900149164 +0100 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.34.1/cmake/FindQwtPolar.cmake qgis-3.34.1-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.34.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.1-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.34.1/src/app/gps/qgsgpsinformationwidget.cpp 2023-11-24 13:06:13.000000000 +0100 -+++ qgis-3.34.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-11-28 07:50:59.568755634 +0100 +diff -rupN --no-dereference qgis-3.34.2/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.2-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.34.2/src/app/gps/qgsgpsinformationwidget.cpp 2023-12-22 13:04:08.000000000 +0100 ++++ qgis-3.34.2-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-12-23 11:27:21.905150992 +0100 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 0c0138f..74e33bb 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.1/src/core/qgsapplication.cpp qgis-3.34.1-new/src/core/qgsapplication.cpp ---- qgis-3.34.1/src/core/qgsapplication.cpp 2023-11-24 13:06:13.000000000 +0100 -+++ qgis-3.34.1-new/src/core/qgsapplication.cpp 2023-11-28 07:50:54.750969072 +0100 +diff -rupN --no-dereference qgis-3.34.2/src/core/qgsapplication.cpp qgis-3.34.2-new/src/core/qgsapplication.cpp +--- qgis-3.34.2/src/core/qgsapplication.cpp 2023-12-22 13:04:08.000000000 +0100 ++++ qgis-3.34.2-new/src/core/qgsapplication.cpp 2023-12-23 11:27:16.363124813 +0100 @@ -357,6 +357,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index ebb4571..9996f2c 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.1/resources/CMakeLists.txt qgis-3.34.1-new/resources/CMakeLists.txt ---- qgis-3.34.1/resources/CMakeLists.txt 2023-11-24 13:06:13.000000000 +0100 -+++ qgis-3.34.1-new/resources/CMakeLists.txt 2023-11-28 07:50:57.156336340 +0100 +diff -rupN --no-dereference qgis-3.34.2/resources/CMakeLists.txt qgis-3.34.2-new/resources/CMakeLists.txt +--- qgis-3.34.2/resources/CMakeLists.txt 2023-12-22 13:04:08.000000000 +0100 ++++ qgis-3.34.2-new/resources/CMakeLists.txt 2023-12-23 11:27:19.066113033 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 5ec6f94..68f22bc 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.1 +Version: 3.34.2 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -310,6 +310,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Dec 23 2023 Sandro Mani - 3.34.2-1 +- Update to 3.34.2 + * Sun Nov 26 2023 Sandro Mani - 3.34.1-1 - Update to 3.34.1 diff --git a/sources b/sources index fb56d30..2145bb7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.1.tar.bz2) = b8729b09717cf11e05a74a8ea0d566ccb804fd4fae8141a1be19cb21e16f05dcd31e519be2486ef18dae723514cf066a0fad63f9a8dfde178c6d2ba8050a4225 -SHA512 (qgis-3.34.1-vendor.tar.xz) = 0fd294a83f3d3ee82021147b39d24eef3761a189d4e0eb4f9550293a6f4a7466494e92262a6f6cca98fdb472bd3edfd6b0dda9ea1bf05d199f43f7b623362963 +SHA512 (qgis-3.34.2-vendor.tar.xz) = 6eaee1eaeb3fbb6f142658d42e9d27d4d6a68fcfcc33adea82c0bdcdb921a8a3f04859f668b9c9367ccc17149c69e08553617233d681ded4efff65f7bd2803c4 +SHA512 (qgis-3.34.2.tar.bz2) = 6001840bed57540bf330c9b9680d83a59acd0f54ef0cfa7606594590feb480807a4bd7c4dd8396da0d852034ea9cb480bdd44b024a2b7f6282f3ecc120952306 From 6c1ff635f84bea56892192914d88693a5b0bab4d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 23 Dec 2023 20:44:20 +0100 Subject: [PATCH 133/201] Add correct bundle license file --- ....34.1-vendor-licenses.txt => qgis-3.34.2-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.34.1-vendor-licenses.txt => qgis-3.34.2-vendor-licenses.txt (97%) diff --git a/qgis-3.34.1-vendor-licenses.txt b/qgis-3.34.2-vendor-licenses.txt similarity index 97% rename from qgis-3.34.1-vendor-licenses.txt rename to qgis-3.34.2-vendor-licenses.txt index 5247a73..8472195 100644 --- a/qgis-3.34.1-vendor-licenses.txt +++ b/qgis-3.34.2-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.68s. +Done in 2.38s. From 5e4f8f8f2cd1ace04179c26411d3daadfd6ccf44 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 21 Jan 2024 10:02:17 +0100 Subject: [PATCH 134/201] Update to 3.34.3 --- .gitignore | 2 ++ ...nses.txt => qgis-3.34.3-vendor-licenses.txt | 2 +- qgis-gcc13.patch | 18 +++++++++--------- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 8 files changed, 30 insertions(+), 25 deletions(-) rename qgis-3.34.2-vendor-licenses.txt => qgis-3.34.3-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 81b863b..502fb91 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,5 @@ qgis_1.5.0.tar.gz /qgis-3.34.1-vendor.tar.xz /qgis-3.34.2-vendor.tar.xz /qgis-3.34.2.tar.bz2 +/qgis-3.34.3.tar.bz2 +/qgis-3.34.3-vendor.tar.xz diff --git a/qgis-3.34.2-vendor-licenses.txt b/qgis-3.34.3-vendor-licenses.txt similarity index 97% rename from qgis-3.34.2-vendor-licenses.txt rename to qgis-3.34.3-vendor-licenses.txt index 8472195..0d8291f 100644 --- a/qgis-3.34.2-vendor-licenses.txt +++ b/qgis-3.34.3-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.38s. +Done in 2.36s. diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index ed18404..123f889 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.2/external/lazperf/Extractor.hpp qgis-3.34.2-new/external/lazperf/Extractor.hpp ---- qgis-3.34.2/external/lazperf/Extractor.hpp 2023-12-22 13:04:08.000000000 +0100 -+++ qgis-3.34.2-new/external/lazperf/Extractor.hpp 2023-12-23 11:27:24.620143601 +0100 +diff -rupN --no-dereference qgis-3.34.3/external/lazperf/Extractor.hpp qgis-3.34.3-new/external/lazperf/Extractor.hpp +--- qgis-3.34.3/external/lazperf/Extractor.hpp 2024-01-19 13:02:20.000000000 +0100 ++++ qgis-3.34.3-new/external/lazperf/Extractor.hpp 2024-01-21 09:48:11.849030445 +0100 @@ -34,6 +34,7 @@ #pragma once @@ -9,9 +9,9 @@ diff -rupN --no-dereference qgis-3.34.2/external/lazperf/Extractor.hpp qgis-3.34 #include #include #include -diff -rupN --no-dereference qgis-3.34.2/external/untwine/api/QgisUntwine.hpp qgis-3.34.2-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.34.2/external/untwine/api/QgisUntwine.hpp 2023-12-22 13:04:08.000000000 +0100 -+++ qgis-3.34.2-new/external/untwine/api/QgisUntwine.hpp 2023-12-23 11:27:24.624145064 +0100 +diff -rupN --no-dereference qgis-3.34.3/external/untwine/api/QgisUntwine.hpp qgis-3.34.3-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.34.3/external/untwine/api/QgisUntwine.hpp 2024-01-19 13:02:20.000000000 +0100 ++++ qgis-3.34.3-new/external/untwine/api/QgisUntwine.hpp 2024-01-21 09:48:11.853030364 +0100 @@ -1,5 +1,6 @@ #pragma once @@ -19,9 +19,9 @@ diff -rupN --no-dereference qgis-3.34.2/external/untwine/api/QgisUntwine.hpp qgi #include #include #include -diff -rupN --no-dereference qgis-3.34.2/external/untwine/untwine/VoxelKey.hpp qgis-3.34.2-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.34.2/external/untwine/untwine/VoxelKey.hpp 2023-12-22 13:04:08.000000000 +0100 -+++ qgis-3.34.2-new/external/untwine/untwine/VoxelKey.hpp 2023-12-23 11:27:24.629146893 +0100 +diff -rupN --no-dereference qgis-3.34.3/external/untwine/untwine/VoxelKey.hpp qgis-3.34.3-new/external/untwine/untwine/VoxelKey.hpp +--- qgis-3.34.3/external/untwine/untwine/VoxelKey.hpp 2024-01-19 13:02:20.000000000 +0100 ++++ qgis-3.34.3-new/external/untwine/untwine/VoxelKey.hpp 2024-01-21 09:48:11.857030283 +0100 @@ -13,6 +13,7 @@ #include #include diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 7b5d07c..069311b 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.2/cmake/FindQwtPolar.cmake qgis-3.34.2-new/cmake/FindQwtPolar.cmake ---- qgis-3.34.2/cmake/FindQwtPolar.cmake 2023-12-22 13:04:08.000000000 +0100 -+++ qgis-3.34.2-new/cmake/FindQwtPolar.cmake 2023-12-23 11:27:21.900149164 +0100 +diff -rupN --no-dereference qgis-3.34.3/cmake/FindQwtPolar.cmake qgis-3.34.3-new/cmake/FindQwtPolar.cmake +--- qgis-3.34.3/cmake/FindQwtPolar.cmake 2024-01-19 13:02:20.000000000 +0100 ++++ qgis-3.34.3-new/cmake/FindQwtPolar.cmake 2024-01-21 09:48:09.462078801 +0100 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.34.2/cmake/FindQwtPolar.cmake qgis-3.34.2-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.34.2/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.2-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.34.2/src/app/gps/qgsgpsinformationwidget.cpp 2023-12-22 13:04:08.000000000 +0100 -+++ qgis-3.34.2-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-12-23 11:27:21.905150992 +0100 +diff -rupN --no-dereference qgis-3.34.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.3-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.34.3/src/app/gps/qgsgpsinformationwidget.cpp 2024-01-19 13:02:20.000000000 +0100 ++++ qgis-3.34.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-01-21 09:48:09.467078699 +0100 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 74e33bb..82f5eae 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.2/src/core/qgsapplication.cpp qgis-3.34.2-new/src/core/qgsapplication.cpp ---- qgis-3.34.2/src/core/qgsapplication.cpp 2023-12-22 13:04:08.000000000 +0100 -+++ qgis-3.34.2-new/src/core/qgsapplication.cpp 2023-12-23 11:27:16.363124813 +0100 +diff -rupN --no-dereference qgis-3.34.3/src/core/qgsapplication.cpp qgis-3.34.3-new/src/core/qgsapplication.cpp +--- qgis-3.34.3/src/core/qgsapplication.cpp 2024-01-19 13:02:20.000000000 +0100 ++++ qgis-3.34.3-new/src/core/qgsapplication.cpp 2024-01-21 09:48:04.646176228 +0100 @@ -357,6 +357,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 9996f2c..4d2414e 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.2/resources/CMakeLists.txt qgis-3.34.2-new/resources/CMakeLists.txt ---- qgis-3.34.2/resources/CMakeLists.txt 2023-12-22 13:04:08.000000000 +0100 -+++ qgis-3.34.2-new/resources/CMakeLists.txt 2023-12-23 11:27:19.066113033 +0100 +diff -rupN --no-dereference qgis-3.34.3/resources/CMakeLists.txt qgis-3.34.3-new/resources/CMakeLists.txt +--- qgis-3.34.3/resources/CMakeLists.txt 2024-01-19 13:02:20.000000000 +0100 ++++ qgis-3.34.3-new/resources/CMakeLists.txt 2024-01-21 09:48:07.008128468 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 68f22bc..24303d7 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.2 +Version: 3.34.3 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -310,6 +310,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Jan 21 2024 Sandro Mani - 3.34.3-1 +- Update to 3.34.3 + * Sat Dec 23 2023 Sandro Mani - 3.34.2-1 - Update to 3.34.2 diff --git a/sources b/sources index 2145bb7..0607a21 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.2-vendor.tar.xz) = 6eaee1eaeb3fbb6f142658d42e9d27d4d6a68fcfcc33adea82c0bdcdb921a8a3f04859f668b9c9367ccc17149c69e08553617233d681ded4efff65f7bd2803c4 -SHA512 (qgis-3.34.2.tar.bz2) = 6001840bed57540bf330c9b9680d83a59acd0f54ef0cfa7606594590feb480807a4bd7c4dd8396da0d852034ea9cb480bdd44b024a2b7f6282f3ecc120952306 +SHA512 (qgis-3.34.3.tar.bz2) = eb9f6844264092eb20b816f5ffdd0ce6d45f3ae7ff8e2c2c2f6d27772a3c82cbc581591057148fb7f9b641902cdd04eb2b4a9cd82b9d62dc0596ee050334dd5e +SHA512 (qgis-3.34.3-vendor.tar.xz) = cfafc2750a2cfe90e13a2a890eda348f30799a1789e9bb8bf04971a2ab0ca43a87ce184685e988a012e64376bfe76da1fdd91d53ae91cbf86dad9d966c58ea2f From e36d8fee6fb8f0afcbec271e3df0cdb509d176ff Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 23 Jan 2024 14:41:52 +0100 Subject: [PATCH 135/201] Rebuild (libdraco) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 24303d7..457deaf 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.34.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -310,6 +310,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Jan 23 2024 Sandro Mani - 3.34.3-2 +- Rebuild (libdraco) + * Sun Jan 21 2024 Sandro Mani - 3.34.3-1 - Update to 3.34.3 From 48ce21b02690f03b9d53aa20d4ab3b209f05a125 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 24 Feb 2024 10:35:48 +0100 Subject: [PATCH 136/201] Update to 3.36.0 --- .gitignore | 2 ++ ...ses.txt => qgis-3.36.0-vendor-licenses.txt | 4 +-- qgis-gcc13.patch | 32 ------------------- qgis-qwt.patch | 12 +++---- qgis-server-README.fedora | 30 ----------------- qgis-serverprefix.patch | 6 ++-- qgis-yarn-offline.patch | 6 ++-- qgis.spec | 15 ++++----- sources | 4 +-- 9 files changed, 24 insertions(+), 87 deletions(-) rename qgis-3.34.3-vendor-licenses.txt => qgis-3.36.0-vendor-licenses.txt (94%) delete mode 100644 qgis-gcc13.patch diff --git a/.gitignore b/.gitignore index 502fb91..afd1ddc 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,5 @@ qgis_1.5.0.tar.gz /qgis-3.34.2.tar.bz2 /qgis-3.34.3.tar.bz2 /qgis-3.34.3-vendor.tar.xz +/qgis-3.36.0.tar.bz2 +/qgis-3.36.0-vendor.tar.xz diff --git a/qgis-3.34.3-vendor-licenses.txt b/qgis-3.36.0-vendor-licenses.txt similarity index 94% rename from qgis-3.34.3-vendor-licenses.txt rename to qgis-3.36.0-vendor-licenses.txt index 0d8291f..6be1aa6 100644 --- a/qgis-3.34.3-vendor-licenses.txt +++ b/qgis-3.36.0-vendor-licenses.txt @@ -1,4 +1,4 @@ -yarn run v1.22.19 +yarn run v1.22.21 $ /tmpnode_modules/.bin/license-checker --summary ├─ MIT: 1054 ├─ ISC: 75 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.36s. +Done in 2.99s. diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch deleted file mode 100644 index 123f889..0000000 --- a/qgis-gcc13.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -rupN --no-dereference qgis-3.34.3/external/lazperf/Extractor.hpp qgis-3.34.3-new/external/lazperf/Extractor.hpp ---- qgis-3.34.3/external/lazperf/Extractor.hpp 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/external/lazperf/Extractor.hpp 2024-01-21 09:48:11.849030445 +0100 -@@ -34,6 +34,7 @@ - - #pragma once - -+#include - #include - #include - #include -diff -rupN --no-dereference qgis-3.34.3/external/untwine/api/QgisUntwine.hpp qgis-3.34.3-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.34.3/external/untwine/api/QgisUntwine.hpp 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/external/untwine/api/QgisUntwine.hpp 2024-01-21 09:48:11.853030364 +0100 -@@ -1,5 +1,6 @@ - #pragma once - -+#include - #include - #include - #include -diff -rupN --no-dereference qgis-3.34.3/external/untwine/untwine/VoxelKey.hpp qgis-3.34.3-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.34.3/external/untwine/untwine/VoxelKey.hpp 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/external/untwine/untwine/VoxelKey.hpp 2024-01-21 09:48:11.857030283 +0100 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #pragma once - diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 069311b..e9275ea 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.3/cmake/FindQwtPolar.cmake qgis-3.34.3-new/cmake/FindQwtPolar.cmake ---- qgis-3.34.3/cmake/FindQwtPolar.cmake 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/cmake/FindQwtPolar.cmake 2024-01-21 09:48:09.462078801 +0100 +diff -rupN --no-dereference qgis-3.36.0/cmake/FindQwtPolar.cmake qgis-3.36.0-new/cmake/FindQwtPolar.cmake +--- qgis-3.36.0/cmake/FindQwtPolar.cmake 2024-02-23 13:04:10.000000000 +0100 ++++ qgis-3.36.0-new/cmake/FindQwtPolar.cmake 2024-02-23 16:07:52.502146783 +0100 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.34.3/cmake/FindQwtPolar.cmake qgis-3.34.3-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.34.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.3-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.34.3/src/app/gps/qgsgpsinformationwidget.cpp 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-01-21 09:48:09.467078699 +0100 +diff -rupN --no-dereference qgis-3.36.0/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.36.0-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.36.0/src/app/gps/qgsgpsinformationwidget.cpp 2024-02-23 13:04:10.000000000 +0100 ++++ qgis-3.36.0-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-02-23 16:07:52.506146253 +0100 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-server-README.fedora b/qgis-server-README.fedora index a18c90d..e18f114 100644 --- a/qgis-server-README.fedora +++ b/qgis-server-README.fedora @@ -29,33 +29,3 @@ Please fill in the metadata tab for your QGIS project. You can easily test your WMS by adding it as a WMS layer in QGIS. -================================================== - -The traditional QGIS server configuration is less comfortable and -I don't encourage it, unless you have a good reason to use it: - -This approach only allows for a single map service. - -It uses two configuration files, that must be located in the same -directory as the FCGI binary: - - - admin.sld - - wms_metadata.xml - -"admin.sld" uses extended SLD syntax (Style Layer Descriptor) to -describe symbolization of data. - -"wms_metadata.xml" supplies metadata for your WMS. You may also use this -file with the kind of configuration mentioned on top. But if you want to -serve different projects, and metadata varies between them, that file -won't work for you. Please see above for how to define project specific -metadata! - -Both configuration files are included as documentation. - -================================================== - -Further information: http://karlinapp.ethz.ch/qgis_wms - - Volker Fröhlich - volker27@gmx.at diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 82f5eae..d479345 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.3/src/core/qgsapplication.cpp qgis-3.34.3-new/src/core/qgsapplication.cpp ---- qgis-3.34.3/src/core/qgsapplication.cpp 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/src/core/qgsapplication.cpp 2024-01-21 09:48:04.646176228 +0100 +diff -rupN --no-dereference qgis-3.36.0/src/core/qgsapplication.cpp qgis-3.36.0-new/src/core/qgsapplication.cpp +--- qgis-3.36.0/src/core/qgsapplication.cpp 2024-02-23 13:04:10.000000000 +0100 ++++ qgis-3.36.0-new/src/core/qgsapplication.cpp 2024-02-23 16:07:46.729911552 +0100 @@ -357,6 +357,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 4d2414e..b39b7c8 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.3/resources/CMakeLists.txt qgis-3.34.3-new/resources/CMakeLists.txt ---- qgis-3.34.3/resources/CMakeLists.txt 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/resources/CMakeLists.txt 2024-01-21 09:48:07.008128468 +0100 +diff -rupN --no-dereference qgis-3.36.0/resources/CMakeLists.txt qgis-3.36.0-new/resources/CMakeLists.txt +--- qgis-3.36.0/resources/CMakeLists.txt 2024-02-23 13:04:10.000000000 +0100 ++++ qgis-3.36.0-new/resources/CMakeLists.txt 2024-02-23 16:07:49.639525884 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 457deaf..9d6287c 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.3 -Release: 2%{?dist} +Version: 3.36.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -28,8 +28,6 @@ Patch0: %{name}-serverprefix.patch Patch1: %{name}-yarn-offline.patch # Fix build against qwt-6.2 Patch2: %{name}-qwt.patch -# Fix GCC13 FTBFS -Patch3: %{name}-gcc13.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -218,10 +216,6 @@ install -pm0644 images/icons/%{name}-mime-icon.png %{buildroot}%{_datadir}/pixma install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-server.conf -# See qgis-server-README.fedora -rm -f %{buildroot}%{_libexecdir}/%{name}/wms_metadata.xml -rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld - # Remove install instructions rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* @@ -298,7 +292,7 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %exclude %{python3_sitearch}/%{name}/_server.so %files server -%doc src/server/admin.sld src/server/wms_metadata.xml %{name}-server-README.fedora +%doc %{name}-server-README.fedora %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf %{_bindir}/qgis_mapserver %{_libdir}/%{name}/server/ @@ -310,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Feb 23 2024 Sandro Mani - 3.36.0-1 +- Update to 3.36.0 + * Tue Jan 23 2024 Sandro Mani - 3.34.3-2 - Rebuild (libdraco) diff --git a/sources b/sources index 0607a21..a678863 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.3.tar.bz2) = eb9f6844264092eb20b816f5ffdd0ce6d45f3ae7ff8e2c2c2f6d27772a3c82cbc581591057148fb7f9b641902cdd04eb2b4a9cd82b9d62dc0596ee050334dd5e -SHA512 (qgis-3.34.3-vendor.tar.xz) = cfafc2750a2cfe90e13a2a890eda348f30799a1789e9bb8bf04971a2ab0ca43a87ce184685e988a012e64376bfe76da1fdd91d53ae91cbf86dad9d966c58ea2f +SHA512 (qgis-3.36.0.tar.bz2) = 8cc2c71906b8113aba1f220361398c2f638e4e937a48bf73777ba78ab24420d49bc6200f16a4980ea0d6597cbed3ace6fd455c1884ee4340b924b40a8e04db66 +SHA512 (qgis-3.36.0-vendor.tar.xz) = 2289f191c96f66f0f48ff04bac49de374904e8e29077b0bd69cd1fb2d46b1313dcbd98331ba0f6263a137148956859ca01916276cec647c1614640143604999b From 09586e704d6d4ba3647af896e7bd1ab4d9da51cc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 19 Mar 2024 12:15:39 +0100 Subject: [PATCH 137/201] Rebuild (PDAL) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 9d6287c..b2e077d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.36.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Mar 19 2024 Sandro Mani - 3.36.0-2 +- Rebuild (PDAL) + * Fri Feb 23 2024 Sandro Mani - 3.36.0-1 - Update to 3.36.0 From 6a53b3e383cc76ceb7f7184a83a4039524337996 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 22 Mar 2024 20:19:42 +0100 Subject: [PATCH 138/201] Update to 3.36.1 --- .gitignore | 2 ++ ...r-licenses.txt => qgis-3.36.1-vendor-licenses.txt | 4 ++-- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 7 files changed, 23 insertions(+), 18 deletions(-) rename qgis-3.36.0-vendor-licenses.txt => qgis-3.36.1-vendor-licenses.txt (94%) diff --git a/.gitignore b/.gitignore index afd1ddc..0d1f025 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,5 @@ qgis_1.5.0.tar.gz /qgis-3.34.3-vendor.tar.xz /qgis-3.36.0.tar.bz2 /qgis-3.36.0-vendor.tar.xz +/qgis-3.36.1.tar.bz2 +/qgis-3.36.1-vendor.tar.xz diff --git a/qgis-3.36.0-vendor-licenses.txt b/qgis-3.36.1-vendor-licenses.txt similarity index 94% rename from qgis-3.36.0-vendor-licenses.txt rename to qgis-3.36.1-vendor-licenses.txt index 6be1aa6..f81fd39 100644 --- a/qgis-3.36.0-vendor-licenses.txt +++ b/qgis-3.36.1-vendor-licenses.txt @@ -1,4 +1,4 @@ -yarn run v1.22.21 +yarn run v1.22.22 $ /tmpnode_modules/.bin/license-checker --summary ├─ MIT: 1054 ├─ ISC: 75 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.99s. +Done in 2.41s. diff --git a/qgis-qwt.patch b/qgis-qwt.patch index e9275ea..bd78e35 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.36.0/cmake/FindQwtPolar.cmake qgis-3.36.0-new/cmake/FindQwtPolar.cmake ---- qgis-3.36.0/cmake/FindQwtPolar.cmake 2024-02-23 13:04:10.000000000 +0100 -+++ qgis-3.36.0-new/cmake/FindQwtPolar.cmake 2024-02-23 16:07:52.502146783 +0100 +diff -rupN --no-dereference qgis-3.36.1/cmake/FindQwtPolar.cmake qgis-3.36.1-new/cmake/FindQwtPolar.cmake +--- qgis-3.36.1/cmake/FindQwtPolar.cmake 2024-03-22 14:30:34.000000000 +0100 ++++ qgis-3.36.1-new/cmake/FindQwtPolar.cmake 2024-03-22 20:19:01.768431764 +0100 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.36.0/cmake/FindQwtPolar.cmake qgis-3.36.0-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.36.0/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.36.0-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.36.0/src/app/gps/qgsgpsinformationwidget.cpp 2024-02-23 13:04:10.000000000 +0100 -+++ qgis-3.36.0-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-02-23 16:07:52.506146253 +0100 +diff -rupN --no-dereference qgis-3.36.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.36.1-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.36.1/src/app/gps/qgsgpsinformationwidget.cpp 2024-03-22 14:30:34.000000000 +0100 ++++ qgis-3.36.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-03-22 20:19:01.768431764 +0100 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index d479345..1ddae29 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.36.0/src/core/qgsapplication.cpp qgis-3.36.0-new/src/core/qgsapplication.cpp ---- qgis-3.36.0/src/core/qgsapplication.cpp 2024-02-23 13:04:10.000000000 +0100 -+++ qgis-3.36.0-new/src/core/qgsapplication.cpp 2024-02-23 16:07:46.729911552 +0100 +diff -rupN --no-dereference qgis-3.36.1/src/core/qgsapplication.cpp qgis-3.36.1-new/src/core/qgsapplication.cpp +--- qgis-3.36.1/src/core/qgsapplication.cpp 2024-03-22 14:30:34.000000000 +0100 ++++ qgis-3.36.1-new/src/core/qgsapplication.cpp 2024-03-22 20:18:56.576367573 +0100 @@ -357,6 +357,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index b39b7c8..becd9fe 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.36.0/resources/CMakeLists.txt qgis-3.36.0-new/resources/CMakeLists.txt ---- qgis-3.36.0/resources/CMakeLists.txt 2024-02-23 13:04:10.000000000 +0100 -+++ qgis-3.36.0-new/resources/CMakeLists.txt 2024-02-23 16:07:49.639525884 +0100 +diff -rupN --no-dereference qgis-3.36.1/resources/CMakeLists.txt qgis-3.36.1-new/resources/CMakeLists.txt +--- qgis-3.36.1/resources/CMakeLists.txt 2024-03-22 14:30:34.000000000 +0100 ++++ qgis-3.36.1-new/resources/CMakeLists.txt 2024-03-22 20:18:59.178399752 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index b2e077d..ed30b2b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.36.0 -Release: 2%{?dist} +Version: 3.36.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Mar 22 2024 Sandro Mani - 3.36.1-1 +- Update to 3.36.1 + * Tue Mar 19 2024 Sandro Mani - 3.36.0-2 - Rebuild (PDAL) diff --git a/sources b/sources index a678863..b8bb056 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.36.0.tar.bz2) = 8cc2c71906b8113aba1f220361398c2f638e4e937a48bf73777ba78ab24420d49bc6200f16a4980ea0d6597cbed3ace6fd455c1884ee4340b924b40a8e04db66 -SHA512 (qgis-3.36.0-vendor.tar.xz) = 2289f191c96f66f0f48ff04bac49de374904e8e29077b0bd69cd1fb2d46b1313dcbd98331ba0f6263a137148956859ca01916276cec647c1614640143604999b +SHA512 (qgis-3.36.1.tar.bz2) = e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273 +SHA512 (qgis-3.36.1-vendor.tar.xz) = 3eaaab4ac990f77967c0d3c4efec22038392cbfd4dcac069bfb923f4db617b68d6e9946103ec1905ba0a304d4863867aff8a95f9500b2c69724c8d6b8a582c24 From f36ee663b35bc6b9d3cd56f488e1968197a4ad55 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 23 Apr 2024 13:11:27 +0200 Subject: [PATCH 139/201] Update to 3.36.2 --- .gitignore | 2 ++ qgis-3.36.2-vendor-licenses.txt | 26 ++++++++++++++++++++++++++ qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 7 files changed, 46 insertions(+), 15 deletions(-) create mode 100644 qgis-3.36.2-vendor-licenses.txt diff --git a/.gitignore b/.gitignore index 0d1f025..26b050f 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,5 @@ qgis_1.5.0.tar.gz /qgis-3.36.0-vendor.tar.xz /qgis-3.36.1.tar.bz2 /qgis-3.36.1-vendor.tar.xz +/qgis-3.36.2.tar.bz2 +/qgis-3.36.2-vendor.tar.xz diff --git a/qgis-3.36.2-vendor-licenses.txt b/qgis-3.36.2-vendor-licenses.txt new file mode 100644 index 0000000..52f09ee --- /dev/null +++ b/qgis-3.36.2-vendor-licenses.txt @@ -0,0 +1,26 @@ +yarn run v1.22.22 +$ /tmpnode_modules/.bin/license-checker --summary +├─ MIT: 1054 +├─ ISC: 75 +├─ BSD-3-Clause: 32 +├─ BSD-2-Clause: 28 +├─ Apache-2.0: 25 +├─ MIT*: 4 +├─ (MIT OR CC0-1.0): 4 +├─ Unlicense: 3 +├─ (MIT OR Apache-2.0): 2 +├─ CC0-1.0: 2 +├─ (MIT AND CC-BY-3.0): 2 +├─ 0BSD: 2 +├─ UNLICENSED: 1 +├─ Python-2.0: 1 +├─ CC-BY-4.0: 1 +├─ BSD*: 1 +├─ (BSD-3-Clause OR GPL-2.0): 1 +├─ (WTFPL OR MIT): 1 +├─ MIT,Apache2: 1 +├─ (MIT AND BSD-3-Clause): 1 +├─ CC-BY-3.0: 1 +└─ MPL-2.0: 1 + +Done in 3.61s. diff --git a/qgis-qwt.patch b/qgis-qwt.patch index bd78e35..7d5e642 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.36.1/cmake/FindQwtPolar.cmake qgis-3.36.1-new/cmake/FindQwtPolar.cmake ---- qgis-3.36.1/cmake/FindQwtPolar.cmake 2024-03-22 14:30:34.000000000 +0100 -+++ qgis-3.36.1-new/cmake/FindQwtPolar.cmake 2024-03-22 20:19:01.768431764 +0100 +diff -rupN --no-dereference qgis-3.36.2/cmake/FindQwtPolar.cmake qgis-3.36.2-new/cmake/FindQwtPolar.cmake +--- qgis-3.36.2/cmake/FindQwtPolar.cmake 2024-04-19 14:01:22.000000000 +0200 ++++ qgis-3.36.2-new/cmake/FindQwtPolar.cmake 2024-04-23 13:10:12.216872338 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.36.1/cmake/FindQwtPolar.cmake qgis-3.36.1-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.36.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.36.1-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.36.1/src/app/gps/qgsgpsinformationwidget.cpp 2024-03-22 14:30:34.000000000 +0100 -+++ qgis-3.36.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-03-22 20:19:01.768431764 +0100 +diff -rupN --no-dereference qgis-3.36.2/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.36.2-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.36.2/src/app/gps/qgsgpsinformationwidget.cpp 2024-04-19 14:01:22.000000000 +0200 ++++ qgis-3.36.2-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-04-23 13:10:12.216872338 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 1ddae29..da0671c 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.36.1/src/core/qgsapplication.cpp qgis-3.36.1-new/src/core/qgsapplication.cpp ---- qgis-3.36.1/src/core/qgsapplication.cpp 2024-03-22 14:30:34.000000000 +0100 -+++ qgis-3.36.1-new/src/core/qgsapplication.cpp 2024-03-22 20:18:56.576367573 +0100 +diff -rupN --no-dereference qgis-3.36.2/src/core/qgsapplication.cpp qgis-3.36.2-new/src/core/qgsapplication.cpp +--- qgis-3.36.2/src/core/qgsapplication.cpp 2024-04-19 14:01:22.000000000 +0200 ++++ qgis-3.36.2-new/src/core/qgsapplication.cpp 2024-04-23 13:10:06.247793026 +0200 @@ -357,6 +357,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index becd9fe..c5bfc35 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.36.1/resources/CMakeLists.txt qgis-3.36.1-new/resources/CMakeLists.txt ---- qgis-3.36.1/resources/CMakeLists.txt 2024-03-22 14:30:34.000000000 +0100 -+++ qgis-3.36.1-new/resources/CMakeLists.txt 2024-03-22 20:18:59.178399752 +0100 +diff -rupN --no-dereference qgis-3.36.2/resources/CMakeLists.txt qgis-3.36.2-new/resources/CMakeLists.txt +--- qgis-3.36.2/resources/CMakeLists.txt 2024-04-19 14:01:22.000000000 +0200 ++++ qgis-3.36.2-new/resources/CMakeLists.txt 2024-04-23 13:10:09.264833113 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index ed30b2b..a468d3a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.36.1 +Version: 3.36.2 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Apr 20 2024 Sandro Mani - 3.36.2-1 +- Update to 3.36.2 + * Fri Mar 22 2024 Sandro Mani - 3.36.1-1 - Update to 3.36.1 diff --git a/sources b/sources index b8bb056..cba56d1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.36.1.tar.bz2) = e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273 -SHA512 (qgis-3.36.1-vendor.tar.xz) = 3eaaab4ac990f77967c0d3c4efec22038392cbfd4dcac069bfb923f4db617b68d6e9946103ec1905ba0a304d4863867aff8a95f9500b2c69724c8d6b8a582c24 +SHA512 (qgis-3.36.2.tar.bz2) = 345020f3a7c2b989bba2d2b83213836dbf8b572f3e8af8d6b62192eb25e93f4217263e70a02fe228278097e003364ade2b6a8a39d2d8408346259117ac4fb63c +SHA512 (qgis-3.36.2-vendor.tar.xz) = 8f7a0f876cb99076b2a875efb2801fd3343011d9d7f12a4a27350a8a103f580e1749ec5e7afad180b006ed8868701f8547aeb679c5451442db87aa0e03319666 From e71ea63512a693fd503221b04b98d0af8d5f32fb Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 23 Apr 2024 18:05:26 +0200 Subject: [PATCH 140/201] Reupload sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index cba56d1..3d4e815 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.36.2.tar.bz2) = 345020f3a7c2b989bba2d2b83213836dbf8b572f3e8af8d6b62192eb25e93f4217263e70a02fe228278097e003364ade2b6a8a39d2d8408346259117ac4fb63c +SHA512 (qgis-3.36.2.tar.bz2) = 94561abad07ec22874584aac9d74c853114f6f70abcd5421d31facef3ca268641036709a311d26f12b018836b96aa0e0f941ecd0341f949145aa2d91b6b4d7fb SHA512 (qgis-3.36.2-vendor.tar.xz) = 8f7a0f876cb99076b2a875efb2801fd3343011d9d7f12a4a27350a8a103f580e1749ec5e7afad180b006ed8868701f8547aeb679c5451442db87aa0e03319666 From 6b830018104e4cd7154eac8155155ab59c7e92e3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 24 Apr 2024 08:49:21 +0200 Subject: [PATCH 141/201] Remove unused file --- qgis-3.36.1-vendor-licenses.txt | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 qgis-3.36.1-vendor-licenses.txt diff --git a/qgis-3.36.1-vendor-licenses.txt b/qgis-3.36.1-vendor-licenses.txt deleted file mode 100644 index f81fd39..0000000 --- a/qgis-3.36.1-vendor-licenses.txt +++ /dev/null @@ -1,26 +0,0 @@ -yarn run v1.22.22 -$ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 1054 -├─ ISC: 75 -├─ BSD-3-Clause: 32 -├─ BSD-2-Clause: 28 -├─ Apache-2.0: 25 -├─ MIT*: 4 -├─ (MIT OR CC0-1.0): 4 -├─ Unlicense: 3 -├─ (MIT OR Apache-2.0): 2 -├─ CC0-1.0: 2 -├─ (MIT AND CC-BY-3.0): 2 -├─ 0BSD: 2 -├─ UNLICENSED: 1 -├─ Python-2.0: 1 -├─ CC-BY-4.0: 1 -├─ BSD*: 1 -├─ (BSD-3-Clause OR GPL-2.0): 1 -├─ (WTFPL OR MIT): 1 -├─ MIT,Apache2: 1 -├─ (MIT AND BSD-3-Clause): 1 -├─ CC-BY-3.0: 1 -└─ MPL-2.0: 1 - -Done in 2.41s. From 6a345c372e1fc52ba7b6f3ced2cbf41286e08116 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 14 May 2024 18:39:19 +0200 Subject: [PATCH 142/201] Rebuild (gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index a468d3a..583f312 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.36.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue May 14 2024 Sandro Mani - 3.36.2-2 +- Rebuild (gdal) + * Sat Apr 20 2024 Sandro Mani - 3.36.2-1 - Update to 3.36.2 From 021b36d3f19d7d17094305745053a4c4260a0a35 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 21 May 2024 13:33:20 +0200 Subject: [PATCH 143/201] Update to 3.36.3 --- .gitignore | 2 ++ ...-vendor-licenses.txt => qgis-3.36.3-vendor-licenses.txt | 2 +- qgis.spec | 7 +++++-- sources | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) rename qgis-3.36.2-vendor-licenses.txt => qgis-3.36.3-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 26b050f..abd6672 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,5 @@ qgis_1.5.0.tar.gz /qgis-3.36.1-vendor.tar.xz /qgis-3.36.2.tar.bz2 /qgis-3.36.2-vendor.tar.xz +/qgis-3.36.3.tar.bz2 +/qgis-3.36.3-vendor.tar.xz diff --git a/qgis-3.36.2-vendor-licenses.txt b/qgis-3.36.3-vendor-licenses.txt similarity index 97% rename from qgis-3.36.2-vendor-licenses.txt rename to qgis-3.36.3-vendor-licenses.txt index 52f09ee..48b3675 100644 --- a/qgis-3.36.2-vendor-licenses.txt +++ b/qgis-3.36.3-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 3.61s. +Done in 2.58s. diff --git a/qgis.spec b/qgis.spec index 583f312..2129beb 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.36.2 -Release: 2%{?dist} +Version: 3.36.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat May 18 2024 Sandro Mani - 3.36.3-1 +- Update to 3.36.3 + * Tue May 14 2024 Sandro Mani - 3.36.2-2 - Rebuild (gdal) diff --git a/sources b/sources index 3d4e815..ce9c14c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.36.2.tar.bz2) = 94561abad07ec22874584aac9d74c853114f6f70abcd5421d31facef3ca268641036709a311d26f12b018836b96aa0e0f941ecd0341f949145aa2d91b6b4d7fb -SHA512 (qgis-3.36.2-vendor.tar.xz) = 8f7a0f876cb99076b2a875efb2801fd3343011d9d7f12a4a27350a8a103f580e1749ec5e7afad180b006ed8868701f8547aeb679c5451442db87aa0e03319666 +SHA512 (qgis-3.36.3.tar.bz2) = 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a +SHA512 (qgis-3.36.3-vendor.tar.xz) = a5c110766452ab04193dc323b48eb8c6a57b28fa002f2710ecc9f7635b01235eda963b1094967823057463f2e65e13fd87baede1fa273ca4c5dd94d59b6f2c5c From 67b01a633711a7b91520115f410b0b5ff2a8a3e3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 30 May 2024 21:29:44 -0600 Subject: [PATCH 144/201] Relax node requirement to 22 --- qgis.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index 2129beb..c217629 100644 --- a/qgis.spec +++ b/qgis.spec @@ -165,8 +165,8 @@ install -pm0644 %{SOURCE4} . gzip ChangeLog -sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19"/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19 || 20"/' $(find "$PWD/.package-cache" | grep 'node_modules/@achrinza/node-ipc/package.json') -sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19"/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19 || 20"/' $(find "$PWD/.package-cache" | grep 'node_modules/@achrinza/node-ipc/.yarn-metadata.json') +sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19"/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19 || 20 || 22"/' $(find "$PWD/.package-cache" | grep 'node_modules/@achrinza/node-ipc/package.json') +sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19"/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19 || 20 || 22"/' $(find "$PWD/.package-cache" | grep 'node_modules/@achrinza/node-ipc/.yarn-metadata.json') %build %cmake \ From 509be3eb78e3f5ac7d8daa25e0c51d6d91fdd105 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 22:45:15 +0200 Subject: [PATCH 145/201] Rebuilt for Python 3.13 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index c217629..23df928 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.36.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jun 07 2024 Python Maint - 3.36.3-2 +- Rebuilt for Python 3.13 + * Sat May 18 2024 Sandro Mani - 3.36.3-1 - Update to 3.36.3 From d402f6bb8b8d8804199fd782637bb18c930e7a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 16 Jun 2024 07:28:08 +0200 Subject: [PATCH 146/201] Rebuilt for exiv2 0.28.2 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 23df928..7e94dc4 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.36.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Jun 16 2024 Robert-André Mauchin - 3.36.3-3 +- Rebuilt for exiv2 0.28.2 + * Fri Jun 07 2024 Python Maint - 3.36.3-2 - Rebuilt for Python 3.13 From 830e98b58115152d976222e95fc87d4d39cf428e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 23 Jun 2024 09:52:56 +0200 Subject: [PATCH 147/201] Update to 3.38.0 --- .gitignore | 2 ++ qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index abd6672..5fce5f3 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,5 @@ qgis_1.5.0.tar.gz /qgis-3.36.2-vendor.tar.xz /qgis-3.36.3.tar.bz2 /qgis-3.36.3-vendor.tar.xz +/qgis-3.38.0.tar.bz2 +/qgis-3.38.0-vendor.tar.xz diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 7d5e642..8daead2 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.36.2/cmake/FindQwtPolar.cmake qgis-3.36.2-new/cmake/FindQwtPolar.cmake ---- qgis-3.36.2/cmake/FindQwtPolar.cmake 2024-04-19 14:01:22.000000000 +0200 -+++ qgis-3.36.2-new/cmake/FindQwtPolar.cmake 2024-04-23 13:10:12.216872338 +0200 +diff -rupN --no-dereference qgis-3.38.0/cmake/FindQwtPolar.cmake qgis-3.38.0-new/cmake/FindQwtPolar.cmake +--- qgis-3.38.0/cmake/FindQwtPolar.cmake 2024-06-21 14:12:36.000000000 +0200 ++++ qgis-3.38.0-new/cmake/FindQwtPolar.cmake 2024-06-22 10:25:31.600705294 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.36.2/cmake/FindQwtPolar.cmake qgis-3.36.2-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.36.2/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.36.2-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.36.2/src/app/gps/qgsgpsinformationwidget.cpp 2024-04-19 14:01:22.000000000 +0200 -+++ qgis-3.36.2-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-04-23 13:10:12.216872338 +0200 +diff -rupN --no-dereference qgis-3.38.0/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.38.0-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.38.0/src/app/gps/qgsgpsinformationwidget.cpp 2024-06-21 14:12:36.000000000 +0200 ++++ qgis-3.38.0-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-06-22 10:25:31.600705294 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index da0671c..c0194a9 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.36.2/src/core/qgsapplication.cpp qgis-3.36.2-new/src/core/qgsapplication.cpp ---- qgis-3.36.2/src/core/qgsapplication.cpp 2024-04-19 14:01:22.000000000 +0200 -+++ qgis-3.36.2-new/src/core/qgsapplication.cpp 2024-04-23 13:10:06.247793026 +0200 -@@ -357,6 +357,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.38.0/src/core/qgsapplication.cpp qgis-3.38.0-new/src/core/qgsapplication.cpp +--- qgis-3.38.0/src/core/qgsapplication.cpp 2024-06-21 14:12:36.000000000 +0200 ++++ qgis-3.38.0-new/src/core/qgsapplication.cpp 2024-06-22 10:25:25.621510802 +0200 +@@ -362,6 +362,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index c5bfc35..b68d779 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.36.2/resources/CMakeLists.txt qgis-3.36.2-new/resources/CMakeLists.txt ---- qgis-3.36.2/resources/CMakeLists.txt 2024-04-19 14:01:22.000000000 +0200 -+++ qgis-3.36.2-new/resources/CMakeLists.txt 2024-04-23 13:10:09.264833113 +0200 +diff -rupN --no-dereference qgis-3.38.0/resources/CMakeLists.txt qgis-3.38.0-new/resources/CMakeLists.txt +--- qgis-3.38.0/resources/CMakeLists.txt 2024-06-21 14:12:36.000000000 +0200 ++++ qgis-3.38.0-new/resources/CMakeLists.txt 2024-06-22 10:25:28.662609724 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 7e94dc4..786d7e5 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.36.3 -Release: 3%{?dist} +Version: 3.38.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Jun 22 2024 Sandro Mani - 3.38.0-1 +- Update to 3.38.0 + * Sun Jun 16 2024 Robert-André Mauchin - 3.36.3-3 - Rebuilt for exiv2 0.28.2 diff --git a/sources b/sources index ce9c14c..e33a3d2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.36.3.tar.bz2) = 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a -SHA512 (qgis-3.36.3-vendor.tar.xz) = a5c110766452ab04193dc323b48eb8c6a57b28fa002f2710ecc9f7635b01235eda963b1094967823057463f2e65e13fd87baede1fa273ca4c5dd94d59b6f2c5c +SHA512 (qgis-3.38.0.tar.bz2) = 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff +SHA512 (qgis-3.38.0-vendor.tar.xz) = 57a4d0363bf11c37a611932b9a4e16673de992544232246d1a2bc59865aa3671c4b0f1b83928e098e486e283ee38aa23be18023dc96bfa7dc62da5c4d357b472 From 9b0a6531bb9ed49325ff85c20cb1daa5b0a71333 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 23 Jun 2024 13:05:48 +0200 Subject: [PATCH 148/201] Add qgis-3.38.0-vendor-licenses.txt --- ...6.3-vendor-licenses.txt => qgis-3.38.0-vendor-licenses.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename qgis-3.36.3-vendor-licenses.txt => qgis-3.38.0-vendor-licenses.txt (94%) diff --git a/qgis-3.36.3-vendor-licenses.txt b/qgis-3.38.0-vendor-licenses.txt similarity index 94% rename from qgis-3.36.3-vendor-licenses.txt rename to qgis-3.38.0-vendor-licenses.txt index 48b3675..43437ab 100644 --- a/qgis-3.36.3-vendor-licenses.txt +++ b/qgis-3.38.0-vendor-licenses.txt @@ -1,6 +1,6 @@ yarn run v1.22.22 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 1054 +├─ MIT: 1057 ├─ ISC: 75 ├─ BSD-3-Clause: 32 ├─ BSD-2-Clause: 28 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.58s. +Done in 2.13s. From e97722f6da040f20a3ce705727d5065091535a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 1 Jul 2024 07:44:27 +0200 Subject: [PATCH 149/201] Rebuilt for exiv2 0.28.2 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 786d7e5..6448942 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.38.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Jul 01 2024 Robert-André Mauchin - 3.38.0-2 +- Rebuild for exiv2 0.28.2 + * Sat Jun 22 2024 Sandro Mani - 3.38.0-1 - Update to 3.38.0 From 459b19e71f2fbf1f80c982ec2b58cab5fd76f5e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 17:35:12 +0000 Subject: [PATCH 150/201] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 6448942..5736a88 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.38.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 3.38.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 01 2024 Robert-André Mauchin - 3.38.0-2 - Rebuild for exiv2 0.28.2 From 2ff86c78323347cbd6ddfba21cf8c7e78ef967a2 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 21 Jul 2024 10:52:38 +0200 Subject: [PATCH 151/201] Update to 3.38.1 --- .gitignore | 2 ++ qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 5fce5f3..fdb64cf 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,5 @@ qgis_1.5.0.tar.gz /qgis-3.36.3-vendor.tar.xz /qgis-3.38.0.tar.bz2 /qgis-3.38.0-vendor.tar.xz +/qgis-3.38.1.tar.bz2 +/qgis-3.38.1-vendor.tar.xz diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 8daead2..fa8e946 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.0/cmake/FindQwtPolar.cmake qgis-3.38.0-new/cmake/FindQwtPolar.cmake ---- qgis-3.38.0/cmake/FindQwtPolar.cmake 2024-06-21 14:12:36.000000000 +0200 -+++ qgis-3.38.0-new/cmake/FindQwtPolar.cmake 2024-06-22 10:25:31.600705294 +0200 +diff -rupN --no-dereference qgis-3.38.1/cmake/FindQwtPolar.cmake qgis-3.38.1-new/cmake/FindQwtPolar.cmake +--- qgis-3.38.1/cmake/FindQwtPolar.cmake 2024-07-19 14:05:41.000000000 +0200 ++++ qgis-3.38.1-new/cmake/FindQwtPolar.cmake 2024-07-20 23:43:43.902474309 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.38.0/cmake/FindQwtPolar.cmake qgis-3.38.0-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.38.0/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.38.0-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.38.0/src/app/gps/qgsgpsinformationwidget.cpp 2024-06-21 14:12:36.000000000 +0200 -+++ qgis-3.38.0-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-06-22 10:25:31.600705294 +0200 +diff -rupN --no-dereference qgis-3.38.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.38.1-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.38.1/src/app/gps/qgsgpsinformationwidget.cpp 2024-07-19 14:05:41.000000000 +0200 ++++ qgis-3.38.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-07-20 23:43:43.902474309 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index c0194a9..346fedc 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.0/src/core/qgsapplication.cpp qgis-3.38.0-new/src/core/qgsapplication.cpp ---- qgis-3.38.0/src/core/qgsapplication.cpp 2024-06-21 14:12:36.000000000 +0200 -+++ qgis-3.38.0-new/src/core/qgsapplication.cpp 2024-06-22 10:25:25.621510802 +0200 +diff -rupN --no-dereference qgis-3.38.1/src/core/qgsapplication.cpp qgis-3.38.1-new/src/core/qgsapplication.cpp +--- qgis-3.38.1/src/core/qgsapplication.cpp 2024-07-19 14:05:41.000000000 +0200 ++++ qgis-3.38.1-new/src/core/qgsapplication.cpp 2024-07-20 23:43:38.434473886 +0200 @@ -362,6 +362,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index b68d779..b8a16a2 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.0/resources/CMakeLists.txt qgis-3.38.0-new/resources/CMakeLists.txt ---- qgis-3.38.0/resources/CMakeLists.txt 2024-06-21 14:12:36.000000000 +0200 -+++ qgis-3.38.0-new/resources/CMakeLists.txt 2024-06-22 10:25:28.662609724 +0200 +diff -rupN --no-dereference qgis-3.38.1/resources/CMakeLists.txt qgis-3.38.1-new/resources/CMakeLists.txt +--- qgis-3.38.1/resources/CMakeLists.txt 2024-07-19 14:05:41.000000000 +0200 ++++ qgis-3.38.1-new/resources/CMakeLists.txt 2024-07-20 23:43:41.186474101 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 5736a88..67b62a1 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.38.0 -Release: 3%{?dist} +Version: 3.38.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Jul 20 2024 Sandro Mani - 3.38.1-1 +- Update to 3.38.1 + * Fri Jul 19 2024 Fedora Release Engineering - 3.38.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index e33a3d2..8e2e7f4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.38.0.tar.bz2) = 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff -SHA512 (qgis-3.38.0-vendor.tar.xz) = 57a4d0363bf11c37a611932b9a4e16673de992544232246d1a2bc59865aa3671c4b0f1b83928e098e486e283ee38aa23be18023dc96bfa7dc62da5c4d357b472 +SHA512 (qgis-3.38.1.tar.bz2) = 059230a62b6ad6b68f1a4e173042d38ffa62862373d81e87a55c17bd631381725fb77e7af5822e7a8e6af672f2947ffce43bcaeb14c5e2e16d24ac31cc3a1ce0 +SHA512 (qgis-3.38.1-vendor.tar.xz) = 5306e396a55fbaf4dec1a907290f0ca9409cb082f3f8fdc9915a8738fc94420a4cc9d70c6c76bdf2a8828920b00921c12db8278e33a546101b71773c53fbd84c From ddb91898cd6ab9aaea829ce31ba5ff72b76af3a8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 21 Jul 2024 12:52:24 +0200 Subject: [PATCH 152/201] Add qgis-3.38.1-vendor-licenses.txt --- ....38.0-vendor-licenses.txt => qgis-3.38.1-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.38.0-vendor-licenses.txt => qgis-3.38.1-vendor-licenses.txt (97%) diff --git a/qgis-3.38.0-vendor-licenses.txt b/qgis-3.38.1-vendor-licenses.txt similarity index 97% rename from qgis-3.38.0-vendor-licenses.txt rename to qgis-3.38.1-vendor-licenses.txt index 43437ab..6314d83 100644 --- a/qgis-3.38.0-vendor-licenses.txt +++ b/qgis-3.38.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.13s. +Done in 2.05s. From 56b2e50c165ec29bbd62f169cdea7fa5da3245c8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 30 Jul 2024 09:31:40 +0200 Subject: [PATCH 153/201] Rebuild (grass) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 67b62a1..73de3bf 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.38.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Jul 30 2024 Sandro Mani - 3.38.1-2 +- Rebuild (grass) + * Sat Jul 20 2024 Sandro Mani - 3.38.1-1 - Update to 3.38.1 From 7d43cc856e14bf0f5ba3cfd6757329f74dca197a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 17 Aug 2024 23:55:43 +0200 Subject: [PATCH 154/201] Update to 3.38.2 --- .gitignore | 2 ++ ...r-licenses.txt => qgis-3.38.2-vendor-licenses.txt | 2 +- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 7 files changed, 22 insertions(+), 17 deletions(-) rename qgis-3.38.1-vendor-licenses.txt => qgis-3.38.2-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index fdb64cf..d54caac 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,5 @@ qgis_1.5.0.tar.gz /qgis-3.38.0-vendor.tar.xz /qgis-3.38.1.tar.bz2 /qgis-3.38.1-vendor.tar.xz +/qgis-3.38.2.tar.bz2 +/qgis-3.38.2-vendor.tar.xz diff --git a/qgis-3.38.1-vendor-licenses.txt b/qgis-3.38.2-vendor-licenses.txt similarity index 97% rename from qgis-3.38.1-vendor-licenses.txt rename to qgis-3.38.2-vendor-licenses.txt index 6314d83..9ce9f03 100644 --- a/qgis-3.38.1-vendor-licenses.txt +++ b/qgis-3.38.2-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.05s. +Done in 2.51s. diff --git a/qgis-qwt.patch b/qgis-qwt.patch index fa8e946..3c0441f 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.1/cmake/FindQwtPolar.cmake qgis-3.38.1-new/cmake/FindQwtPolar.cmake ---- qgis-3.38.1/cmake/FindQwtPolar.cmake 2024-07-19 14:05:41.000000000 +0200 -+++ qgis-3.38.1-new/cmake/FindQwtPolar.cmake 2024-07-20 23:43:43.902474309 +0200 +diff -rupN --no-dereference qgis-3.38.2/cmake/FindQwtPolar.cmake qgis-3.38.2-new/cmake/FindQwtPolar.cmake +--- qgis-3.38.2/cmake/FindQwtPolar.cmake 2024-08-16 14:14:33.000000000 +0200 ++++ qgis-3.38.2-new/cmake/FindQwtPolar.cmake 2024-08-17 23:39:23.328846262 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.38.1/cmake/FindQwtPolar.cmake qgis-3.38.1-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.38.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.38.1-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.38.1/src/app/gps/qgsgpsinformationwidget.cpp 2024-07-19 14:05:41.000000000 +0200 -+++ qgis-3.38.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-07-20 23:43:43.902474309 +0200 +diff -rupN --no-dereference qgis-3.38.2/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.38.2-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.38.2/src/app/gps/qgsgpsinformationwidget.cpp 2024-08-16 14:14:33.000000000 +0200 ++++ qgis-3.38.2-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-08-17 23:39:23.329846266 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 346fedc..52e6a2c 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.1/src/core/qgsapplication.cpp qgis-3.38.1-new/src/core/qgsapplication.cpp ---- qgis-3.38.1/src/core/qgsapplication.cpp 2024-07-19 14:05:41.000000000 +0200 -+++ qgis-3.38.1-new/src/core/qgsapplication.cpp 2024-07-20 23:43:38.434473886 +0200 +diff -rupN --no-dereference qgis-3.38.2/src/core/qgsapplication.cpp qgis-3.38.2-new/src/core/qgsapplication.cpp +--- qgis-3.38.2/src/core/qgsapplication.cpp 2024-08-16 14:14:33.000000000 +0200 ++++ qgis-3.38.2-new/src/core/qgsapplication.cpp 2024-08-17 23:39:18.191827361 +0200 @@ -362,6 +362,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index b8a16a2..e775a25 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.1/resources/CMakeLists.txt qgis-3.38.1-new/resources/CMakeLists.txt ---- qgis-3.38.1/resources/CMakeLists.txt 2024-07-19 14:05:41.000000000 +0200 -+++ qgis-3.38.1-new/resources/CMakeLists.txt 2024-07-20 23:43:41.186474101 +0200 +diff -rupN --no-dereference qgis-3.38.2/resources/CMakeLists.txt qgis-3.38.2-new/resources/CMakeLists.txt +--- qgis-3.38.2/resources/CMakeLists.txt 2024-08-16 14:14:33.000000000 +0200 ++++ qgis-3.38.2-new/resources/CMakeLists.txt 2024-08-17 23:39:20.753836619 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 73de3bf..08f7637 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.38.1 -Release: 2%{?dist} +Version: 3.38.2 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Aug 17 2024 Sandro Mani - 3.38.2-1 +- Update to 3.38.2 + * Tue Jul 30 2024 Sandro Mani - 3.38.1-2 - Rebuild (grass) diff --git a/sources b/sources index 8e2e7f4..8533987 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.38.1.tar.bz2) = 059230a62b6ad6b68f1a4e173042d38ffa62862373d81e87a55c17bd631381725fb77e7af5822e7a8e6af672f2947ffce43bcaeb14c5e2e16d24ac31cc3a1ce0 -SHA512 (qgis-3.38.1-vendor.tar.xz) = 5306e396a55fbaf4dec1a907290f0ca9409cb082f3f8fdc9915a8738fc94420a4cc9d70c6c76bdf2a8828920b00921c12db8278e33a546101b71773c53fbd84c +SHA512 (qgis-3.38.2.tar.bz2) = 79f75009e592e716fcda960f1c7f320f46dd34e4d90ea984bed1c5d4f588af2ec304deaf815c401f2288ee077f004bc65ab39436c043ede3b671086e6eec30c8 +SHA512 (qgis-3.38.2-vendor.tar.xz) = dd324c238f43f795b97a37531f4c6c38c5dcf66e4c49e6f22a6090b04b24a8e3f53dc862d847c7e483c299bb75f2adeaf55ccb5c01b3ab0a1944923f58a8d110 From c4f33cd75aa9b2a259b2fc0cb4a1e7bbf0efd837 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 9 Sep 2024 11:50:57 +0200 Subject: [PATCH 155/201] Rebuild (PDAL) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 08f7637..c446eb7 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.38.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Mon Sep 09 2024 Sandro Mani - 3.38.2-2 +- Rebuild (PDAL) + * Sat Aug 17 2024 Sandro Mani - 3.38.2-1 - Update to 3.38.2 From 52ef9e01131733464373788a09372a377cc2a429 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 14 Sep 2024 15:42:39 +0200 Subject: [PATCH 156/201] Update to 3.38.3 --- .gitignore | 2 ++ qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index d54caac..2ea504c 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,5 @@ qgis_1.5.0.tar.gz /qgis-3.38.1-vendor.tar.xz /qgis-3.38.2.tar.bz2 /qgis-3.38.2-vendor.tar.xz +/qgis-3.38.3.tar.bz2 +/qgis-3.38.3-vendor.tar.xz diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 3c0441f..523876e 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.2/cmake/FindQwtPolar.cmake qgis-3.38.2-new/cmake/FindQwtPolar.cmake ---- qgis-3.38.2/cmake/FindQwtPolar.cmake 2024-08-16 14:14:33.000000000 +0200 -+++ qgis-3.38.2-new/cmake/FindQwtPolar.cmake 2024-08-17 23:39:23.328846262 +0200 +diff -rupN --no-dereference qgis-3.38.3/cmake/FindQwtPolar.cmake qgis-3.38.3-new/cmake/FindQwtPolar.cmake +--- qgis-3.38.3/cmake/FindQwtPolar.cmake 2024-09-13 14:01:14.000000000 +0200 ++++ qgis-3.38.3-new/cmake/FindQwtPolar.cmake 2024-09-14 11:16:35.244246036 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.38.2/cmake/FindQwtPolar.cmake qgis-3.38.2-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.38.2/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.38.2-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.38.2/src/app/gps/qgsgpsinformationwidget.cpp 2024-08-16 14:14:33.000000000 +0200 -+++ qgis-3.38.2-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-08-17 23:39:23.329846266 +0200 +diff -rupN --no-dereference qgis-3.38.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.38.3-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.38.3/src/app/gps/qgsgpsinformationwidget.cpp 2024-09-13 14:01:14.000000000 +0200 ++++ qgis-3.38.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-09-14 11:16:35.244246036 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 52e6a2c..5cd9621 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.2/src/core/qgsapplication.cpp qgis-3.38.2-new/src/core/qgsapplication.cpp ---- qgis-3.38.2/src/core/qgsapplication.cpp 2024-08-16 14:14:33.000000000 +0200 -+++ qgis-3.38.2-new/src/core/qgsapplication.cpp 2024-08-17 23:39:18.191827361 +0200 +diff -rupN --no-dereference qgis-3.38.3/src/core/qgsapplication.cpp qgis-3.38.3-new/src/core/qgsapplication.cpp +--- qgis-3.38.3/src/core/qgsapplication.cpp 2024-09-13 14:01:14.000000000 +0200 ++++ qgis-3.38.3-new/src/core/qgsapplication.cpp 2024-09-14 11:16:29.379671853 +0200 @@ -362,6 +362,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index e775a25..629a106 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.2/resources/CMakeLists.txt qgis-3.38.2-new/resources/CMakeLists.txt ---- qgis-3.38.2/resources/CMakeLists.txt 2024-08-16 14:14:33.000000000 +0200 -+++ qgis-3.38.2-new/resources/CMakeLists.txt 2024-08-17 23:39:20.753836619 +0200 +diff -rupN --no-dereference qgis-3.38.3/resources/CMakeLists.txt qgis-3.38.3-new/resources/CMakeLists.txt +--- qgis-3.38.3/resources/CMakeLists.txt 2024-09-13 14:01:14.000000000 +0200 ++++ qgis-3.38.3-new/resources/CMakeLists.txt 2024-09-14 11:16:32.323450406 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index c446eb7..40a61a5 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.38.2 -Release: 2%{?dist} +Version: 3.38.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Sep 14 2024 Sandro Mani - 3.38.3-1 +- Update to 3.38.3 + * Mon Sep 09 2024 Sandro Mani - 3.38.2-2 - Rebuild (PDAL) diff --git a/sources b/sources index 8533987..5acba33 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.38.2.tar.bz2) = 79f75009e592e716fcda960f1c7f320f46dd34e4d90ea984bed1c5d4f588af2ec304deaf815c401f2288ee077f004bc65ab39436c043ede3b671086e6eec30c8 -SHA512 (qgis-3.38.2-vendor.tar.xz) = dd324c238f43f795b97a37531f4c6c38c5dcf66e4c49e6f22a6090b04b24a8e3f53dc862d847c7e483c299bb75f2adeaf55ccb5c01b3ab0a1944923f58a8d110 +SHA512 (qgis-3.38.3.tar.bz2) = ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484 +SHA512 (qgis-3.38.3-vendor.tar.xz) = 4fd8a909d9e867f26ccfa3e1ca6841cfc89d2bb84b2d865290a4eb07fd172a87a1997d30d06735b4b8559bb24d5f2d6539b0113cbf5047948c3259a4a8554a63 From 932e5c99154e2758e6ea7ef2d338e873b76c4bb2 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 14 Sep 2024 15:44:26 +0200 Subject: [PATCH 157/201] Add qgis-3.38.3-vendor-licenses.txt --- ....38.2-vendor-licenses.txt => qgis-3.38.3-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.38.2-vendor-licenses.txt => qgis-3.38.3-vendor-licenses.txt (97%) diff --git a/qgis-3.38.2-vendor-licenses.txt b/qgis-3.38.3-vendor-licenses.txt similarity index 97% rename from qgis-3.38.2-vendor-licenses.txt rename to qgis-3.38.3-vendor-licenses.txt index 9ce9f03..a921123 100644 --- a/qgis-3.38.2-vendor-licenses.txt +++ b/qgis-3.38.3-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.51s. +Done in 2.21s. From 4c76d961dca38f6cac47ae8c5c113e7f5fb69dcd Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 25 Oct 2024 20:31:45 +0200 Subject: [PATCH 158/201] Update to 3.40.0 --- .gitignore | 2 ++ ...r-licenses.txt => qgis-3.40.0-vendor-licenses.txt | 12 ++++++------ qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 7 files changed, 27 insertions(+), 22 deletions(-) rename qgis-3.38.3-vendor-licenses.txt => qgis-3.40.0-vendor-licenses.txt (79%) diff --git a/.gitignore b/.gitignore index 2ea504c..d0bc08e 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,5 @@ qgis_1.5.0.tar.gz /qgis-3.38.2-vendor.tar.xz /qgis-3.38.3.tar.bz2 /qgis-3.38.3-vendor.tar.xz +/qgis-3.40.0-vendor.tar.xz +/qgis-3.40.0.tar.bz2 diff --git a/qgis-3.38.3-vendor-licenses.txt b/qgis-3.40.0-vendor-licenses.txt similarity index 79% rename from qgis-3.38.3-vendor-licenses.txt rename to qgis-3.40.0-vendor-licenses.txt index a921123..98d106e 100644 --- a/qgis-3.38.3-vendor-licenses.txt +++ b/qgis-3.40.0-vendor-licenses.txt @@ -1,20 +1,20 @@ yarn run v1.22.22 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 1057 -├─ ISC: 75 -├─ BSD-3-Clause: 32 -├─ BSD-2-Clause: 28 +├─ MIT: 1077 +├─ ISC: 78 +├─ BSD-3-Clause: 33 +├─ BSD-2-Clause: 29 ├─ Apache-2.0: 25 ├─ MIT*: 4 ├─ (MIT OR CC0-1.0): 4 ├─ Unlicense: 3 ├─ (MIT OR Apache-2.0): 2 +├─ CC-BY-4.0: 2 ├─ CC0-1.0: 2 ├─ (MIT AND CC-BY-3.0): 2 ├─ 0BSD: 2 ├─ UNLICENSED: 1 ├─ Python-2.0: 1 -├─ CC-BY-4.0: 1 ├─ BSD*: 1 ├─ (BSD-3-Clause OR GPL-2.0): 1 ├─ (WTFPL OR MIT): 1 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.21s. +Done in 2.54s. diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 523876e..0dceac3 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.3/cmake/FindQwtPolar.cmake qgis-3.38.3-new/cmake/FindQwtPolar.cmake ---- qgis-3.38.3/cmake/FindQwtPolar.cmake 2024-09-13 14:01:14.000000000 +0200 -+++ qgis-3.38.3-new/cmake/FindQwtPolar.cmake 2024-09-14 11:16:35.244246036 +0200 +diff -rupN --no-dereference qgis-3.40.0/cmake/FindQwtPolar.cmake qgis-3.40.0-new/cmake/FindQwtPolar.cmake +--- qgis-3.40.0/cmake/FindQwtPolar.cmake 2024-10-25 14:08:45.000000000 +0200 ++++ qgis-3.40.0-new/cmake/FindQwtPolar.cmake 2024-10-25 19:47:39.929609795 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.38.3/cmake/FindQwtPolar.cmake qgis-3.38.3-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.38.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.38.3-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.38.3/src/app/gps/qgsgpsinformationwidget.cpp 2024-09-13 14:01:14.000000000 +0200 -+++ qgis-3.38.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-09-14 11:16:35.244246036 +0200 +diff -rupN --no-dereference qgis-3.40.0/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.40.0-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.40.0/src/app/gps/qgsgpsinformationwidget.cpp 2024-10-25 14:08:45.000000000 +0200 ++++ qgis-3.40.0-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-10-25 19:47:39.930609796 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 5cd9621..7a32456 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.38.3/src/core/qgsapplication.cpp qgis-3.38.3-new/src/core/qgsapplication.cpp ---- qgis-3.38.3/src/core/qgsapplication.cpp 2024-09-13 14:01:14.000000000 +0200 -+++ qgis-3.38.3-new/src/core/qgsapplication.cpp 2024-09-14 11:16:29.379671853 +0200 -@@ -362,6 +362,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.40.0/src/core/qgsapplication.cpp qgis-3.40.0-new/src/core/qgsapplication.cpp +--- qgis-3.40.0/src/core/qgsapplication.cpp 2024-10-25 14:08:45.000000000 +0200 ++++ qgis-3.40.0-new/src/core/qgsapplication.cpp 2024-10-25 19:47:34.083604332 +0200 +@@ -365,6 +365,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 629a106..ee89ee8 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.38.3/resources/CMakeLists.txt qgis-3.38.3-new/resources/CMakeLists.txt ---- qgis-3.38.3/resources/CMakeLists.txt 2024-09-13 14:01:14.000000000 +0200 -+++ qgis-3.38.3-new/resources/CMakeLists.txt 2024-09-14 11:16:32.323450406 +0200 +diff -rupN --no-dereference qgis-3.40.0/resources/CMakeLists.txt qgis-3.40.0-new/resources/CMakeLists.txt +--- qgis-3.40.0/resources/CMakeLists.txt 2024-10-25 14:08:45.000000000 +0200 ++++ qgis-3.40.0-new/resources/CMakeLists.txt 2024-10-25 19:47:37.022607083 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 40a61a5..31adb04 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.38.3 +Version: 3.40.0 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Oct 25 2024 Sandro Mani - 3.40.0-1 +- Update to 3.40.0 + * Sat Sep 14 2024 Sandro Mani - 3.38.3-1 - Update to 3.38.3 diff --git a/sources b/sources index 5acba33..b21668e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.38.3.tar.bz2) = ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484 -SHA512 (qgis-3.38.3-vendor.tar.xz) = 4fd8a909d9e867f26ccfa3e1ca6841cfc89d2bb84b2d865290a4eb07fd172a87a1997d30d06735b4b8559bb24d5f2d6539b0113cbf5047948c3259a4a8554a63 +SHA512 (qgis-3.40.0-vendor.tar.xz) = 100686bfd363b3bb6e6282ac11c2957962ebc8cc7f2a8cceae1e5d2768999dcb228038395484ba5aacd6a5304fe6b2bb2b01abd34100d557e4e9ff3d09167d43 +SHA512 (qgis-3.40.0.tar.bz2) = 8cd5aadc3db581636f7c73e8bb1237e13be88a170224e8fb8ac7edb1379099cfbb602ce6bafec8af5df2fa392dd1ed1d61683b0dd0670638d65e05b49140cf7e From ae860c8769422c26c6ab6cc7606518e09b10ff6b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 25 Oct 2024 17:31:51 -0600 Subject: [PATCH 159/201] Rebuild for hdf5 1.14.5 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 31adb04..c659248 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.40.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Oct 25 2024 Orion Poplawski - 3.40.0-2 +- Rebuild for hdf5 1.14.5 + * Fri Oct 25 2024 Sandro Mani - 3.40.0-1 - Update to 3.40.0 From 433950cbbdab5145e7550c85742864af8cae8845 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 9 Nov 2024 11:22:06 +0100 Subject: [PATCH 160/201] Rebuild (GDAL) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index c659248..735ad57 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.40.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Nov 09 2024 Sandro Mani - 3.40.0-3 +- Rebuild (GDAL) + * Fri Oct 25 2024 Orion Poplawski - 3.40.0-2 - Rebuild for hdf5 1.14.5 From b73b349503211759da88ed4ea6dbad92a7652fda Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 23 Nov 2024 11:46:21 +0100 Subject: [PATCH 161/201] Update to 3.40.1 --- .gitignore | 2 ++ ...censes.txt => qgis-3.40.1-vendor-licenses.txt | 2 +- qgis-qwt.patch | 16 ++++++++-------- qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 7 files changed, 25 insertions(+), 20 deletions(-) rename qgis-3.40.0-vendor-licenses.txt => qgis-3.40.1-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index d0bc08e..0a5ea40 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,5 @@ qgis_1.5.0.tar.gz /qgis-3.38.3-vendor.tar.xz /qgis-3.40.0-vendor.tar.xz /qgis-3.40.0.tar.bz2 +/qgis-3.40.1.tar.bz2 +/qgis-3.40.1-vendor.tar.xz diff --git a/qgis-3.40.0-vendor-licenses.txt b/qgis-3.40.1-vendor-licenses.txt similarity index 97% rename from qgis-3.40.0-vendor-licenses.txt rename to qgis-3.40.1-vendor-licenses.txt index 98d106e..f522eb9 100644 --- a/qgis-3.40.0-vendor-licenses.txt +++ b/qgis-3.40.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.54s. +Done in 2.44s. diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 0dceac3..1d7f47a 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.40.0/cmake/FindQwtPolar.cmake qgis-3.40.0-new/cmake/FindQwtPolar.cmake ---- qgis-3.40.0/cmake/FindQwtPolar.cmake 2024-10-25 14:08:45.000000000 +0200 -+++ qgis-3.40.0-new/cmake/FindQwtPolar.cmake 2024-10-25 19:47:39.929609795 +0200 +diff -rupN --no-dereference qgis-3.40.1/cmake/FindQwtPolar.cmake qgis-3.40.1-new/cmake/FindQwtPolar.cmake +--- qgis-3.40.1/cmake/FindQwtPolar.cmake 2024-11-22 13:07:29.000000000 +0100 ++++ qgis-3.40.1-new/cmake/FindQwtPolar.cmake 2024-11-22 17:00:37.185772505 +0100 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,10 +35,10 @@ diff -rupN --no-dereference qgis-3.40.0/cmake/FindQwtPolar.cmake qgis-3.40.0-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.40.0/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.40.0-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.40.0/src/app/gps/qgsgpsinformationwidget.cpp 2024-10-25 14:08:45.000000000 +0200 -+++ qgis-3.40.0-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-10-25 19:47:39.930609796 +0200 -@@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS +diff -rupN --no-dereference qgis-3.40.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.40.1-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.40.1/src/app/gps/qgsgpsinformationwidget.cpp 2024-11-22 13:07:29.000000000 +0100 ++++ qgis-3.40.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-11-22 17:00:37.185772505 +0100 +@@ -409,7 +409,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR QwtPolarMarker *mypMarker = new QwtPolarMarker(); @@ -47,7 +47,7 @@ diff -rupN --no-dereference qgis-3.40.0/src/app/gps/qgsgpsinformationwidget.cpp mypMarker->setPosition( QwtPolarPoint( currentInfo.azimuth, currentInfo.elevation ) ); #else mypMarker->setPosition( QwtPointPolar( currentInfo.azimuth, currentInfo.elevation ) ); -@@ -426,7 +426,7 @@ void QgsGpsInformationWidget::displayGPS +@@ -427,7 +427,7 @@ void QgsGpsInformationWidget::displayGPS QBrush symbolBrush( Qt::black ); QSize markerSize( 9, 9 ); QBrush textBgBrush( bg ); diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 7a32456..daa2f28 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.40.0/src/core/qgsapplication.cpp qgis-3.40.0-new/src/core/qgsapplication.cpp ---- qgis-3.40.0/src/core/qgsapplication.cpp 2024-10-25 14:08:45.000000000 +0200 -+++ qgis-3.40.0-new/src/core/qgsapplication.cpp 2024-10-25 19:47:34.083604332 +0200 -@@ -365,6 +365,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.40.1/src/core/qgsapplication.cpp qgis-3.40.1-new/src/core/qgsapplication.cpp +--- qgis-3.40.1/src/core/qgsapplication.cpp 2024-11-22 13:07:29.000000000 +0100 ++++ qgis-3.40.1-new/src/core/qgsapplication.cpp 2024-11-22 17:00:30.527870102 +0100 +@@ -366,6 +366,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index ee89ee8..869c295 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.40.0/resources/CMakeLists.txt qgis-3.40.0-new/resources/CMakeLists.txt ---- qgis-3.40.0/resources/CMakeLists.txt 2024-10-25 14:08:45.000000000 +0200 -+++ qgis-3.40.0-new/resources/CMakeLists.txt 2024-10-25 19:47:37.022607083 +0200 +diff -rupN --no-dereference qgis-3.40.1/resources/CMakeLists.txt qgis-3.40.1-new/resources/CMakeLists.txt +--- qgis-3.40.1/resources/CMakeLists.txt 2024-11-22 13:07:29.000000000 +0100 ++++ qgis-3.40.1-new/resources/CMakeLists.txt 2024-11-22 17:00:33.881820884 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 735ad57..a25c271 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.40.0 -Release: 3%{?dist} +Version: 3.40.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -304,6 +304,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Nov 22 2024 Sandro Mani - 3.40.1-1 +- Update to 3.40.1 + * Sat Nov 09 2024 Sandro Mani - 3.40.0-3 - Rebuild (GDAL) diff --git a/sources b/sources index b21668e..3367bec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.40.0-vendor.tar.xz) = 100686bfd363b3bb6e6282ac11c2957962ebc8cc7f2a8cceae1e5d2768999dcb228038395484ba5aacd6a5304fe6b2bb2b01abd34100d557e4e9ff3d09167d43 -SHA512 (qgis-3.40.0.tar.bz2) = 8cd5aadc3db581636f7c73e8bb1237e13be88a170224e8fb8ac7edb1379099cfbb602ce6bafec8af5df2fa392dd1ed1d61683b0dd0670638d65e05b49140cf7e +SHA512 (qgis-3.40.1.tar.bz2) = 70a40bc998b1d1eeef7767495c162485f90e7aea1c4e5119cce4d087bb7ee29cb33d1c78138ad01433b1eba631607ccc8aa51064f088ffed29637e17c00ec4f4 +SHA512 (qgis-3.40.1-vendor.tar.xz) = 76e0d1c393c045b3f4a96bd609c7b018ea01a405fc7216ceaaad4bb5ea072623f44e49dd70018e727e34a32bb1238cb56913c5e3f90a285e481af3708f63ddd9 From 0c0299c3999a05ba19d3adbbe77977374065dc7c Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Fri, 20 Dec 2024 19:55:47 +0200 Subject: [PATCH 162/201] Switch to ninja as cmake backend and re-enable parallel build This avoids spurious "write error: stdout" with parallel gmake and drastically reduces the build time on machines with more cores --- qgis.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qgis.spec b/qgis.spec index a25c271..35ea04d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -46,7 +46,7 @@ BuildRequires: libspatialite-devel BuildRequires: libdxfrw-devel BuildRequires: libxml2-devel BuildRequires: libzip-devel -BuildRequires: make +BuildRequires: ninja-build BuildRequires: netcdf-devel BuildRequires: ocl-icd-devel BuildRequires: opencl-headers @@ -188,9 +188,9 @@ sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 -D WITH_SERVER:BOOL=TRUE \ -D WITH_3D:BOOL=TRUE \ -D WITH_QSPATIALITE:BOOL=TRUE \ - -D WITH_SERVER_LANDINGPAGE_WEBAPP=ON + -D WITH_SERVER_LANDINGPAGE_WEBAPP=ON \ + -G Ninja export YARN_CACHE_FOLDER="$PWD/.package-cache" -%global _smp_mflags -j1 %cmake_build From c96af84279f3b1b16494dc75d50debf723915d9a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 Dec 2024 23:14:16 +0100 Subject: [PATCH 163/201] Update to 3.40.2 --- .gitignore | 2 ++ qgis-qwt.patch | 58 ----------------------------------------- qgis-serverprefix.patch | 6 ++--- qgis-yarn-offline.patch | 6 ++--- qgis.spec | 7 ++--- sources | 4 +-- 6 files changed, 14 insertions(+), 69 deletions(-) delete mode 100644 qgis-qwt.patch diff --git a/.gitignore b/.gitignore index 0a5ea40..01c0e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -138,3 +138,5 @@ qgis_1.5.0.tar.gz /qgis-3.40.0.tar.bz2 /qgis-3.40.1.tar.bz2 /qgis-3.40.1-vendor.tar.xz +/qgis-3.40.2.tar.bz2 +/qgis-3.40.2-vendor.tar.xz diff --git a/qgis-qwt.patch b/qgis-qwt.patch deleted file mode 100644 index 1d7f47a..0000000 --- a/qgis-qwt.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -rupN --no-dereference qgis-3.40.1/cmake/FindQwtPolar.cmake qgis-3.40.1-new/cmake/FindQwtPolar.cmake ---- qgis-3.40.1/cmake/FindQwtPolar.cmake 2024-11-22 13:07:29.000000000 +0100 -+++ qgis-3.40.1-new/cmake/FindQwtPolar.cmake 2024-11-22 17:00:37.185772505 +0100 -@@ -5,18 +5,18 @@ - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - # --# Once run this will define: --# -+# Once run this will define: -+# - # QWTPOLAR_FOUND = system has QwtPolar lib - # QWTPOLAR_LIBRARY = full path to the QwtPolar library --# QWTPOLAR_INCLUDE_DIR = where to find headers -+# QWTPOLAR_INCLUDE_DIR = where to find headers - # - --FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar PATHS -+FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar qwt-qt5 PATHS - /usr/lib - /usr/local/lib -- "$ENV{LIB_DIR}/lib" -- "$ENV{LIB}/lib" -+ "$ENV{LIB_DIR}/lib" -+ "$ENV{LIB}/lib" - ) - - SET(_qwtpolar_fw) -@@ -30,7 +30,7 @@ FIND_PATH(QWTPOLAR_INCLUDE_DIR NAMES qwt - /usr/local/include - "$ENV{LIB_DIR}/include" - "$ENV{INCLUDE}" -- PATH_SUFFIXES qwtpolar qwt -+ PATH_SUFFIXES qwtpolar qwt qt5/qwt - ) - - IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.40.1/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.40.1-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.40.1/src/app/gps/qgsgpsinformationwidget.cpp 2024-11-22 13:07:29.000000000 +0100 -+++ qgis-3.40.1-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-11-22 17:00:37.185772505 +0100 -@@ -409,7 +409,7 @@ void QgsGpsInformationWidget::displayGPS - { - #ifdef WITH_QWTPOLAR - QwtPolarMarker *mypMarker = new QwtPolarMarker(); --#if (QWT_POLAR_VERSION<0x010000) -+#if defined(QWT_POLAR_VERSION) && (QWT_POLAR_VERSION<0x010000) - mypMarker->setPosition( QwtPolarPoint( currentInfo.azimuth, currentInfo.elevation ) ); - #else - mypMarker->setPosition( QwtPointPolar( currentInfo.azimuth, currentInfo.elevation ) ); -@@ -427,7 +427,7 @@ void QgsGpsInformationWidget::displayGPS - QBrush symbolBrush( Qt::black ); - QSize markerSize( 9, 9 ); - QBrush textBgBrush( bg ); --#if (QWT_POLAR_VERSION<0x010000) -+#if defined(QWT_POLAR_VERSION) && (QWT_POLAR_VERSION<0x010000) - mypMarker->setSymbol( QwtSymbol( QwtSymbol::Ellipse, - symbolBrush, QPen( myColor ), markerSize ) ); - #else diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index daa2f28..ea0f1ec 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.40.1/src/core/qgsapplication.cpp qgis-3.40.1-new/src/core/qgsapplication.cpp ---- qgis-3.40.1/src/core/qgsapplication.cpp 2024-11-22 13:07:29.000000000 +0100 -+++ qgis-3.40.1-new/src/core/qgsapplication.cpp 2024-11-22 17:00:30.527870102 +0100 +diff -rupN --no-dereference qgis-3.40.2/src/core/qgsapplication.cpp qgis-3.40.2-new/src/core/qgsapplication.cpp +--- qgis-3.40.2/src/core/qgsapplication.cpp 2024-12-20 13:00:49.000000000 +0100 ++++ qgis-3.40.2-new/src/core/qgsapplication.cpp 2024-12-21 22:53:14.953660878 +0100 @@ -366,6 +366,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 869c295..2f13dcb 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.40.1/resources/CMakeLists.txt qgis-3.40.1-new/resources/CMakeLists.txt ---- qgis-3.40.1/resources/CMakeLists.txt 2024-11-22 13:07:29.000000000 +0100 -+++ qgis-3.40.1-new/resources/CMakeLists.txt 2024-11-22 17:00:33.881820884 +0100 +diff -rupN --no-dereference qgis-3.40.2/resources/CMakeLists.txt qgis-3.40.2-new/resources/CMakeLists.txt +--- qgis-3.40.2/resources/CMakeLists.txt 2024-12-20 13:00:49.000000000 +0100 ++++ qgis-3.40.2-new/resources/CMakeLists.txt 2024-12-21 22:53:17.772662498 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 35ea04d..f15abf4 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.40.1 +Version: 3.40.2 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -26,8 +26,6 @@ Source5: %{name}-mime.xml Patch0: %{name}-serverprefix.patch # Pass --offline to yarn, plus replace deprecated md4 with sha256 in webpack sources Patch1: %{name}-yarn-offline.patch -# Fix build against qwt-6.2 -Patch2: %{name}-qwt.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -304,6 +302,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Dec 21 2024 Sandro Mani - 3.40.2-1 +- Update to 3.40.2 + * Fri Nov 22 2024 Sandro Mani - 3.40.1-1 - Update to 3.40.1 diff --git a/sources b/sources index 3367bec..3fca30e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.40.1.tar.bz2) = 70a40bc998b1d1eeef7767495c162485f90e7aea1c4e5119cce4d087bb7ee29cb33d1c78138ad01433b1eba631607ccc8aa51064f088ffed29637e17c00ec4f4 -SHA512 (qgis-3.40.1-vendor.tar.xz) = 76e0d1c393c045b3f4a96bd609c7b018ea01a405fc7216ceaaad4bb5ea072623f44e49dd70018e727e34a32bb1238cb56913c5e3f90a285e481af3708f63ddd9 +SHA512 (qgis-3.40.2.tar.bz2) = 168656896dde5b60258ecf37d6cfdd965f39c55b686d0fe7656d9e181b91a325265bbe01dd991395a2c777188df540961e792251bd95233566fde1481f8988a9 +SHA512 (qgis-3.40.2-vendor.tar.xz) = 6244f37a1d8e87eebc2f808f67583fed109433063be2575d35a942d9d0a9b958e467a718780ae628e5c9349199d44d84b28f100ba4bf874873a450d1549f3033 From e3d121bed603592f55848c3a837eac32c818ad7f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 Dec 2024 23:15:01 +0100 Subject: [PATCH 164/201] Add qgis-3.40.2-vendor-licenses.txt --- ....40.1-vendor-licenses.txt => qgis-3.40.2-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.40.1-vendor-licenses.txt => qgis-3.40.2-vendor-licenses.txt (97%) diff --git a/qgis-3.40.1-vendor-licenses.txt b/qgis-3.40.2-vendor-licenses.txt similarity index 97% rename from qgis-3.40.1-vendor-licenses.txt rename to qgis-3.40.2-vendor-licenses.txt index f522eb9..b888b69 100644 --- a/qgis-3.40.1-vendor-licenses.txt +++ b/qgis-3.40.2-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.44s. +Done in 4.19s. From d5a347ef2c99e63cfd064773bac2f407afdd1615 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 21:18:49 +0000 Subject: [PATCH 165/201] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index f15abf4..18a2224 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.40.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -302,6 +302,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.40.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Dec 21 2024 Sandro Mani - 3.40.2-1 - Update to 3.40.2 From 2ff8b2fcca63c4f444b766f1daa90954aa69e65b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 21 Jan 2025 11:06:46 +0100 Subject: [PATCH 166/201] Update to 3.40.3 --- .gitignore | 2 ++ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 01c0e0a..6b72fe8 100644 --- a/.gitignore +++ b/.gitignore @@ -140,3 +140,5 @@ qgis_1.5.0.tar.gz /qgis-3.40.1-vendor.tar.xz /qgis-3.40.2.tar.bz2 /qgis-3.40.2-vendor.tar.xz +/qgis-3.40.3.tar.bz2 +/qgis-3.40.3-vendor.tar.xz diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index ea0f1ec..8568bc9 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.40.2/src/core/qgsapplication.cpp qgis-3.40.2-new/src/core/qgsapplication.cpp ---- qgis-3.40.2/src/core/qgsapplication.cpp 2024-12-20 13:00:49.000000000 +0100 -+++ qgis-3.40.2-new/src/core/qgsapplication.cpp 2024-12-21 22:53:14.953660878 +0100 +diff -rupN --no-dereference qgis-3.40.3/src/core/qgsapplication.cpp qgis-3.40.3-new/src/core/qgsapplication.cpp +--- qgis-3.40.3/src/core/qgsapplication.cpp 2025-01-17 13:02:24.000000000 +0100 ++++ qgis-3.40.3-new/src/core/qgsapplication.cpp 2025-01-21 10:28:14.477707534 +0100 @@ -366,6 +366,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 2f13dcb..cdf6e69 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.40.2/resources/CMakeLists.txt qgis-3.40.2-new/resources/CMakeLists.txt ---- qgis-3.40.2/resources/CMakeLists.txt 2024-12-20 13:00:49.000000000 +0100 -+++ qgis-3.40.2-new/resources/CMakeLists.txt 2024-12-21 22:53:17.772662498 +0100 +diff -rupN --no-dereference qgis-3.40.3/resources/CMakeLists.txt qgis-3.40.3-new/resources/CMakeLists.txt +--- qgis-3.40.3/resources/CMakeLists.txt 2025-01-17 13:02:24.000000000 +0100 ++++ qgis-3.40.3-new/resources/CMakeLists.txt 2025-01-21 10:28:17.680108166 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 18a2224..65cff71 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.40.2 -Release: 2%{?dist} +Version: 3.40.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -302,6 +302,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Jan 21 2025 Sandro Mani - 3.40.3-1 +- Update to 3.40.3 + * Sat Jan 18 2025 Fedora Release Engineering - 3.40.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 3fca30e..f574983 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.40.2.tar.bz2) = 168656896dde5b60258ecf37d6cfdd965f39c55b686d0fe7656d9e181b91a325265bbe01dd991395a2c777188df540961e792251bd95233566fde1481f8988a9 -SHA512 (qgis-3.40.2-vendor.tar.xz) = 6244f37a1d8e87eebc2f808f67583fed109433063be2575d35a942d9d0a9b958e467a718780ae628e5c9349199d44d84b28f100ba4bf874873a450d1549f3033 +SHA512 (qgis-3.40.3.tar.bz2) = 9945fa3d0501682b5608daf030de4d915b641e3dd54e09e56ba11d2114c2e3b78352e35f4f68d0e5a27fb93ef6564b8423882cd40e9b935f070e34fa2a28c30c +SHA512 (qgis-3.40.3-vendor.tar.xz) = 88c9120a52e2fbdeb0e70aa3c95663c5b632bd04af053669518c8500aac243db951a4951bed50fb3dc53ac80172dd5fa9242e50efc9ef2510e509b538dc4a646 From 84dae12d65418e921e9965e3ad5b93fe3207b721 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 21 Jan 2025 11:12:58 +0100 Subject: [PATCH 167/201] Add qgis-3.40.3-vendor-licenses.txt --- ....40.2-vendor-licenses.txt => qgis-3.40.3-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.40.2-vendor-licenses.txt => qgis-3.40.3-vendor-licenses.txt (97%) diff --git a/qgis-3.40.2-vendor-licenses.txt b/qgis-3.40.3-vendor-licenses.txt similarity index 97% rename from qgis-3.40.2-vendor-licenses.txt rename to qgis-3.40.3-vendor-licenses.txt index b888b69..98d106e 100644 --- a/qgis-3.40.2-vendor-licenses.txt +++ b/qgis-3.40.3-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 4.19s. +Done in 2.54s. From a21ac524125e7e2d8eb0f01c35e0f77d6c526e37 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 21 Jan 2025 12:27:34 +0100 Subject: [PATCH 168/201] Drop zh translations not shipped anymore --- qgis.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index 65cff71..81feef3 100644 --- a/qgis.spec +++ b/qgis.spec @@ -236,8 +236,6 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a # QGIS shows the following files in the GUI, including the license text %doc %{_datadir}/%{name}/doc/ %dir %{_datadir}/%{name}/i18n/ -%lang(zh-Hans) %{_datadir}/%{name}/i18n/%{name}_zh-Hans.qm -%lang(zh-Hant) %{_datadir}/%{name}/i18n/%{name}_zh-Hant.qm %{_libdir}/lib%{name}_native.so.* %{_libdir}/lib%{name}_app.so.* %{_libdir}/lib%{name}_analysis.so.* From b578c91dcfbc127202fd5272ca38511b1968bcca Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 31 Jan 2025 16:52:29 +0100 Subject: [PATCH 169/201] Rebuild for dropped python-qt5-webkit --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 81feef3..bc3c9e0 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.40.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -300,6 +300,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jan 31 2025 Sandro Mani - 3.40.3-2 +- Rebuild for dropped python-qt5-webkit + * Tue Jan 21 2025 Sandro Mani - 3.40.3-1 - Update to 3.40.3 From f61329ec826d20f715a118c5f667a7e1b3f80f86 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 2 Feb 2025 19:46:07 +0100 Subject: [PATCH 170/201] Drop requires python3-qt5-webkit --- qgis.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index bc3c9e0..e6ea9bf 100644 --- a/qgis.spec +++ b/qgis.spec @@ -130,7 +130,6 @@ Requires: python3-psycopg2 Requires: python3-pygments Requires: python3-PyYAML Requires: python3-qscintilla-qt5 -Requires: python3-qt5-webkit %{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} Supplements: %{name}%{?_isa} = %{version}-%{release} From 5e10395d6adde52ea194a148b747073df17e631c Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 2 Feb 2025 19:47:00 +0100 Subject: [PATCH 171/201] Bump release --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index e6ea9bf..849641d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.40.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Feb 02 2025 Sandro Mani - 3.40.3-3 +- Drop requires: python3-qt5-webkit + * Fri Jan 31 2025 Sandro Mani - 3.40.3-2 - Rebuild for dropped python-qt5-webkit From 13bf87a8dffc75714a7a45dd1820f55b9011ab02 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 2 Feb 2025 13:48:24 -0700 Subject: [PATCH 172/201] Rebuild with gsl 2.8 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 849641d..8e1726c 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.40.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Feb 02 2025 Orion Poplawski - 3.40.3-4 +- Rebuild with gsl 2.8 + * Sun Feb 02 2025 Sandro Mani - 3.40.3-3 - Drop requires: python3-qt5-webkit From fd490f12dec96130d404a363fc3f7b9c46be9d39 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 23 Feb 2025 23:20:27 +0100 Subject: [PATCH 173/201] Update to 3.42.0 --- .gitignore | 2 ++ ...ses.txt => qgis-3.42.0-vendor-licenses.txt | 8 +++---- qgis-serverprefix.patch | 6 ++--- qgis-yarn-offline.patch | 24 +++++++++---------- qgis.spec | 9 +++++-- sources | 4 ++-- 6 files changed, 30 insertions(+), 23 deletions(-) rename qgis-3.40.3-vendor-licenses.txt => qgis-3.42.0-vendor-licenses.txt (86%) diff --git a/.gitignore b/.gitignore index 6b72fe8..41125fa 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,5 @@ qgis_1.5.0.tar.gz /qgis-3.40.2-vendor.tar.xz /qgis-3.40.3.tar.bz2 /qgis-3.40.3-vendor.tar.xz +/qgis-3.42.0-vendor.tar.xz +/qgis-3.42.0.tar.bz2 diff --git a/qgis-3.40.3-vendor-licenses.txt b/qgis-3.42.0-vendor-licenses.txt similarity index 86% rename from qgis-3.40.3-vendor-licenses.txt rename to qgis-3.42.0-vendor-licenses.txt index 98d106e..8285c63 100644 --- a/qgis-3.40.3-vendor-licenses.txt +++ b/qgis-3.42.0-vendor-licenses.txt @@ -1,20 +1,20 @@ yarn run v1.22.22 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 1077 +├─ MIT: 1056 ├─ ISC: 78 -├─ BSD-3-Clause: 33 +├─ BSD-3-Clause: 34 ├─ BSD-2-Clause: 29 ├─ Apache-2.0: 25 ├─ MIT*: 4 ├─ (MIT OR CC0-1.0): 4 ├─ Unlicense: 3 ├─ (MIT OR Apache-2.0): 2 -├─ CC-BY-4.0: 2 ├─ CC0-1.0: 2 ├─ (MIT AND CC-BY-3.0): 2 ├─ 0BSD: 2 ├─ UNLICENSED: 1 ├─ Python-2.0: 1 +├─ CC-BY-4.0: 1 ├─ BSD*: 1 ├─ (BSD-3-Clause OR GPL-2.0): 1 ├─ (WTFPL OR MIT): 1 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.54s. +Done in 2.38s. diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 8568bc9..1151e19 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.40.3/src/core/qgsapplication.cpp qgis-3.40.3-new/src/core/qgsapplication.cpp ---- qgis-3.40.3/src/core/qgsapplication.cpp 2025-01-17 13:02:24.000000000 +0100 -+++ qgis-3.40.3-new/src/core/qgsapplication.cpp 2025-01-21 10:28:14.477707534 +0100 +diff -rupN --no-dereference qgis-3.42.0/src/core/qgsapplication.cpp qgis-3.42.0-new/src/core/qgsapplication.cpp +--- qgis-3.42.0/src/core/qgsapplication.cpp 2025-02-21 14:12:18.000000000 +0100 ++++ qgis-3.42.0-new/src/core/qgsapplication.cpp 2025-02-22 16:26:47.108363445 +0100 @@ -366,6 +366,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index cdf6e69..8962f8e 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,12 +1,12 @@ -diff -rupN --no-dereference qgis-3.40.3/resources/CMakeLists.txt qgis-3.40.3-new/resources/CMakeLists.txt ---- qgis-3.40.3/resources/CMakeLists.txt 2025-01-17 13:02:24.000000000 +0100 -+++ qgis-3.40.3-new/resources/CMakeLists.txt 2025-01-21 10:28:17.680108166 +0100 -@@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) - ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ - ${LANDINGPAGE_OUTPUT_PATH}/ - COMMAND ${CMAKE_COMMAND} -E touch ${LANDINGPAGE_OUTPUT_PATH}/landingpage.stamp -- COMMAND cd ${LANDINGPAGE_OUTPUT_PATH} && ${YARN} install --frozen-lockfile && ${YARN} build -+ COMMAND cd ${LANDINGPAGE_OUTPUT_PATH} && ${YARN} install --frozen-lockfile --offline && find node_modules -type f -exec sed -i 's|md4|sha256|g' {} \\\\; && ${YARN} build - ) - endif() - +diff -rupN --no-dereference qgis-3.42.0/resources/CMakeLists.txt qgis-3.42.0-new/resources/CMakeLists.txt +--- qgis-3.42.0/resources/CMakeLists.txt 2025-02-21 14:12:18.000000000 +0100 ++++ qgis-3.42.0-new/resources/CMakeLists.txt 2025-02-22 16:26:49.735034673 +0100 +@@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) + # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: + file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake + "execute_process( +- COMMAND ${YARN} install --frozen-lockfile ++ COMMAND ${YARN} install --frozen-lockfile --offline + WORKING_DIRECTORY ${LANDINGPAGE_OUTPUT_PATH} + OUTPUT_QUIET + ERROR_FILE ${CMAKE_BINARY_DIR}/yarn_error.log diff --git a/qgis.spec b/qgis.spec index 8e1726c..d88ce61 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.40.3 -Release: 4%{?dist} +Version: 3.42.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -235,6 +235,8 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a # QGIS shows the following files in the GUI, including the license text %doc %{_datadir}/%{name}/doc/ %dir %{_datadir}/%{name}/i18n/ +%{_datadir}/%{name}/i18n/qgis_zh-Hans.qm +%{_datadir}/%{name}/i18n/qgis_zh-Hant.qm %{_libdir}/lib%{name}_native.so.* %{_libdir}/lib%{name}_app.so.* %{_libdir}/lib%{name}_analysis.so.* @@ -299,6 +301,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Feb 22 2025 Sandro Mani - 3.42.0-1 +- Update to 3.42.0 + * Sun Feb 02 2025 Orion Poplawski - 3.40.3-4 - Rebuild with gsl 2.8 diff --git a/sources b/sources index f574983..d69987e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.40.3.tar.bz2) = 9945fa3d0501682b5608daf030de4d915b641e3dd54e09e56ba11d2114c2e3b78352e35f4f68d0e5a27fb93ef6564b8423882cd40e9b935f070e34fa2a28c30c -SHA512 (qgis-3.40.3-vendor.tar.xz) = 88c9120a52e2fbdeb0e70aa3c95663c5b632bd04af053669518c8500aac243db951a4951bed50fb3dc53ac80172dd5fa9242e50efc9ef2510e509b538dc4a646 +SHA512 (qgis-3.42.0.tar.bz2) = a0fba7b41dcb976c2353b43156ac5f51c549d6aae631ffed132a8e91285fadf8b98974a035905ed2b9334936be44e01f7dfb8044159c6d7539bc71067b8bc261 +SHA512 (qgis-3.42.0-vendor.tar.xz) = 5580ce03cad7e1c9bfef6a2e76637be019b31b3556b307c5f31455b470064ea55cc3d752014faee443b9538c9c09b15f432f3975cd039e49d06f1ffcad910ad4 From d684716115805a4e04fb92f91ce328067db90e72 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 2 Mar 2025 18:29:11 +0100 Subject: [PATCH 174/201] Rebuild (grass) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index d88ce61..f3d59a3 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.42.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -301,6 +301,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Mar 02 2025 Sandro Mani - 3.42.0-2 +- Rebuild (grass) + * Sat Feb 22 2025 Sandro Mani - 3.42.0-1 - Update to 3.42.0 From 314de2977da061cea369b3606cc439dcd580d7c5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 18 Mar 2025 08:08:19 -0400 Subject: [PATCH 175/201] Rebuilt for spatialindex 2.1.0 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index f3d59a3..6f0af55 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.42.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -301,6 +301,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Mar 18 2025 Benjamin A. Beasley - 3.42.0-3 +- Rebuilt for spatialindex 2.1.0 + * Sun Mar 02 2025 Sandro Mani - 3.42.0-2 - Rebuild (grass) From 17f0d8e637a19b6684604743bcabc4b1ec2de383 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 18 Mar 2025 09:48:57 -0400 Subject: [PATCH 176/201] Work around removal of LIB_SUFFIX from cmake macro in Fedora 43 See https://src.fedoraproject.org/rpms/cmake/pull-request/45. This change may yet be reverted (see https://pagure.io/fesco/issue/3377 and https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/R43VT2ZK2KAUXWLCL7ZADKMKCMYMRMVB/), but the workaround in this commit ensures the expected LIB_SUFFIX is set no matter what. --- qgis.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qgis.spec b/qgis.spec index 6f0af55..b80cd66 100644 --- a/qgis.spec +++ b/qgis.spec @@ -168,6 +168,7 @@ sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 %build %cmake \ %{_cmake_skip_rpath} \ + %["%{?_lib}" == "lib64" ? "-D LIB_SUFFIX=64" : ""] \ -D QGIS_LIB_SUBDIR=%{_lib} \ -D QGIS_MANUAL_SUBDIR=/share/man \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ @@ -303,6 +304,7 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog * Tue Mar 18 2025 Benjamin A. Beasley - 3.42.0-3 - Rebuilt for spatialindex 2.1.0 +- Work around removal of LIB_SUFFIX from cmake macro in Fedora 43 * Sun Mar 02 2025 Sandro Mani - 3.42.0-2 - Rebuild (grass) From 2b6feb4d179f97b2fb5a95efcb6e224396995750 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 21 Mar 2025 23:29:25 +0100 Subject: [PATCH 177/201] Update to 3.42.1 --- .gitignore | 2 ++ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 41125fa..089990b 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,5 @@ qgis_1.5.0.tar.gz /qgis-3.40.3-vendor.tar.xz /qgis-3.42.0-vendor.tar.xz /qgis-3.42.0.tar.bz2 +/qgis-3.42.1.tar.bz2 +/qgis-3.42.1-vendor.tar.xz diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 1151e19..c1420a3 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.42.0/src/core/qgsapplication.cpp qgis-3.42.0-new/src/core/qgsapplication.cpp ---- qgis-3.42.0/src/core/qgsapplication.cpp 2025-02-21 14:12:18.000000000 +0100 -+++ qgis-3.42.0-new/src/core/qgsapplication.cpp 2025-02-22 16:26:47.108363445 +0100 +diff -rupN --no-dereference qgis-3.42.1/src/core/qgsapplication.cpp qgis-3.42.1-new/src/core/qgsapplication.cpp +--- qgis-3.42.1/src/core/qgsapplication.cpp 2025-03-21 13:35:59.000000000 +0100 ++++ qgis-3.42.1-new/src/core/qgsapplication.cpp 2025-03-21 23:10:42.424261211 +0100 @@ -366,6 +366,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 8962f8e..e502206 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.42.0/resources/CMakeLists.txt qgis-3.42.0-new/resources/CMakeLists.txt ---- qgis-3.42.0/resources/CMakeLists.txt 2025-02-21 14:12:18.000000000 +0100 -+++ qgis-3.42.0-new/resources/CMakeLists.txt 2025-02-22 16:26:49.735034673 +0100 +diff -rupN --no-dereference qgis-3.42.1/resources/CMakeLists.txt qgis-3.42.1-new/resources/CMakeLists.txt +--- qgis-3.42.1/resources/CMakeLists.txt 2025-03-21 13:35:59.000000000 +0100 ++++ qgis-3.42.1-new/resources/CMakeLists.txt 2025-03-21 23:10:45.380292073 +0100 @@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake diff --git a/qgis.spec b/qgis.spec index b80cd66..155327d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.42.0 -Release: 3%{?dist} +Version: 3.42.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -302,6 +302,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Mar 21 2025 Sandro Mani - 3.42.1-1 +- Update to 3.42.1 + * Tue Mar 18 2025 Benjamin A. Beasley - 3.42.0-3 - Rebuilt for spatialindex 2.1.0 - Work around removal of LIB_SUFFIX from cmake macro in Fedora 43 diff --git a/sources b/sources index d69987e..84faffc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.42.0.tar.bz2) = a0fba7b41dcb976c2353b43156ac5f51c549d6aae631ffed132a8e91285fadf8b98974a035905ed2b9334936be44e01f7dfb8044159c6d7539bc71067b8bc261 -SHA512 (qgis-3.42.0-vendor.tar.xz) = 5580ce03cad7e1c9bfef6a2e76637be019b31b3556b307c5f31455b470064ea55cc3d752014faee443b9538c9c09b15f432f3975cd039e49d06f1ffcad910ad4 +SHA512 (qgis-3.42.1.tar.bz2) = 7e0db8a958a7ea5510557d8c23743fe09f9d885d26728d011987898bf2e318e77f00b4ba672d885a66af5cf4270100ab5b00d151da04ef288d55cadf34f7b6b1 +SHA512 (qgis-3.42.1-vendor.tar.xz) = 991e96ba98dbbd021b9a572e701f89a959cdcb2371c47334ea526b43a5fc96e7135ea1fdd7adf30c3087ee1605ddcc93f31dd4540d4c38ccbbd564a7d3cfc947 From 2af94313f837124546ab3d37800c396a63bcd9ad Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 21 Mar 2025 23:35:26 +0100 Subject: [PATCH 178/201] Add qgis-3.42.1-vendor-licenses.txt --- ....42.0-vendor-licenses.txt => qgis-3.42.1-vendor-licenses.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename qgis-3.42.0-vendor-licenses.txt => qgis-3.42.1-vendor-licenses.txt (97%) diff --git a/qgis-3.42.0-vendor-licenses.txt b/qgis-3.42.1-vendor-licenses.txt similarity index 97% rename from qgis-3.42.0-vendor-licenses.txt rename to qgis-3.42.1-vendor-licenses.txt index 8285c63..c08c2b7 100644 --- a/qgis-3.42.0-vendor-licenses.txt +++ b/qgis-3.42.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.38s. +Done in 2.47s. From 061ba5808e020a86867914cb847f8f6f013266c6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 23 Mar 2025 10:40:07 +0100 Subject: [PATCH 179/201] Add CVE-2024-55565.prebundle.patch --- CVE-2024-55565.prebundle.patch | 17 + prepare_vendor.sh | 8 +- qgis-3.42.1-vendor-licenses.txt | 2 +- qgis-3.42.1-yarn.lock | 9219 +++++++++++++++++++++++++++++++ qgis-mime.xml | 172 - qgis.spec | 22 +- sources | 2 +- 7 files changed, 9258 insertions(+), 184 deletions(-) create mode 100644 CVE-2024-55565.prebundle.patch create mode 100644 qgis-3.42.1-yarn.lock delete mode 100644 qgis-mime.xml diff --git a/CVE-2024-55565.prebundle.patch b/CVE-2024-55565.prebundle.patch new file mode 100644 index 0000000..8d7aa9a --- /dev/null +++ b/CVE-2024-55565.prebundle.patch @@ -0,0 +1,17 @@ +diff -rupN qgis-3.42.1/resources/server/src/landingpage/yarn.lock qgis-3.42.1-new/resources/server/src/landingpage/yarn.lock +--- qgis-3.42.1/resources/server/src/landingpage/yarn.lock 2025-03-21 13:35:59.000000000 +0100 ++++ qgis-3.42.1-new/resources/server/src/landingpage/yarn.lock 2025-03-23 10:16:16.924733787 +0100 +@@ -7719,13 +7719,6 @@ shellwords@^0.1.1: + resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" + integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== + +-shortid@^2.2.15: +- version "2.2.16" +- resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" +- integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== +- dependencies: +- nanoid "^2.1.0" +- + side-channel-list@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad" diff --git a/prepare_vendor.sh b/prepare_vendor.sh index c40de44..a12f2ab 100755 --- a/prepare_vendor.sh +++ b/prepare_vendor.sh @@ -38,6 +38,12 @@ fi mkdir -p $PKG_TMPDIR tar -xf $PKG_TARBALL -C $PKG_TMPDIR +pushd $PKG_TMPDIR/$PKG_SRCDIR +echo ">>>>>> Applying prebundle patches" +for file in $(ls -1 $PKG_DIR/*.prebundle.patch 2>/dev/null); do +patch -p1 < $file +done +popd pushd $PKG_PATH @@ -94,7 +100,7 @@ fi yarn add license-checker --ignore-engines yarn license-checker --summary | sed "s#$PKG_PATH#/tmp#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt - +cp -a yarn.lock $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-yarn.lock popd diff --git a/qgis-3.42.1-vendor-licenses.txt b/qgis-3.42.1-vendor-licenses.txt index c08c2b7..62bc787 100644 --- a/qgis-3.42.1-vendor-licenses.txt +++ b/qgis-3.42.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.47s. +Done in 2.55s. diff --git a/qgis-3.42.1-yarn.lock b/qgis-3.42.1-yarn.lock new file mode 100644 index 0000000..c9e9891 --- /dev/null +++ b/qgis-3.42.1-yarn.lock @@ -0,0 +1,9219 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@achrinza/node-ipc@^9.2.5": + version "9.2.9" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== + dependencies: + "@node-ipc/js-queue" "2.0.3" + event-pubsub "4.3.0" + js-message "1.0.7" + +"@akryum/winattr@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@akryum/winattr/-/winattr-3.0.0.tgz#c345d49f8415583897e345729c12b3503927dd11" + integrity sha512-t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ== + dependencies: + fswin "^2.17.1227" + +"@ampproject/remapping@^2.2.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4" + integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.24" + +"@apollo/protobufjs@1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.6.tgz#d601e65211e06ae1432bf5993a1a0105f2862f27" + integrity sha512-Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.0" + "@types/node" "^10.1.0" + long "^4.0.0" + +"@apollo/protobufjs@1.2.7": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.7.tgz#3a8675512817e4a046a897e5f4f16415f16a7d8a" + integrity sha512-Lahx5zntHPZia35myYDBRuF58tlwPskwHc5CWBZC/4bMKB6siTBWwtMrkqXcsNwQiFSzSx5hKdRPUmemrEp3Gg== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.0" + long "^4.0.0" + +"@apollo/usage-reporting-protobuf@^4.0.0": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.1.tgz#407c3d18c7fbed7a264f3b9a3812620b93499de1" + integrity sha512-u40dIUePHaSKVshcedO7Wp+mPiZsaU6xjv9J+VyxpoU/zL6Jle+9zWeG98tr/+SZ0nZ4OXhrbb8SNr0rAPpIDA== + dependencies: + "@apollo/protobufjs" "1.2.7" + +"@apollo/utils.dropunuseddefinitions@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz#02b04006442eaf037f4c4624146b12775d70d929" + integrity sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg== + +"@apollo/utils.keyvaluecache@^1.0.1": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.2.tgz#2bfe358c4d82f3a0950518451996758c52613f57" + integrity sha512-p7PVdLPMnPzmXSQVEsy27cYEjVON+SH/Wb7COyW3rQN8+wJgT1nv9jZouYtztWW8ZgTkii5T6tC9qfoDREd4mg== + dependencies: + "@apollo/utils.logger" "^1.0.0" + lru-cache "7.10.1 - 7.13.1" + +"@apollo/utils.logger@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-1.0.1.tgz#aea0d1bb7ceb237f506c6bbf38f10a555b99a695" + integrity sha512-XdlzoY7fYNK4OIcvMD2G94RoFZbzTQaNP0jozmqqMudmaGo2I/2Jx71xlDJ801mWA/mbYRihyaw6KJii7k5RVA== + +"@apollo/utils.printwithreducedwhitespace@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz#c466299a4766eef8577a2a64c8f27712e8bd7e30" + integrity sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q== + +"@apollo/utils.removealiases@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz#75f6d83098af1fcae2d3beb4f515ad4a8452a8c1" + integrity sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A== + +"@apollo/utils.sortast@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz#93218c7008daf3e2a0725196085a33f5aab5ad07" + integrity sha512-VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA== + dependencies: + lodash.sortby "^4.7.0" + +"@apollo/utils.stripsensitiveliterals@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz#4920651f36beee8e260e12031a0c5863ad0c7b28" + integrity sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w== + +"@apollo/utils.usagereporting@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.1.tgz#3c70b49e554771659576fe35381c7a4b321d27fd" + integrity sha512-6dk+0hZlnDbahDBB2mP/PZ5ybrtCJdLMbeNJD+TJpKyZmSY6bA3SjI8Cr2EM9QA+AdziywuWg+SgbWUF3/zQqQ== + dependencies: + "@apollo/usage-reporting-protobuf" "^4.0.0" + "@apollo/utils.dropunuseddefinitions" "^1.1.0" + "@apollo/utils.printwithreducedwhitespace" "^1.1.0" + "@apollo/utils.removealiases" "1.0.0" + "@apollo/utils.sortast" "^1.1.0" + "@apollo/utils.stripsensitiveliterals" "^1.2.0" + +"@apollographql/apollo-tools@^0.5.3": + version "0.5.4" + resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz#cb3998c6cf12e494b90c733f44dd9935e2d8196c" + integrity sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw== + +"@apollographql/graphql-playground-html@1.6.29": + version "1.6.29" + resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz#a7a646614a255f62e10dcf64a7f68ead41dec453" + integrity sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA== + dependencies: + xss "^1.0.8" + +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.24.7", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.26.2": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" + integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== + dependencies: + "@babel/helper-validator-identifier" "^7.25.9" + js-tokens "^4.0.0" + picocolors "^1.0.0" + +"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.9", "@babel/compat-data@^7.26.0": + version "7.26.3" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.3.tgz#99488264a56b2aded63983abd6a417f03b92ed02" + integrity sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g== + +"@babel/core@^7.1.6", "@babel/core@^7.10.3", "@babel/core@^7.12.16": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40" + integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg== + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.26.0" + "@babel/generator" "^7.26.0" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-module-transforms" "^7.26.0" + "@babel/helpers" "^7.26.0" + "@babel/parser" "^7.26.0" + "@babel/template" "^7.25.9" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.26.0" + convert-source-map "^2.0.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.3" + semver "^6.3.1" + +"@babel/eslint-parser@^7.19.1": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.25.9.tgz#603c68a63078796527bc9d0833f5e52dd5f9224c" + integrity sha512-5UXfgpK0j0Xr/xIdgdLEhOFxaDZ0bRPWJJchRpqOSur/3rZoPbqqki5mm0p4NE2cs28krBEiSM2MB7//afRSQQ== + dependencies: + "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1" + eslint-visitor-keys "^2.1.0" + semver "^6.3.1" + +"@babel/generator@^7.26.0", "@babel/generator@^7.26.3": + version "7.26.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.3.tgz#ab8d4360544a425c90c248df7059881f4b2ce019" + integrity sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ== + dependencies: + "@babel/parser" "^7.26.3" + "@babel/types" "^7.26.3" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^3.0.2" + +"@babel/helper-annotate-as-pure@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4" + integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g== + dependencies: + "@babel/types" "^7.25.9" + +"@babel/helper-compilation-targets@^7.12.16", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875" + integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ== + dependencies: + "@babel/compat-data" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + browserslist "^4.24.0" + lru-cache "^5.1.1" + semver "^6.3.1" + +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83" + integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-member-expression-to-functions" "^7.25.9" + "@babel/helper-optimise-call-expression" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/traverse" "^7.25.9" + semver "^6.3.1" + +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.25.9": + version "7.26.3" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz#5169756ecbe1d95f7866b90bb555b022595302a0" + integrity sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + regexpu-core "^6.2.0" + semver "^6.3.1" + +"@babel/helper-define-polyfill-provider@^0.6.2", "@babel/helper-define-polyfill-provider@^0.6.3": + version "0.6.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz#f4f2792fae2ef382074bc2d713522cf24e6ddb21" + integrity sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg== + dependencies: + "@babel/helper-compilation-targets" "^7.22.6" + "@babel/helper-plugin-utils" "^7.22.5" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + +"@babel/helper-member-expression-to-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3" + integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ== + dependencies: + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.24.7", "@babel/helper-module-imports@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715" + integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw== + dependencies: + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + +"@babel/helper-module-transforms@^7.25.9", "@babel/helper-module-transforms@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae" + integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw== + dependencies: + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/helper-optimise-call-expression@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e" + integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ== + dependencies: + "@babel/types" "^7.25.9" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.25.9", "@babel/helper-plugin-utils@^7.8.0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46" + integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw== + +"@babel/helper-remap-async-to-generator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz#e53956ab3d5b9fb88be04b3e2f31b523afd34b92" + integrity sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-wrap-function" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/helper-replace-supers@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz#ba447224798c3da3f8713fc272b145e33da6a5c5" + integrity sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.25.9" + "@babel/helper-optimise-call-expression" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9" + integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA== + dependencies: + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + +"@babel/helper-string-parser@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" + integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== + +"@babel/helper-validator-identifier@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" + integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== + +"@babel/helper-validator-option@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72" + integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw== + +"@babel/helper-wrap-function@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz#d99dfd595312e6c894bd7d237470025c85eea9d0" + integrity sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g== + dependencies: + "@babel/template" "^7.25.9" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + +"@babel/helpers@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4" + integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw== + dependencies: + "@babel/template" "^7.25.9" + "@babel/types" "^7.26.0" + +"@babel/parser@^7.1.6", "@babel/parser@^7.23.5", "@babel/parser@^7.25.3", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3": + version "7.26.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234" + integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA== + dependencies: + "@babel/types" "^7.26.3" + +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe" + integrity sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz#af9e4fb63ccb8abcb92375b2fcfe36b60c774d30" + integrity sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz#e8dc26fcd616e6c5bf2bd0d5a2c151d4f92a9137" + integrity sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz#807a667f9158acac6f6164b4beb85ad9ebc9e1d1" + integrity sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/plugin-transform-optional-chaining" "^7.25.9" + +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz#de7093f1e7deaf68eadd7cc6b07f2ab82543269e" + integrity sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.12.13": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" + integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + +"@babel/plugin-proposal-decorators@^7.12.13": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.25.9.tgz#8680707f943d1a3da2cd66b948179920f097e254" + integrity sha512-smkNLL/O1ezy9Nhy4CNosc4Va+1wo5w4gzSZeLe6y6dM4mmHfYOCPolXQPHQxonZCF+ZyebxN9vqOolkYrSn5g== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/plugin-syntax-decorators" "^7.25.9" + +"@babel/plugin-proposal-nullish-coalescing-operator@^7.1.0": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" + integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + +"@babel/plugin-proposal-optional-chaining@^7.1.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea" + integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + +"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2": + version "7.21.0-placeholder-for-preset-env.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703" + integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w== + +"@babel/plugin-syntax-decorators@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.9.tgz#986b4ca8b7b5df3f67cee889cedeffc2e2bf14b3" + integrity sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-syntax-dynamic-import@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-flow@^7.25.9": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.26.0.tgz#96507595c21b45fccfc2bc758d5c45452e6164fa" + integrity sha512-B+O2DnPc0iG+YXFqOxv2WNuNU97ToWjOomUQ78DouOENWUaM5sVrmet9mcomUGQFwpJd//gvUagXBSdzO1fRKg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-syntax-import-assertions@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz#620412405058efa56e4a564903b79355020f445f" + integrity sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-syntax-import-attributes@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz#3b1412847699eea739b4f2602c74ce36f6b0b0f7" + integrity sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.24.7", "@babel/plugin-syntax-jsx@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz#a34313a178ea56f1951599b929c1ceacee719290" + integrity sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-typescript@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz#67dda2b74da43727cf21d46cf9afef23f4365399" + integrity sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-syntax-unicode-sets-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357" + integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + +"@babel/plugin-transform-arrow-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz#7821d4410bee5daaadbb4cdd9a6649704e176845" + integrity sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-async-generator-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz#1b18530b077d18a407c494eb3d1d72da505283a2" + integrity sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-remap-async-to-generator" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/plugin-transform-async-to-generator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz#c80008dacae51482793e5a9c08b39a5be7e12d71" + integrity sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ== + dependencies: + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-remap-async-to-generator" "^7.25.9" + +"@babel/plugin-transform-block-scoped-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz#5700691dbd7abb93de300ca7be94203764fce458" + integrity sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-block-scoping@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz#c33665e46b06759c93687ca0f84395b80c0473a1" + integrity sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-class-properties@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f" + integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-class-static-block@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz#6c8da219f4eb15cae9834ec4348ff8e9e09664a0" + integrity sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-classes@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52" + integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + "@babel/traverse" "^7.25.9" + globals "^11.1.0" + +"@babel/plugin-transform-computed-properties@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz#db36492c78460e534b8852b1d5befe3c923ef10b" + integrity sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/template" "^7.25.9" + +"@babel/plugin-transform-destructuring@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz#966ea2595c498224340883602d3cfd7a0c79cea1" + integrity sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-dotall-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz#bad7945dd07734ca52fe3ad4e872b40ed09bb09a" + integrity sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-duplicate-keys@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz#8850ddf57dce2aebb4394bb434a7598031059e6d" + integrity sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz#6f7259b4de127721a08f1e5165b852fcaa696d31" + integrity sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-dynamic-import@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz#23e917de63ed23c6600c5dd06d94669dce79f7b8" + integrity sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-exponentiation-operator@^7.25.9": + version "7.26.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz#e29f01b6de302c7c2c794277a48f04a9ca7f03bc" + integrity sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-export-namespace-from@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz#90745fe55053394f554e40584cda81f2c8a402a2" + integrity sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-flow-strip-types@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.9.tgz#85879b42a8f5948fd6317069978e98f23ef8aec1" + integrity sha512-/VVukELzPDdci7UUsWQaSkhgnjIWXnIyRpM02ldxaVoFK96c41So8JcKT3m0gYjyv7j5FNPGS5vfELrWalkbDA== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/plugin-syntax-flow" "^7.25.9" + +"@babel/plugin-transform-for-of@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz#4bdc7d42a213397905d89f02350c5267866d5755" + integrity sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + +"@babel/plugin-transform-function-name@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz#939d956e68a606661005bfd550c4fc2ef95f7b97" + integrity sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA== + dependencies: + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/plugin-transform-json-strings@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz#c86db407cb827cded902a90c707d2781aaa89660" + integrity sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz#1a1c6b4d4aa59bc4cad5b6b3a223a0abd685c9de" + integrity sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-logical-assignment-operators@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz#b19441a8c39a2fda0902900b306ea05ae1055db7" + integrity sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-member-expression-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz#63dff19763ea64a31f5e6c20957e6a25e41ed5de" + integrity sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-modules-amd@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz#49ba478f2295101544abd794486cd3088dddb6c5" + integrity sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw== + dependencies: + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-modules-commonjs@^7.1.0", "@babel/plugin-transform-modules-commonjs@^7.25.9": + version "7.26.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz#8f011d44b20d02c3de44d8850d971d8497f981fb" + integrity sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ== + dependencies: + "@babel/helper-module-transforms" "^7.26.0" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-modules-systemjs@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz#8bd1b43836269e3d33307151a114bcf3ba6793f8" + integrity sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA== + dependencies: + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/plugin-transform-modules-umd@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz#6710079cdd7c694db36529a1e8411e49fcbf14c9" + integrity sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw== + dependencies: + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-named-capturing-groups-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz#454990ae6cc22fd2a0fa60b3a2c6f63a38064e6a" + integrity sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-new-target@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz#42e61711294b105c248336dcb04b77054ea8becd" + integrity sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-nullish-coalescing-operator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz#bcb1b0d9e948168102d5f7104375ca21c3266949" + integrity sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-numeric-separator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz#bfed75866261a8b643468b0ccfd275f2033214a1" + integrity sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-object-rest-spread@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz#0203725025074164808bcf1a2cfa90c652c99f18" + integrity sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg== + dependencies: + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/plugin-transform-parameters" "^7.25.9" + +"@babel/plugin-transform-object-super@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz#385d5de135162933beb4a3d227a2b7e52bb4cf03" + integrity sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + +"@babel/plugin-transform-optional-catch-binding@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz#10e70d96d52bb1f10c5caaac59ac545ea2ba7ff3" + integrity sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-optional-chaining@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz#e142eb899d26ef715435f201ab6e139541eee7dd" + integrity sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + +"@babel/plugin-transform-parameters@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz#b856842205b3e77e18b7a7a1b94958069c7ba257" + integrity sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-private-methods@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz#847f4139263577526455d7d3223cd8bda51e3b57" + integrity sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-private-property-in-object@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz#9c8b73e64e6cc3cbb2743633885a7dd2c385fe33" + integrity sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-property-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz#d72d588bd88b0dec8b62e36f6fda91cedfe28e3f" + integrity sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-regenerator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz#03a8a4670d6cebae95305ac6defac81ece77740b" + integrity sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + regenerator-transform "^0.15.2" + +"@babel/plugin-transform-regexp-modifiers@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz#2f5837a5b5cd3842a919d8147e9903cc7455b850" + integrity sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-reserved-words@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz#0398aed2f1f10ba3f78a93db219b27ef417fb9ce" + integrity sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-runtime@^7.12.15": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz#62723ea3f5b31ffbe676da9d6dae17138ae580ea" + integrity sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ== + dependencies: + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + babel-plugin-polyfill-corejs2 "^0.4.10" + babel-plugin-polyfill-corejs3 "^0.10.6" + babel-plugin-polyfill-regenerator "^0.6.1" + semver "^6.3.1" + +"@babel/plugin-transform-shorthand-properties@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz#bb785e6091f99f826a95f9894fc16fde61c163f2" + integrity sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-spread@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz#24a35153931b4ba3d13cec4a7748c21ab5514ef9" + integrity sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + +"@babel/plugin-transform-sticky-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz#c7f02b944e986a417817b20ba2c504dfc1453d32" + integrity sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-template-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz#6dbd4a24e8fad024df76d1fac6a03cf413f60fe1" + integrity sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-typeof-symbol@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz#224ba48a92869ddbf81f9b4a5f1204bbf5a2bc4b" + integrity sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-typescript@^7.25.9": + version "7.26.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.26.3.tgz#3d6add9c78735623317387ee26d5ada540eee3fd" + integrity sha512-6+5hpdr6mETwSKjmJUdYw0EIkATiQhnELWlE3kJFBwSg/BGIVwVaVbX+gOXBCdc7Ln1RXZxyWGecIXhUfnl7oA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/plugin-syntax-typescript" "^7.25.9" + +"@babel/plugin-transform-unicode-escapes@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz#a75ef3947ce15363fccaa38e2dd9bc70b2788b82" + integrity sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-unicode-property-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz#a901e96f2c1d071b0d1bb5dc0d3c880ce8f53dd3" + integrity sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-unicode-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1" + integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-unicode-sets-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz#65114c17b4ffc20fa5b163c63c70c0d25621fabe" + integrity sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/preset-env@^7.10.3", "@babel/preset-env@^7.12.16": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.26.0.tgz#30e5c6bc1bcc54865bff0c5a30f6d4ccdc7fa8b1" + integrity sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw== + dependencies: + "@babel/compat-data" "^7.26.0" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.9" + "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.9" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.9" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.25.9" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.9" + "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" + "@babel/plugin-syntax-import-assertions" "^7.26.0" + "@babel/plugin-syntax-import-attributes" "^7.26.0" + "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" + "@babel/plugin-transform-arrow-functions" "^7.25.9" + "@babel/plugin-transform-async-generator-functions" "^7.25.9" + "@babel/plugin-transform-async-to-generator" "^7.25.9" + "@babel/plugin-transform-block-scoped-functions" "^7.25.9" + "@babel/plugin-transform-block-scoping" "^7.25.9" + "@babel/plugin-transform-class-properties" "^7.25.9" + "@babel/plugin-transform-class-static-block" "^7.26.0" + "@babel/plugin-transform-classes" "^7.25.9" + "@babel/plugin-transform-computed-properties" "^7.25.9" + "@babel/plugin-transform-destructuring" "^7.25.9" + "@babel/plugin-transform-dotall-regex" "^7.25.9" + "@babel/plugin-transform-duplicate-keys" "^7.25.9" + "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.9" + "@babel/plugin-transform-dynamic-import" "^7.25.9" + "@babel/plugin-transform-exponentiation-operator" "^7.25.9" + "@babel/plugin-transform-export-namespace-from" "^7.25.9" + "@babel/plugin-transform-for-of" "^7.25.9" + "@babel/plugin-transform-function-name" "^7.25.9" + "@babel/plugin-transform-json-strings" "^7.25.9" + "@babel/plugin-transform-literals" "^7.25.9" + "@babel/plugin-transform-logical-assignment-operators" "^7.25.9" + "@babel/plugin-transform-member-expression-literals" "^7.25.9" + "@babel/plugin-transform-modules-amd" "^7.25.9" + "@babel/plugin-transform-modules-commonjs" "^7.25.9" + "@babel/plugin-transform-modules-systemjs" "^7.25.9" + "@babel/plugin-transform-modules-umd" "^7.25.9" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.25.9" + "@babel/plugin-transform-new-target" "^7.25.9" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.25.9" + "@babel/plugin-transform-numeric-separator" "^7.25.9" + "@babel/plugin-transform-object-rest-spread" "^7.25.9" + "@babel/plugin-transform-object-super" "^7.25.9" + "@babel/plugin-transform-optional-catch-binding" "^7.25.9" + "@babel/plugin-transform-optional-chaining" "^7.25.9" + "@babel/plugin-transform-parameters" "^7.25.9" + "@babel/plugin-transform-private-methods" "^7.25.9" + "@babel/plugin-transform-private-property-in-object" "^7.25.9" + "@babel/plugin-transform-property-literals" "^7.25.9" + "@babel/plugin-transform-regenerator" "^7.25.9" + "@babel/plugin-transform-regexp-modifiers" "^7.26.0" + "@babel/plugin-transform-reserved-words" "^7.25.9" + "@babel/plugin-transform-shorthand-properties" "^7.25.9" + "@babel/plugin-transform-spread" "^7.25.9" + "@babel/plugin-transform-sticky-regex" "^7.25.9" + "@babel/plugin-transform-template-literals" "^7.25.9" + "@babel/plugin-transform-typeof-symbol" "^7.25.9" + "@babel/plugin-transform-unicode-escapes" "^7.25.9" + "@babel/plugin-transform-unicode-property-regex" "^7.25.9" + "@babel/plugin-transform-unicode-regex" "^7.25.9" + "@babel/plugin-transform-unicode-sets-regex" "^7.25.9" + "@babel/preset-modules" "0.1.6-no-external-plugins" + babel-plugin-polyfill-corejs2 "^0.4.10" + babel-plugin-polyfill-corejs3 "^0.10.6" + babel-plugin-polyfill-regenerator "^0.6.1" + core-js-compat "^3.38.1" + semver "^6.3.1" + +"@babel/preset-flow@^7.0.0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.25.9.tgz#ef8b5e7e3f24a42b3711e77fb14919b87dffed0a" + integrity sha512-EASHsAhE+SSlEzJ4bzfusnXSHiU+JfAYzj+jbw2vgQKgq5HrUr8qs+vgtiEL5dOH6sEweI+PNt2D7AqrDSHyqQ== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + "@babel/plugin-transform-flow-strip-types" "^7.25.9" + +"@babel/preset-modules@0.1.6-no-external-plugins": + version "0.1.6-no-external-plugins" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a" + integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/types" "^7.4.4" + esutils "^2.0.2" + +"@babel/preset-typescript@^7.1.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz#4a570f1b8d104a242d923957ffa1eaff142a106d" + integrity sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + "@babel/plugin-syntax-jsx" "^7.25.9" + "@babel/plugin-transform-modules-commonjs" "^7.25.9" + "@babel/plugin-transform-typescript" "^7.25.9" + +"@babel/register@^7.0.0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.25.9.tgz#1c465acf7dc983d70ccc318eb5b887ecb04f021b" + integrity sha512-8D43jXtGsYmEeDvm4MWHYUpWf8iiXgWYx3fW7E7Wb7Oe6FWqJPl5K6TuFW0dOwNZzEE5rjlaSJYH9JjrUKJszA== + dependencies: + clone-deep "^4.0.1" + find-cache-dir "^2.0.0" + make-dir "^2.1.0" + pirates "^4.0.6" + source-map-support "^0.5.16" + +"@babel/runtime@^7.12.13", "@babel/runtime@^7.8.4": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1" + integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw== + dependencies: + regenerator-runtime "^0.14.0" + +"@babel/template@^7.25.0", "@babel/template@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016" + integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg== + dependencies: + "@babel/code-frame" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/types" "^7.25.9" + +"@babel/traverse@^7.25.6", "@babel/traverse@^7.25.9": + version "7.26.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.4.tgz#ac3a2a84b908dde6d463c3bfa2c5fdc1653574bd" + integrity sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w== + dependencies: + "@babel/code-frame" "^7.26.2" + "@babel/generator" "^7.26.3" + "@babel/parser" "^7.26.3" + "@babel/template" "^7.25.9" + "@babel/types" "^7.26.3" + debug "^4.3.1" + globals "^11.1.0" + +"@babel/types@^7.12.12", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.4.4": + version "7.26.3" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0" + integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA== + dependencies: + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + +"@discoveryjs/json-ext@0.5.7": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== + +"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": + version "4.4.1" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz#d1145bf2c20132d6400495d6df4bf59362fd9d56" + integrity sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA== + dependencies: + eslint-visitor-keys "^3.4.3" + +"@eslint-community/regexpp@^4.6.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0" + integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ== + +"@eslint/eslintrc@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" + integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== + dependencies: + ajv "^6.12.4" + debug "^4.3.2" + espree "^9.6.0" + globals "^13.19.0" + ignore "^5.2.0" + import-fresh "^3.2.1" + js-yaml "^4.1.0" + minimatch "^3.1.2" + strip-json-comments "^3.1.1" + +"@eslint/js@8.57.1": + version "8.57.1" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2" + integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q== + +"@graphql-tools/merge@8.3.1": + version "8.3.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.1.tgz#06121942ad28982a14635dbc87b5d488a041d722" + integrity sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg== + dependencies: + "@graphql-tools/utils" "8.9.0" + tslib "^2.4.0" + +"@graphql-tools/merge@^8.4.1": + version "8.4.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.4.2.tgz#95778bbe26b635e8d2f60ce9856b388f11fe8288" + integrity sha512-XbrHAaj8yDuINph+sAfuq3QCZ/tKblrTLOpirK0+CAgNlZUCHs0Fa+xtMUURgwCVThLle1AF7svJCxFizygLsw== + dependencies: + "@graphql-tools/utils" "^9.2.1" + tslib "^2.4.0" + +"@graphql-tools/mock@^8.1.2": + version "8.7.20" + resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.7.20.tgz#c83ae0f1940d194a3982120c9c85f3ac6b4f7f20" + integrity sha512-ljcHSJWjC/ZyzpXd5cfNhPI7YljRVvabKHPzKjEs5ElxWu2cdlLGvyNYepApXDsM/OJG/2xuhGM+9GWu5gEAPQ== + dependencies: + "@graphql-tools/schema" "^9.0.18" + "@graphql-tools/utils" "^9.2.1" + fast-json-stable-stringify "^2.1.0" + tslib "^2.4.0" + +"@graphql-tools/schema@^8.0.0", "@graphql-tools/schema@^8.5.0": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.5.1.tgz#c2f2ff1448380919a330312399c9471db2580b58" + integrity sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg== + dependencies: + "@graphql-tools/merge" "8.3.1" + "@graphql-tools/utils" "8.9.0" + tslib "^2.4.0" + value-or-promise "1.0.11" + +"@graphql-tools/schema@^9.0.18": + version "9.0.19" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.19.tgz#c4ad373b5e1b8a0cf365163435b7d236ebdd06e7" + integrity sha512-oBRPoNBtCkk0zbUsyP4GaIzCt8C0aCI4ycIRUL67KK5pOHljKLBBtGT+Jr6hkzA74C8Gco8bpZPe7aWFjiaK2w== + dependencies: + "@graphql-tools/merge" "^8.4.1" + "@graphql-tools/utils" "^9.2.1" + tslib "^2.4.0" + value-or-promise "^1.0.12" + +"@graphql-tools/utils@8.9.0": + version "8.9.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.9.0.tgz#c6aa5f651c9c99e1aca55510af21b56ec296cdb7" + integrity sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg== + dependencies: + tslib "^2.4.0" + +"@graphql-tools/utils@^9.2.1": + version "9.2.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57" + integrity sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A== + dependencies: + "@graphql-typed-document-node/core" "^3.1.1" + tslib "^2.4.0" + +"@graphql-typed-document-node/core@^3.1.1": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" + integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== + +"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" + integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== + +"@hapi/topo@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" + integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== + dependencies: + "@hapi/hoek" "^9.0.0" + +"@humanwhocodes/config-array@^0.13.0": + version "0.13.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748" + integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw== + dependencies: + "@humanwhocodes/object-schema" "^2.0.3" + debug "^4.3.1" + minimatch "^3.0.5" + +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + +"@humanwhocodes/object-schema@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" + integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== + +"@josephg/resolvable@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb" + integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg== + +"@jridgewell/gen-mapping@^0.3.5": + version "0.3.8" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz#4f0e06362e01362f823d348f1872b08f666d8142" + integrity sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA== + dependencies: + "@jridgewell/set-array" "^1.2.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.24" + +"@jridgewell/resolve-uri@^3.1.0": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== + +"@jridgewell/set-array@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280" + integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A== + +"@jridgewell/source-map@^0.3.3": + version "0.3.6" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a" + integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ== + dependencies: + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" + integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== + +"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": + version "0.3.25" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" + integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + +"@leichtgewicht/ip-codec@^2.0.1": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz#4fc56c15c580b9adb7dc3c333a134e540b44bfb1" + integrity sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw== + +"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": + version "5.1.1-v1" + resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129" + integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg== + dependencies: + eslint-scope "5.1.1" + +"@node-ipc/js-queue@2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz#ac7fe33d766fa53e233ef8fedaf3443a01c5a4cd" + integrity sha512-fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw== + dependencies: + easy-stack "1.0.1" + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@polka/url@^1.0.0-next.24": + version "1.0.0-next.28" + resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.28.tgz#d45e01c4a56f143ee69c54dd6b12eade9e270a73" + integrity sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw== + +"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" + integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ== + +"@protobufjs/base64@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" + integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== + +"@protobufjs/codegen@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" + integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== + +"@protobufjs/eventemitter@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" + integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q== + +"@protobufjs/fetch@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" + integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ== + dependencies: + "@protobufjs/aspromise" "^1.1.1" + "@protobufjs/inquire" "^1.1.0" + +"@protobufjs/float@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" + integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ== + +"@protobufjs/inquire@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" + integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q== + +"@protobufjs/path@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" + integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA== + +"@protobufjs/pool@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" + integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw== + +"@protobufjs/utf8@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" + integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== + +"@sideway/address@^4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5" + integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q== + dependencies: + "@hapi/hoek" "^9.0.0" + +"@sideway/formula@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f" + integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg== + +"@sideway/pinpoint@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" + integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== + +"@sindresorhus/is@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" + integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== + +"@soda/friendly-errors-webpack-plugin@^1.8.0": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz#4d4fbb1108993aaa362116247c3d18188a2c6c85" + integrity sha512-h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg== + dependencies: + chalk "^3.0.0" + error-stack-parser "^2.0.6" + string-width "^4.2.3" + strip-ansi "^6.0.1" + +"@soda/get-current-script@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87" + integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w== + +"@trysound/sax@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" + integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== + +"@types/accepts@^1.3.5": + version "1.3.7" + resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.7.tgz#3b98b1889d2b2386604c2bbbe62e4fb51e95b265" + integrity sha512-Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ== + dependencies: + "@types/node" "*" + +"@types/body-parser@*": + version "1.19.5" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4" + integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/body-parser@1.19.2": + version "1.19.2" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/bonjour@^3.5.9": + version "3.5.13" + resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956" + integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ== + dependencies: + "@types/node" "*" + +"@types/connect-history-api-fallback@^1.3.5": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3" + integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw== + dependencies: + "@types/express-serve-static-core" "*" + "@types/node" "*" + +"@types/connect@*": + version "3.4.38" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858" + integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug== + dependencies: + "@types/node" "*" + +"@types/cors@2.8.12": + version "2.8.12" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" + integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== + +"@types/ejs@^3.0.6": + version "3.1.5" + resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.5.tgz#49d738257cc73bafe45c13cb8ff240683b4d5117" + integrity sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg== + +"@types/eslint-scope@^3.7.7": + version "3.7.7" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" + integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584" + integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/eslint@^7.29.0 || ^8.4.1": + version "8.56.12" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a" + integrity sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^1.0.6": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" + integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== + +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^5.0.0": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz#812d2871e5eea17fb0bd5214dda7a7b748c0e12a" + integrity sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/send" "*" + +"@types/express-serve-static-core@4.17.31": + version "4.17.31" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f" + integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.33": + version "4.19.6" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267" + integrity sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/send" "*" + +"@types/express@*": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.0.tgz#13a7d1f75295e90d19ed6e74cab3678488eaa96c" + integrity sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^5.0.0" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/express@4.17.14": + version "4.17.14" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" + integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/express@^4.17.13": + version "4.17.21" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d" + integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.33" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/html-minifier-terser@^6.0.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" + integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== + +"@types/http-errors@*": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f" + integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA== + +"@types/http-proxy@^1.17.8": + version "1.17.15" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.15.tgz#12118141ce9775a6499ecb4c01d02f90fc839d36" + integrity sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ== + dependencies: + "@types/node" "*" + +"@types/inquirer@^8.1.3": + version "8.2.10" + resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-8.2.10.tgz#9444dce2d764c35bc5bb4d742598aaa4acb6561b" + integrity sha512-IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA== + dependencies: + "@types/through" "*" + rxjs "^7.2.0" + +"@types/jscodeshift@^0.7.1": + version "0.7.2" + resolved "https://registry.yarnpkg.com/@types/jscodeshift/-/jscodeshift-0.7.2.tgz#5ce43f545fa17e07c1fe614ccfb024f78e687be5" + integrity sha512-k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw== + dependencies: + ast-types "0.12.1" + recast "0.17.2" + +"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" + integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== + +"@types/long@^4.0.0": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" + integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== + +"@types/mime@^1": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690" + integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w== + +"@types/minimist@^1.2.0": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" + integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== + +"@types/node-forge@^1.3.0": + version "1.3.11" + resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da" + integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ== + dependencies: + "@types/node" "*" + +"@types/node@*": + version "22.10.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.2.tgz#a485426e6d1fdafc7b0d4c7b24e2c78182ddabb9" + integrity sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ== + dependencies: + undici-types "~6.20.0" + +"@types/node@^10.1.0": + version "10.17.60" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" + integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== + +"@types/normalize-package-data@^2.4.0": + version "2.4.4" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" + integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== + +"@types/parse-json@^4.0.0": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239" + integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw== + +"@types/qs@*": + version "6.9.17" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.17.tgz#fc560f60946d0aeff2f914eb41679659d3310e1a" + integrity sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ== + +"@types/range-parser@*": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" + integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== + +"@types/retry@0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" + integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== + +"@types/send@*": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" + integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@types/serve-index@^1.9.1": + version "1.9.4" + resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898" + integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug== + dependencies: + "@types/express" "*" + +"@types/serve-static@*", "@types/serve-static@^1.13.10": + version "1.15.7" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714" + integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw== + dependencies: + "@types/http-errors" "*" + "@types/node" "*" + "@types/send" "*" + +"@types/sockjs@^0.3.33": + version "0.3.36" + resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535" + integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q== + dependencies: + "@types/node" "*" + +"@types/through@*": + version "0.0.33" + resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.33.tgz#14ebf599320e1c7851e7d598149af183c6b9ea56" + integrity sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ== + dependencies: + "@types/node" "*" + +"@types/ws@^8.5.5": + version "8.5.13" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.13.tgz#6414c280875e2691d0d1e080b05addbf5cb91e20" + integrity sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA== + dependencies: + "@types/node" "*" + +"@ungap/structured-clone@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.1.tgz#28fa185f67daaf7b7a1a8c1d445132c5d979f8bd" + integrity sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA== + +"@vue/babel-helper-vue-jsx-merge-props@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz#8d53a1e21347db8edbe54d339902583176de09f2" + integrity sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA== + +"@vue/babel-helper-vue-transform-on@1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.2.5.tgz#b9e195b92bfa8d15d5aa9581ca01cb702dbcc19d" + integrity sha512-lOz4t39ZdmU4DJAa2hwPYmKc8EsuGa2U0L9KaZaOJUt0UwQNjNA3AZTq6uEivhOKhhG1Wvy96SvYBoFmCg3uuw== + +"@vue/babel-plugin-jsx@^1.0.3": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.2.5.tgz#77f4f9f189d00c24ebd587ab84ae615dfa1c3abb" + integrity sha512-zTrNmOd4939H9KsRIGmmzn3q2zvv1mjxkYZHgqHZgDrXz5B1Q3WyGEjO2f+JrmKghvl1JIRcvo63LgM1kH5zFg== + dependencies: + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" + "@babel/plugin-syntax-jsx" "^7.24.7" + "@babel/template" "^7.25.0" + "@babel/traverse" "^7.25.6" + "@babel/types" "^7.25.6" + "@vue/babel-helper-vue-transform-on" "1.2.5" + "@vue/babel-plugin-resolve-type" "1.2.5" + html-tags "^3.3.1" + svg-tags "^1.0.0" + +"@vue/babel-plugin-resolve-type@1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@vue/babel-plugin-resolve-type/-/babel-plugin-resolve-type-1.2.5.tgz#f6ed0d39987fe0158370659b73156c55e80d17b5" + integrity sha512-U/ibkQrf5sx0XXRnUZD1mo5F7PkpKyTbfXM3a3rC4YnUz6crHEz9Jg09jzzL6QYlXNto/9CePdOg/c87O4Nlfg== + dependencies: + "@babel/code-frame" "^7.24.7" + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" + "@babel/parser" "^7.25.6" + "@vue/compiler-sfc" "^3.5.3" + +"@vue/babel-plugin-transform-vue-jsx@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz#4d4b3d46a39ea62b7467dd6e26ce47f7ceafb2fe" + integrity sha512-Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-helper-vue-jsx-merge-props" "^1.4.0" + html-tags "^2.0.0" + lodash.kebabcase "^4.1.1" + svg-tags "^1.0.0" + +"@vue/babel-preset-app@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz#ce38f76314f5265d62a89756ef264c21f1d351a1" + integrity sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg== + dependencies: + "@babel/core" "^7.12.16" + "@babel/helper-compilation-targets" "^7.12.16" + "@babel/helper-module-imports" "^7.12.13" + "@babel/plugin-proposal-class-properties" "^7.12.13" + "@babel/plugin-proposal-decorators" "^7.12.13" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-syntax-jsx" "^7.12.13" + "@babel/plugin-transform-runtime" "^7.12.15" + "@babel/preset-env" "^7.12.16" + "@babel/runtime" "^7.12.13" + "@vue/babel-plugin-jsx" "^1.0.3" + "@vue/babel-preset-jsx" "^1.1.2" + babel-plugin-dynamic-import-node "^2.3.3" + core-js "^3.8.3" + core-js-compat "^3.8.3" + semver "^7.3.4" + +"@vue/babel-preset-jsx@^1.1.2": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz#f4914ba314235ab097bc4372ed67473c0780bfcc" + integrity sha512-QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA== + dependencies: + "@vue/babel-helper-vue-jsx-merge-props" "^1.4.0" + "@vue/babel-plugin-transform-vue-jsx" "^1.4.0" + "@vue/babel-sugar-composition-api-inject-h" "^1.4.0" + "@vue/babel-sugar-composition-api-render-instance" "^1.4.0" + "@vue/babel-sugar-functional-vue" "^1.4.0" + "@vue/babel-sugar-inject-h" "^1.4.0" + "@vue/babel-sugar-v-model" "^1.4.0" + "@vue/babel-sugar-v-on" "^1.4.0" + +"@vue/babel-sugar-composition-api-inject-h@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz#187e1389f8871d89ece743bb50aed713be9d6c85" + integrity sha512-VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-composition-api-render-instance@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz#2c1607ae6dffdab47e785bc01fa45ba756e992c1" + integrity sha512-6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-functional-vue@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz#60da31068567082287c7337c66ef4df04e0a1029" + integrity sha512-lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-inject-h@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz#bf39aa6631fb1d0399b1c49b4c59e1c8899b4363" + integrity sha512-muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-v-model@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz#a51d986609f430c4f70ada3a93cc560a2970f720" + integrity sha512-0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-helper-vue-jsx-merge-props" "^1.4.0" + "@vue/babel-plugin-transform-vue-jsx" "^1.4.0" + camelcase "^5.0.0" + html-tags "^2.0.0" + svg-tags "^1.0.0" + +"@vue/babel-sugar-v-on@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz#43b7106a9672d8cbeefc0eb8afe1d376edc6166e" + integrity sha512-m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-plugin-transform-vue-jsx" "^1.4.0" + camelcase "^5.0.0" + +"@vue/cli-overlay@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-5.0.8.tgz#b61477acdc43bbd42fce6326d228471201ecdcdd" + integrity sha512-KmtievE/B4kcXp6SuM2gzsnSd8WebkQpg3XaB6GmFh1BJGRqa1UiW9up7L/Q67uOdTigHxr5Ar2lZms4RcDjwQ== + +"@vue/cli-plugin-babel@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz#54f9a07900f29baff54803dcfa916c602894feb7" + integrity sha512-a4qqkml3FAJ3auqB2kN2EMPocb/iu0ykeELwed+9B1c1nQ1HKgslKMHMPavYx3Cd/QAx2mBD4hwKBqZXEI/CsQ== + dependencies: + "@babel/core" "^7.12.16" + "@vue/babel-preset-app" "^5.0.8" + "@vue/cli-shared-utils" "^5.0.8" + babel-loader "^8.2.2" + thread-loader "^3.0.0" + webpack "^5.54.0" + +"@vue/cli-plugin-eslint@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.8.tgz#754939265c2c5b746fa36c7d7705a89138e193bf" + integrity sha512-d11+I5ONYaAPW1KyZj9GlrV/E6HZePq5L5eAF5GgoVdu6sxr6bDgEoxzhcS1Pk2eh8rn1MxG/FyyR+eCBj/CNg== + dependencies: + "@vue/cli-shared-utils" "^5.0.8" + eslint-webpack-plugin "^3.1.0" + globby "^11.0.2" + webpack "^5.54.0" + yorkie "^2.0.0" + +"@vue/cli-plugin-router@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz#a113ec626f3d4216d20496c42d35533bce9e889f" + integrity sha512-Gmv4dsGdAsWPqVijz3Ux2OS2HkMrWi1ENj2cYL75nUeL+Xj5HEstSqdtfZ0b1q9NCce+BFB6QnHfTBXc/fCvMg== + dependencies: + "@vue/cli-shared-utils" "^5.0.8" + +"@vue/cli-plugin-vuex@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz#0d4cb3020f9102bea9288d750729dde176c66ccd" + integrity sha512-HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA== + +"@vue/cli-service@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-5.0.8.tgz#cf3f6f1b7bf0fba9cdab86b6bec4f9897f982dac" + integrity sha512-nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw== + dependencies: + "@babel/helper-compilation-targets" "^7.12.16" + "@soda/friendly-errors-webpack-plugin" "^1.8.0" + "@soda/get-current-script" "^1.0.2" + "@types/minimist" "^1.2.0" + "@vue/cli-overlay" "^5.0.8" + "@vue/cli-plugin-router" "^5.0.8" + "@vue/cli-plugin-vuex" "^5.0.8" + "@vue/cli-shared-utils" "^5.0.8" + "@vue/component-compiler-utils" "^3.3.0" + "@vue/vue-loader-v15" "npm:vue-loader@^15.9.7" + "@vue/web-component-wrapper" "^1.3.0" + acorn "^8.0.5" + acorn-walk "^8.0.2" + address "^1.1.2" + autoprefixer "^10.2.4" + browserslist "^4.16.3" + case-sensitive-paths-webpack-plugin "^2.3.0" + cli-highlight "^2.1.10" + clipboardy "^2.3.0" + cliui "^7.0.4" + copy-webpack-plugin "^9.0.1" + css-loader "^6.5.0" + css-minimizer-webpack-plugin "^3.0.2" + cssnano "^5.0.0" + debug "^4.1.1" + default-gateway "^6.0.3" + dotenv "^10.0.0" + dotenv-expand "^5.1.0" + fs-extra "^9.1.0" + globby "^11.0.2" + hash-sum "^2.0.0" + html-webpack-plugin "^5.1.0" + is-file-esm "^1.0.0" + launch-editor-middleware "^2.2.1" + lodash.defaultsdeep "^4.6.1" + lodash.mapvalues "^4.6.0" + mini-css-extract-plugin "^2.5.3" + minimist "^1.2.5" + module-alias "^2.2.2" + portfinder "^1.0.26" + postcss "^8.2.6" + postcss-loader "^6.1.1" + progress-webpack-plugin "^1.0.12" + ssri "^8.0.1" + terser-webpack-plugin "^5.1.1" + thread-loader "^3.0.0" + vue-loader "^17.0.0" + vue-style-loader "^4.1.3" + webpack "^5.54.0" + webpack-bundle-analyzer "^4.4.0" + webpack-chain "^6.5.1" + webpack-dev-server "^4.7.3" + webpack-merge "^5.7.3" + webpack-virtual-modules "^0.4.2" + whatwg-fetch "^3.6.2" + +"@vue/cli-shared-utils@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz#75fc96528eba2b1c7e33cb7e989a984ddef99c8a" + integrity sha512-uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ== + dependencies: + "@achrinza/node-ipc" "^9.2.5" + chalk "^4.1.2" + execa "^1.0.0" + joi "^17.4.0" + launch-editor "^2.2.1" + lru-cache "^6.0.0" + node-fetch "^2.6.7" + open "^8.0.2" + ora "^5.3.0" + read-pkg "^5.1.1" + semver "^7.3.4" + strip-ansi "^6.0.0" + +"@vue/cli-ui-addon-webpack@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-5.0.8.tgz#84314374f3fbf03a6e565c362ce01c0270a18e84" + integrity sha512-sg+3a9vHGzpFRrv7MVZRQ9oDztFN9Mvx0MleidKyPIAWMSOskSQT8zTngy8bEyXjXwNv6mCn2jvUR/tgbldyow== + +"@vue/cli-ui-addon-widgets@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-5.0.8.tgz#6f073f2bc975162468e5a6b93f074e25f8f64460" + integrity sha512-jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA== + +"@vue/cli-ui@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-ui/-/cli-ui-5.0.8.tgz#f6e817d54186f648807a906cd0898eecdaaf3ca9" + integrity sha512-1eyL1h1T3LVejYplDqERO8TK03sjR3QTOTHa01ABreCdqFTZItiUVud34uEcuoZ6Gi69xdl+LSx6Hvo4t9tfrA== + dependencies: + "@achrinza/node-ipc" "^9.2.5" + "@akryum/winattr" "^3.0.0" + "@graphql-tools/schema" "^8.5.0" + "@vue/cli-shared-utils" "^5.0.8" + apollo-server-express "^3.9.0" + clone "^2.1.1" + deepmerge "^4.2.2" + express "^4.17.1" + express-history-api-fallback "^2.2.1" + fkill "^7.1.0" + fs-extra "^9.1.0" + globby "^11.0.2" + graphql "^15.5.0" + graphql-subscriptions "^1.2.0" + graphql-tag "^2.10.3" + graphql-type-json "^0.3.1" + javascript-stringify "^2.0.1" + js-yaml "^4.0.0" + lodash.merge "^4.6.1" + lowdb "^1.0.0" + lru-cache "^6.0.0" + node-notifier "^10.0.0" + parse-git-config "^3.0.0" + portfinder "^1.0.26" + prismjs "^1.23.0" + rss-parser "^3.11.0" + shortid "^2.2.15" + subscriptions-transport-ws "^0.11.0" + typescript "~4.5.5" + +"@vue/cli@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli/-/cli-5.0.8.tgz#97b2bad9cb331dcffdd4fbe8532bdeacd2441166" + integrity sha512-c/QKPdC09bYkW22m/boXkLaiz10z0Z2WHZO7zEeNdfSduqyWINZhKc6hVQU3Vk0NXW7BJAd7zWmcUrC8L9TuAA== + dependencies: + "@types/ejs" "^3.0.6" + "@types/inquirer" "^8.1.3" + "@vue/cli-shared-utils" "^5.0.8" + "@vue/cli-ui" "^5.0.8" + "@vue/cli-ui-addon-webpack" "^5.0.8" + "@vue/cli-ui-addon-widgets" "^5.0.8" + boxen "^5.0.0" + commander "^7.1.0" + debug "^4.1.0" + deepmerge "^4.2.2" + download-git-repo "^3.0.2" + ejs "^3.1.6" + envinfo "^7.7.4" + fs-extra "^9.1.0" + globby "^11.0.2" + import-global "^0.1.0" + ini "^2.0.0" + inquirer "^8.0.0" + isbinaryfile "^4.0.6" + javascript-stringify "^2.0.1" + js-yaml "^4.0.0" + leven "^3.1.0" + lodash.clonedeep "^4.5.0" + lru-cache "^6.0.0" + minimist "^1.2.5" + pkg-dir "^5.0.0" + recast "^0.20.3" + resolve "^1.20.0" + shortid "^2.2.15" + slash "^3.0.0" + strip-ansi "^6.0.0" + validate-npm-package-name "^3.0.0" + vue "^2.6.14" + vue-codemod "^0.0.5" + yaml-front-matter "^4.1.0" + +"@vue/compiler-core@3.5.13", "@vue/compiler-core@^3.0.5": + version "3.5.13" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.13.tgz#b0ae6c4347f60c03e849a05d34e5bf747c9bda05" + integrity sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q== + dependencies: + "@babel/parser" "^7.25.3" + "@vue/shared" "3.5.13" + entities "^4.5.0" + estree-walker "^2.0.2" + source-map-js "^1.2.0" + +"@vue/compiler-dom@3.5.13", "@vue/compiler-dom@^3.0.5": + version "3.5.13" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz#bb1b8758dbc542b3658dda973b98a1c9311a8a58" + integrity sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA== + dependencies: + "@vue/compiler-core" "3.5.13" + "@vue/shared" "3.5.13" + +"@vue/compiler-sfc@2.7.16": + version "2.7.16" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz#ff81711a0fac9c68683d8bb00b63f857de77dc83" + integrity sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg== + dependencies: + "@babel/parser" "^7.23.5" + postcss "^8.4.14" + source-map "^0.6.1" + optionalDependencies: + prettier "^1.18.2 || ^2.0.0" + +"@vue/compiler-sfc@^3.5.3": + version "3.5.13" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz#461f8bd343b5c06fac4189c4fef8af32dea82b46" + integrity sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ== + dependencies: + "@babel/parser" "^7.25.3" + "@vue/compiler-core" "3.5.13" + "@vue/compiler-dom" "3.5.13" + "@vue/compiler-ssr" "3.5.13" + "@vue/shared" "3.5.13" + estree-walker "^2.0.2" + magic-string "^0.30.11" + postcss "^8.4.48" + source-map-js "^1.2.0" + +"@vue/compiler-ssr@3.5.13": + version "3.5.13" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz#e771adcca6d3d000f91a4277c972a996d07f43ba" + integrity sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA== + dependencies: + "@vue/compiler-dom" "3.5.13" + "@vue/shared" "3.5.13" + +"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz#f9f5fb53464b0c37b2c8d2f3fbfe44df60f61dc9" + integrity sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ== + dependencies: + consolidate "^0.15.1" + hash-sum "^1.0.2" + lru-cache "^4.1.2" + merge-source-map "^1.1.0" + postcss "^7.0.36" + postcss-selector-parser "^6.0.2" + source-map "~0.6.1" + vue-template-es2015-compiler "^1.9.0" + optionalDependencies: + prettier "^1.18.2 || ^2.0.0" + +"@vue/shared@3.5.13": + version "3.5.13" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.13.tgz#87b309a6379c22b926e696893237826f64339b6f" + integrity sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ== + +"@vue/vue-loader-v15@npm:vue-loader@^15.9.7": + version "15.11.1" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.11.1.tgz#dee91169211276ed43c5715caef88a56b1f497b0" + integrity sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q== + dependencies: + "@vue/component-compiler-utils" "^3.1.0" + hash-sum "^1.0.2" + loader-utils "^1.1.0" + vue-hot-reload-api "^2.3.0" + vue-style-loader "^4.1.0" + +"@vue/web-component-wrapper@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a" + integrity sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA== + +"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.14.1.tgz#a9f6a07f2b03c95c8d38c4536a1fdfb521ff55b6" + integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ== + dependencies: + "@webassemblyjs/helper-numbers" "1.13.2" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + +"@webassemblyjs/floating-point-hex-parser@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz#fcca1eeddb1cc4e7b6eed4fc7956d6813b21b9fb" + integrity sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA== + +"@webassemblyjs/helper-api-error@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz#e0a16152248bc38daee76dd7e21f15c5ef3ab1e7" + integrity sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ== + +"@webassemblyjs/helper-buffer@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz#822a9bc603166531f7d5df84e67b5bf99b72b96b" + integrity sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA== + +"@webassemblyjs/helper-numbers@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz#dbd932548e7119f4b8a7877fd5a8d20e63490b2d" + integrity sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.13.2" + "@webassemblyjs/helper-api-error" "1.13.2" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz#e556108758f448aae84c850e593ce18a0eb31e0b" + integrity sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA== + +"@webassemblyjs/helper-wasm-section@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz#9629dda9c4430eab54b591053d6dc6f3ba050348" + integrity sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/wasm-gen" "1.14.1" + +"@webassemblyjs/ieee754@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz#1c5eaace1d606ada2c7fd7045ea9356c59ee0dba" + integrity sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.13.2.tgz#57c5c3deb0105d02ce25fa3fd74f4ebc9fd0bbb0" + integrity sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.13.2.tgz#917a20e93f71ad5602966c2d685ae0c6c21f60f1" + integrity sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ== + +"@webassemblyjs/wasm-edit@^1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz#ac6689f502219b59198ddec42dcd496b1004d597" + integrity sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/helper-wasm-section" "1.14.1" + "@webassemblyjs/wasm-gen" "1.14.1" + "@webassemblyjs/wasm-opt" "1.14.1" + "@webassemblyjs/wasm-parser" "1.14.1" + "@webassemblyjs/wast-printer" "1.14.1" + +"@webassemblyjs/wasm-gen@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz#991e7f0c090cb0bb62bbac882076e3d219da9570" + integrity sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/ieee754" "1.13.2" + "@webassemblyjs/leb128" "1.13.2" + "@webassemblyjs/utf8" "1.13.2" + +"@webassemblyjs/wasm-opt@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz#e6f71ed7ccae46781c206017d3c14c50efa8106b" + integrity sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/wasm-gen" "1.14.1" + "@webassemblyjs/wasm-parser" "1.14.1" + +"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz#b3e13f1893605ca78b52c68e54cf6a865f90b9fb" + integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-api-error" "1.13.2" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/ieee754" "1.13.2" + "@webassemblyjs/leb128" "1.13.2" + "@webassemblyjs/utf8" "1.13.2" + +"@webassemblyjs/wast-printer@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz#3bb3e9638a8ae5fdaf9610e7a06b4d9f9aa6fe07" + integrity sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@xtuc/long" "4.2.2" + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +JSONStream@^1.0.0: + version "1.3.5" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +accepts@^1.3.5, accepts@~1.3.4, accepts@~1.3.8: + version "1.3.8" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== + dependencies: + mime-types "~2.1.34" + negotiator "0.6.3" + +acorn-jsx@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== + +acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.2.0: + version "8.3.4" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.4.tgz#794dd169c3977edf4ba4ea47583587c5866236b7" + integrity sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g== + dependencies: + acorn "^8.11.0" + +acorn@^8.0.4, acorn@^8.0.5, acorn@^8.11.0, acorn@^8.14.0, acorn@^8.4.1, acorn@^8.8.2, acorn@^8.9.0: + version "8.14.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0" + integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA== + +address@^1.1.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e" + integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA== + +aggregate-error@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv-keywords@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== + dependencies: + fast-deep-equal "^3.1.3" + +ajv@^6.12.4, ajv@^6.12.5: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.0, ajv@^8.9.0: + version "8.17.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6" + integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g== + dependencies: + fast-deep-equal "^3.1.3" + fast-uri "^3.0.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + +align-text@^0.1.1, align-text@^0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" + integrity sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg== + dependencies: + kind-of "^3.0.2" + longest "^1.0.1" + repeat-string "^1.5.2" + +ansi-align@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== + dependencies: + string-width "^4.1.0" + +ansi-escapes@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== + +ansi-escapes@^4.2.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== + dependencies: + type-fest "^0.21.3" + +ansi-html-community@^0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== + +ansi-regex@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1" + integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw== + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +any-promise@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== + +anymatch@~3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +apollo-datasource@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.3.2.tgz#5711f8b38d4b7b53fb788cb4dbd4a6a526ea74c8" + integrity sha512-L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg== + dependencies: + "@apollo/utils.keyvaluecache" "^1.0.1" + apollo-server-env "^4.2.1" + +apollo-reporting-protobuf@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.4.0.tgz#6edd31f09d4a3704d9e808d1db30eca2229ded26" + integrity sha512-h0u3EbC/9RpihWOmcSsvTW2O6RXVaD/mPEjfrPkxRPTEPWqncsgOoRJw+wih4OqfH3PvTJvoEIf4LwKrUaqWog== + dependencies: + "@apollo/protobufjs" "1.2.6" + +apollo-server-core@^3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.13.0.tgz#ad6601fbb34cc97eedca27a9fb0b5738d11cd27d" + integrity sha512-v/g6DR6KuHn9DYSdtQijz8dLOkP78I5JSVJzPkARhDbhpH74QNwrQ2PP2URAPPEDJ2EeZNQDX8PvbYkAKqg+kg== + dependencies: + "@apollo/utils.keyvaluecache" "^1.0.1" + "@apollo/utils.logger" "^1.0.0" + "@apollo/utils.usagereporting" "^1.0.0" + "@apollographql/apollo-tools" "^0.5.3" + "@apollographql/graphql-playground-html" "1.6.29" + "@graphql-tools/mock" "^8.1.2" + "@graphql-tools/schema" "^8.0.0" + "@josephg/resolvable" "^1.0.0" + apollo-datasource "^3.3.2" + apollo-reporting-protobuf "^3.4.0" + apollo-server-env "^4.2.1" + apollo-server-errors "^3.3.1" + apollo-server-plugin-base "^3.7.2" + apollo-server-types "^3.8.0" + async-retry "^1.2.1" + fast-json-stable-stringify "^2.1.0" + graphql-tag "^2.11.0" + loglevel "^1.6.8" + lru-cache "^6.0.0" + node-abort-controller "^3.0.1" + sha.js "^2.4.11" + uuid "^9.0.0" + whatwg-mimetype "^3.0.0" + +apollo-server-env@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-4.2.1.tgz#ea5b1944accdbdba311f179e4dfaeca482c20185" + integrity sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g== + dependencies: + node-fetch "^2.6.7" + +apollo-server-errors@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655" + integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA== + +apollo-server-express@^3.9.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.13.0.tgz#0d8d9bbba3b8b8264912d215f63fd44e74d5f42a" + integrity sha512-iSxICNbDUyebOuM8EKb3xOrpIwOQgKxGbR2diSr4HP3IW8T3njKFOoMce50vr+moOCe1ev8BnLcw9SNbuUtf7g== + dependencies: + "@types/accepts" "^1.3.5" + "@types/body-parser" "1.19.2" + "@types/cors" "2.8.12" + "@types/express" "4.17.14" + "@types/express-serve-static-core" "4.17.31" + accepts "^1.3.5" + apollo-server-core "^3.13.0" + apollo-server-types "^3.8.0" + body-parser "^1.19.0" + cors "^2.8.5" + parseurl "^1.3.3" + +apollo-server-plugin-base@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.2.tgz#c19cd137bc4c993ba2490ba2b571b0f3ce60a0cd" + integrity sha512-wE8dwGDvBOGehSsPTRZ8P/33Jan6/PmL0y0aN/1Z5a5GcbFhDaaJCjK5cav6npbbGL2DPKK0r6MPXi3k3N45aw== + dependencies: + apollo-server-types "^3.8.0" + +apollo-server-types@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.8.0.tgz#d976b6967878681f715fe2b9e4dad9ba86b1346f" + integrity sha512-ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A== + dependencies: + "@apollo/utils.keyvaluecache" "^1.0.1" + "@apollo/utils.logger" "^1.0.0" + apollo-reporting-protobuf "^3.4.0" + apollo-server-env "^4.2.1" + +arch@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" + integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== + +archive-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-4.0.0.tgz#f92e72233056dfc6969472749c267bdb046b1d70" + integrity sha512-zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA== + dependencies: + file-type "^4.2.0" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== + +arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== + +array-find-index@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + integrity sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw== + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== + +arrify@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" + integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== + +asap@^2.0.0: + version "2.0.6" + resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== + +ast-types@0.12.1: + version "0.12.1" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.12.1.tgz#55d3737a8a68e1ccde131067005ce7ee3dd42b99" + integrity sha512-H2izJAyT2xwew4TxShpmxe6f9R5hHgJQy1QloLiUC2yrJMtyraBWNJL7903rpeCY9keNUipORR/zIUC2XcYKng== + +ast-types@0.14.2: + version "0.14.2" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd" + integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA== + dependencies: + tslib "^2.0.1" + +async-retry@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280" + integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw== + dependencies: + retry "0.13.1" + +async@^2.6.4: + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== + dependencies: + lodash "^4.17.14" + +async@^3.2.3: + version "3.2.6" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" + integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== + +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +autoprefixer@^10.2.4: + version "10.4.20" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b" + integrity sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g== + dependencies: + browserslist "^4.23.3" + caniuse-lite "^1.0.30001646" + fraction.js "^4.3.7" + normalize-range "^0.1.2" + picocolors "^1.0.1" + postcss-value-parser "^4.2.0" + +babel-core@^7.0.0-bridge.0: + version "7.0.0-bridge.0" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" + integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg== + +babel-loader@^8.2.2: + version "8.4.1" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.4.1.tgz#6ccb75c66e62c3b144e1c5f2eaec5b8f6c08c675" + integrity sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA== + dependencies: + find-cache-dir "^3.3.1" + loader-utils "^2.0.4" + make-dir "^3.1.0" + schema-utils "^2.6.5" + +babel-plugin-dynamic-import-node@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== + dependencies: + object.assign "^4.1.0" + +babel-plugin-polyfill-corejs2@^0.4.10: + version "0.4.12" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz#ca55bbec8ab0edeeef3d7b8ffd75322e210879a9" + integrity sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og== + dependencies: + "@babel/compat-data" "^7.22.6" + "@babel/helper-define-polyfill-provider" "^0.6.3" + semver "^6.3.1" + +babel-plugin-polyfill-corejs3@^0.10.6: + version "0.10.6" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz#2deda57caef50f59c525aeb4964d3b2f867710c7" + integrity sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.6.2" + core-js-compat "^3.38.0" + +babel-plugin-polyfill-regenerator@^0.6.1: + version "0.6.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz#abeb1f3f1c762eace37587f42548b08b57789bc8" + integrity sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.6.3" + +backo2@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" + integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +batch@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== + +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + +binary-extensions@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" + integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== + +bl@^1.0.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7" + integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww== + dependencies: + readable-stream "^2.3.5" + safe-buffer "^5.1.1" + +bl@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +bluebird@^3.1.1: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +body-parser@1.20.3, body-parser@^1.19.0: + version "1.20.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" + integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== + dependencies: + bytes "3.1.2" + content-type "~1.0.5" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.13.0" + raw-body "2.5.2" + type-is "~1.6.18" + unpipe "1.0.0" + +bonjour-service@^1.0.11: + version "1.3.0" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.3.0.tgz#80d867430b5a0da64e82a8047fc1e355bdb71722" + integrity sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA== + dependencies: + fast-deep-equal "^3.1.3" + multicast-dns "^7.2.5" + +boolbase@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== + +boxen@^5.0.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== + dependencies: + ansi-align "^3.0.0" + camelcase "^6.2.0" + chalk "^4.1.0" + cli-boxes "^2.2.1" + string-width "^4.2.2" + type-fest "^0.20.2" + widest-line "^3.1.0" + wrap-ansi "^7.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + +braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +braces@^3.0.3, braces@~3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== + dependencies: + fill-range "^7.1.1" + +browserslist@^4.0.0, browserslist@^4.16.3, browserslist@^4.21.4, browserslist@^4.23.3, browserslist@^4.24.0, browserslist@^4.24.2: + version "4.24.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580" + integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== + dependencies: + caniuse-lite "^1.0.30001669" + electron-to-chromium "^1.5.41" + node-releases "^2.0.18" + update-browserslist-db "^1.1.1" + +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== + +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer@^5.2.1, buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +builtins@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" + integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ== + +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +cacheable-request@^2.1.1: + version "2.1.4" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d" + integrity sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ== + dependencies: + clone-response "1.0.2" + get-stream "3.0.0" + http-cache-semantics "3.8.1" + keyv "3.0.0" + lowercase-keys "1.0.0" + normalize-url "2.0.1" + responselike "1.0.2" + +call-bind-apply-helpers@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz#32e5892e6361b29b0b545ba6f7763378daca2840" + integrity sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + +call-bind@^1.0.5, call-bind@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c" + integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww== + dependencies: + call-bind-apply-helpers "^1.0.0" + es-define-property "^1.0.0" + get-intrinsic "^1.2.4" + set-function-length "^1.2.2" + +call-bound@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.2.tgz#9dbd4daf9f5f753bec3e4c8fbb8a2ecc4de6c39b" + integrity sha512-0lk0PHFe/uz0vl527fG9CgdE9WdafjDbCXvBbs+LUv000TVt2Jjhqbs4Jwm8gz070w8xXyEAxrPOMullsxXeGg== + dependencies: + call-bind "^1.0.8" + get-intrinsic "^1.2.5" + +callsite@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" + integrity sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ== + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camel-case@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" + integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== + dependencies: + pascal-case "^3.1.2" + tslib "^2.0.3" + +camelcase@^1.0.2: + version "1.2.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" + integrity sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g== + +camelcase@^5.0.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +camelcase@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== + +caniuse-api@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" + integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== + dependencies: + browserslist "^4.0.0" + caniuse-lite "^1.0.0" + lodash.memoize "^4.1.2" + lodash.uniq "^4.5.0" + +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669: + version "1.0.30001687" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz#d0ac634d043648498eedf7a3932836beba90ebae" + integrity sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ== + +case-sensitive-paths-webpack-plugin@^2.3.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4" + integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw== + +caw@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95" + integrity sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA== + dependencies: + get-proxy "^2.0.0" + isurl "^1.0.0-alpha5" + tunnel-agent "^0.6.0" + url-to-options "^1.0.1" + +center-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" + integrity sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ== + dependencies: + align-text "^0.1.3" + lazy-cache "^1.0.3" + +chalk@^2.1.0, chalk@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chalk@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" + integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== + +chardet@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" + integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== + +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +chrome-trace-event@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b" + integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ== + +ci-info@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" + integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +clean-css@^5.2.2: + version "5.3.3" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd" + integrity sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg== + dependencies: + source-map "~0.6.0" + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +cli-boxes@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + +cli-cursor@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw== + dependencies: + restore-cursor "^2.0.0" + +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + +cli-highlight@^2.1.10: + version "2.1.11" + resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf" + integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg== + dependencies: + chalk "^4.0.0" + highlight.js "^10.7.1" + mz "^2.4.0" + parse5 "^5.1.1" + parse5-htmlparser2-tree-adapter "^6.0.0" + yargs "^16.0.0" + +cli-spinners@^2.5.0: + version "2.9.2" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41" + integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg== + +cli-width@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" + integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== + +clipboardy@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" + integrity sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ== + dependencies: + arch "^2.1.1" + execa "^1.0.0" + is-wsl "^2.1.1" + +cliui@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" + integrity sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA== + dependencies: + center-align "^0.1.1" + right-align "^0.1.1" + wordwrap "0.0.2" + +cliui@^7.0.2, cliui@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + +clone-response@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q== + dependencies: + mimic-response "^1.0.0" + +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== + +clone@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw== + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colord@^2.9.1: + version "2.9.3" + resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" + integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== + +colorette@^2.0.10: + version "2.0.20" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" + integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== + +colors@^1.1.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + +commander@^2.20.0, commander@^2.20.3, commander@^2.8.1: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@^6.2.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" + integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== + +commander@^7.1.0, commander@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + +commander@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== + +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== + +component-emitter@^1.2.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17" + integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ== + +compressible@~2.0.18: + version "2.0.18" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== + dependencies: + mime-db ">= 1.43.0 < 2" + +compression@^1.7.4: + version "1.7.5" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93" + integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q== + dependencies: + bytes "3.1.2" + compressible "~2.0.18" + debug "2.6.9" + negotiator "~0.6.4" + on-headers "~1.0.2" + safe-buffer "5.2.1" + vary "~1.1.2" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== + +concat-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" + integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.0.2" + typedarray "^0.0.6" + +config-chain@^1.1.11: + version "1.1.13" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" + integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== + dependencies: + ini "^1.3.4" + proto-list "~1.2.1" + +connect-history-api-fallback@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" + integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== + +consolidate@^0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" + integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw== + dependencies: + bluebird "^3.1.1" + +content-disposition@0.5.4, content-disposition@^0.5.2: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== + dependencies: + safe-buffer "5.2.1" + +content-type@~1.0.4, content-type@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== + +convert-source-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" + integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== + +cookie@0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9" + integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w== + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== + +copy-webpack-plugin@^9.0.1: + version "9.1.0" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" + integrity sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA== + dependencies: + fast-glob "^3.2.7" + glob-parent "^6.0.1" + globby "^11.0.3" + normalize-path "^3.0.0" + schema-utils "^3.1.1" + serialize-javascript "^6.0.0" + +core-js-compat@^3.38.0, core-js-compat@^3.38.1, core-js-compat@^3.8.3: + version "3.39.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.39.0.tgz#b12dccb495f2601dc860bdbe7b4e3ffa8ba63f61" + integrity sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw== + dependencies: + browserslist "^4.24.2" + +core-js@^3.8.3: + version "3.39.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.39.0.tgz#57f7647f4d2d030c32a72ea23a0555b2eaa30f83" + integrity sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g== + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +cors@^2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + +cosmiconfig@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" + integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" + +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A== + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^6.0.0: + version "6.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57" + integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: + version "7.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +css-declaration-sorter@^6.3.1: + version "6.4.1" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz#28beac7c20bad7f1775be3a7129d7eae409a3a71" + integrity sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g== + +css-loader@^6.5.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.11.0.tgz#33bae3bf6363d0a7c2cf9031c96c744ff54d85ba" + integrity sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g== + dependencies: + icss-utils "^5.1.0" + postcss "^8.4.33" + postcss-modules-extract-imports "^3.1.0" + postcss-modules-local-by-default "^4.0.5" + postcss-modules-scope "^3.2.0" + postcss-modules-values "^4.0.0" + postcss-value-parser "^4.2.0" + semver "^7.5.4" + +css-minimizer-webpack-plugin@^3.0.2: + version "3.4.1" + resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f" + integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q== + dependencies: + cssnano "^5.0.6" + jest-worker "^27.0.2" + postcss "^8.3.5" + schema-utils "^4.0.0" + serialize-javascript "^6.0.0" + source-map "^0.6.1" + +css-select@^4.1.3: + version "4.3.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" + integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== + dependencies: + boolbase "^1.0.0" + css-what "^6.0.1" + domhandler "^4.3.1" + domutils "^2.8.0" + nth-check "^2.0.1" + +css-tree@^1.1.2, css-tree@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== + dependencies: + mdn-data "2.0.14" + source-map "^0.6.1" + +css-what@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +cssfilter@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" + integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw== + +cssnano-preset-default@^5.2.14: + version "5.2.14" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz#309def4f7b7e16d71ab2438052093330d9ab45d8" + integrity sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A== + dependencies: + css-declaration-sorter "^6.3.1" + cssnano-utils "^3.1.0" + postcss-calc "^8.2.3" + postcss-colormin "^5.3.1" + postcss-convert-values "^5.1.3" + postcss-discard-comments "^5.1.2" + postcss-discard-duplicates "^5.1.0" + postcss-discard-empty "^5.1.1" + postcss-discard-overridden "^5.1.0" + postcss-merge-longhand "^5.1.7" + postcss-merge-rules "^5.1.4" + postcss-minify-font-values "^5.1.0" + postcss-minify-gradients "^5.1.1" + postcss-minify-params "^5.1.4" + postcss-minify-selectors "^5.2.1" + postcss-normalize-charset "^5.1.0" + postcss-normalize-display-values "^5.1.0" + postcss-normalize-positions "^5.1.1" + postcss-normalize-repeat-style "^5.1.1" + postcss-normalize-string "^5.1.0" + postcss-normalize-timing-functions "^5.1.0" + postcss-normalize-unicode "^5.1.1" + postcss-normalize-url "^5.1.0" + postcss-normalize-whitespace "^5.1.1" + postcss-ordered-values "^5.1.3" + postcss-reduce-initial "^5.1.2" + postcss-reduce-transforms "^5.1.0" + postcss-svgo "^5.1.0" + postcss-unique-selectors "^5.1.1" + +cssnano-utils@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" + integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== + +cssnano@^5.0.0, cssnano@^5.0.6: + version "5.1.15" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf" + integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw== + dependencies: + cssnano-preset-default "^5.2.14" + lilconfig "^2.0.3" + yaml "^1.10.2" + +csso@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== + dependencies: + css-tree "^1.1.2" + +csstype@^3.1.0: + version "3.1.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" + integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== + +de-indent@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" + integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg== + +debounce@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" + integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== + +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^3.1.0, debug@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: + version "4.4.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" + integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== + dependencies: + ms "^2.1.3" + +debuglog@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" + integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw== + +decache@^4.6.0: + version "4.6.2" + resolved "https://registry.yarnpkg.com/decache/-/decache-4.6.2.tgz#c1df1325a2f36d53922e08f33380f083148199cd" + integrity sha512-2LPqkLeu8XWHU8qNCS3kcF6sCcb5zIzvWaAHYSvPfwhdd7mHuah29NssMzrTYyHN4F5oFy2ko9OBYxegtU0FEw== + dependencies: + callsite "^1.0.0" + +decamelize@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== + +decode-uri-component@^0.2.0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== + +decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== + dependencies: + mimic-response "^1.0.0" + +decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1" + integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ== + dependencies: + file-type "^5.2.0" + is-stream "^1.1.0" + tar-stream "^1.5.2" + +decompress-tarbz2@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b" + integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A== + dependencies: + decompress-tar "^4.1.0" + file-type "^6.1.0" + is-stream "^1.1.0" + seek-bzip "^1.0.5" + unbzip2-stream "^1.0.9" + +decompress-targz@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee" + integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w== + dependencies: + decompress-tar "^4.1.1" + file-type "^5.2.0" + is-stream "^1.1.0" + +decompress-unzip@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69" + integrity sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw== + dependencies: + file-type "^3.8.0" + get-stream "^2.2.0" + pify "^2.3.0" + yauzl "^2.4.2" + +decompress@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118" + integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== + dependencies: + decompress-tar "^4.0.0" + decompress-tarbz2 "^4.0.0" + decompress-targz "^4.0.0" + decompress-unzip "^4.0.1" + graceful-fs "^4.1.10" + make-dir "^1.0.0" + pify "^2.3.0" + strip-dirs "^2.0.0" + +deep-is@^0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +deepmerge@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753" + integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ== + +deepmerge@^4.2.2: + version "4.3.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" + integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== + +default-gateway@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" + integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== + dependencies: + execa "^5.0.0" + +defaults@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" + integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A== + dependencies: + clone "^1.0.2" + +define-data-property@^1.0.1, define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + +define-lazy-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== + +define-properties@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" + integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== + dependencies: + define-data-property "^1.0.1" + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA== + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA== + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +depd@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== + +detect-node@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== + +dezalgo@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81" + integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig== + dependencies: + asap "^2.0.0" + wrappy "1" + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +dns-packet@^5.2.2: + version "5.6.1" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f" + integrity sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw== + dependencies: + "@leichtgewicht/ip-codec" "^2.0.1" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +dom-converter@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" + integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== + dependencies: + utila "~0.4" + +dom-serializer@^1.0.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" + integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.0" + entities "^2.0.0" + +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + +domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" + integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== + dependencies: + domelementtype "^2.2.0" + +domutils@^2.5.2, domutils@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + +dot-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + +dotenv@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" + integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== + +download-git-repo@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/download-git-repo/-/download-git-repo-3.0.2.tgz#8caae24fb2abd6453172deea5619036024f190f6" + integrity sha512-N8hWXD4hXqmEcNoR8TBYFntaOcYvEQ7Bz90mgm3bZRTuteGQqwT32VDMnTyD0KTEvb8BWrMc1tVmzuV9u/WrAg== + dependencies: + download "^7.1.0" + git-clone "^0.1.0" + rimraf "^3.0.0" + +download@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/download/-/download-7.1.0.tgz#9059aa9d70b503ee76a132897be6dec8e5587233" + integrity sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ== + dependencies: + archive-type "^4.0.0" + caw "^2.0.1" + content-disposition "^0.5.2" + decompress "^4.2.0" + ext-name "^5.0.0" + file-type "^8.1.0" + filenamify "^2.0.0" + get-stream "^3.0.0" + got "^8.3.1" + make-dir "^1.2.0" + p-event "^2.1.0" + pify "^3.0.0" + +dunder-proto@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.0.tgz#c2fce098b3c8f8899554905f4377b6d85dabaa80" + integrity sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A== + dependencies: + call-bind-apply-helpers "^1.0.0" + es-errors "^1.3.0" + gopd "^1.2.0" + +duplexer3@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" + integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== + +duplexer@^0.1.1, duplexer@^0.1.2, duplexer@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== + +easy-stack@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz#8afe4264626988cabb11f3c704ccd0c835411066" + integrity sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w== + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== + +ejs@^3.1.6: + version "3.1.10" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" + integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== + dependencies: + jake "^10.8.5" + +electron-to-chromium@^1.5.41: + version "1.5.72" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.72.tgz#a732805986d3a5b5fedd438ddf4616c7d78ac2df" + integrity sha512-ZpSAUOZ2Izby7qnZluSrAlGgGQzucmFbN0n64dYzocYxnxV5ufurpj3VgEe4cUp7ir9LmeLxNYo8bVnlM8bQHw== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== + +encodeurl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58" + integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg== + +end-of-stream@^1.0.0, end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enhanced-resolve@^5.17.1: + version "5.17.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" + integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +entities@^2.0.0, entities@^2.0.3: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + +entities@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== + +envinfo@^7.7.4: + version "7.14.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.14.0.tgz#26dac5db54418f2a4c1159153a0b2ae980838aae" + integrity sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg== + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +error-stack-parser@^2.0.6: + version "2.1.4" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" + integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== + dependencies: + stackframe "^1.3.4" + +es-define-property@^1.0.0, es-define-property@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa" + integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g== + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + +es-module-lexer@^1.2.1: + version "1.5.4" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78" + integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw== + +escalade@^3.1.1, escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +eslint-plugin-vue@^9.8.0: + version "9.32.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.32.0.tgz#2b558e827886b567dfaa156cc1cad0f596461fab" + integrity sha512-b/Y05HYmnB/32wqVcjxjHZzNpwxj1onBOvqW89W+V+XNG1dRuaFbNd3vT9CLbr2LXjEoq+3vn8DanWf7XU22Ug== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + globals "^13.24.0" + natural-compare "^1.4.0" + nth-check "^2.1.1" + postcss-selector-parser "^6.0.15" + semver "^7.6.3" + vue-eslint-parser "^9.4.3" + xml-name-validator "^4.0.0" + +eslint-scope@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-scope@^7.1.1, eslint-scope@^7.2.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" + integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + +eslint-visitor-keys@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" + integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== + +eslint-webpack-plugin@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz#1978cdb9edc461e4b0195a20da950cf57988347c" + integrity sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w== + dependencies: + "@types/eslint" "^7.29.0 || ^8.4.1" + jest-worker "^28.0.2" + micromatch "^4.0.5" + normalize-path "^3.0.0" + schema-utils "^4.0.0" + +eslint@^8.29.0: + version "8.57.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9" + integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@eslint-community/regexpp" "^4.6.1" + "@eslint/eslintrc" "^2.1.4" + "@eslint/js" "8.57.1" + "@humanwhocodes/config-array" "^0.13.0" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" + "@ungap/structured-clone" "^1.2.0" + ajv "^6.12.4" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.3.2" + doctrine "^3.0.0" + escape-string-regexp "^4.0.0" + eslint-scope "^7.2.2" + eslint-visitor-keys "^3.4.3" + espree "^9.6.1" + esquery "^1.4.2" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.19.0" + graphemer "^1.4.0" + ignore "^5.2.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + is-path-inside "^3.0.3" + js-yaml "^4.1.0" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.1.2" + natural-compare "^1.4.0" + optionator "^0.9.3" + strip-ansi "^6.0.1" + text-table "^0.2.0" + +espree@^9.3.1, espree@^9.6.0, espree@^9.6.1: + version "9.6.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" + integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== + dependencies: + acorn "^8.9.0" + acorn-jsx "^5.3.2" + eslint-visitor-keys "^3.4.1" + +esprima@^4.0.0, esprima@~4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.4.0, esquery@^1.4.2: + version "1.6.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7" + integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +estree-walker@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== + +event-pubsub@4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e" + integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ== + +event-stream@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-4.0.1.tgz#4092808ec995d0dd75ea4580c1df6a74db2cde65" + integrity sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA== + dependencies: + duplexer "^0.1.1" + from "^0.1.7" + map-stream "0.0.7" + pause-stream "^0.0.11" + split "^1.0.1" + stream-combiner "^0.2.2" + through "^2.3.8" + +eventemitter3@^3.1.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" + integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== + +eventemitter3@^4.0.0: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + +events@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +execa@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" + integrity sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA== + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== + dependencies: + cross-spawn "^6.0.0" + get-stream "^4.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +execa@^3.3.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" + integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + p-finally "^2.0.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA== + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +express-history-api-fallback@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/express-history-api-fallback/-/express-history-api-fallback-2.2.1.tgz#3a2ad27f7bebc90fc533d110d7c6d83097bcd057" + integrity sha512-swxwm3aP8vrOOvlzOdZvHlSZtJGwHKaY94J6AkrAgCTmcbko3IRwbkhLv2wKV1WeZhjxX58aLMpP3atDBnKuZg== + +express@^4.17.1, express@^4.17.3: + version "4.21.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32" + integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA== + dependencies: + accepts "~1.3.8" + array-flatten "1.1.1" + body-parser "1.20.3" + content-disposition "0.5.4" + content-type "~1.0.4" + cookie "0.7.1" + cookie-signature "1.0.6" + debug "2.6.9" + depd "2.0.0" + encodeurl "~2.0.0" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "1.3.1" + fresh "0.5.2" + http-errors "2.0.0" + merge-descriptors "1.0.3" + methods "~1.1.2" + on-finished "2.4.1" + parseurl "~1.3.3" + path-to-regexp "0.1.12" + proxy-addr "~2.0.7" + qs "6.13.0" + range-parser "~1.2.1" + safe-buffer "5.2.1" + send "0.19.0" + serve-static "1.16.2" + setprototypeof "1.2.0" + statuses "2.0.1" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +ext-list@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" + integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA== + dependencies: + mime-db "^1.28.0" + +ext-name@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6" + integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ== + dependencies: + ext-list "^2.0.0" + sort-keys-length "^1.0.0" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +external-editor@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" + integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== + dependencies: + chardet "^0.7.0" + iconv-lite "^0.4.24" + tmp "^0.0.33" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@^3.2.7, fast-glob@^3.2.9: + version "3.3.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" + integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== + +fast-uri@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.3.tgz#892a1c91802d5d7860de728f18608a0573142241" + integrity sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw== + +fastq@^1.6.0: + version "1.17.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" + integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== + dependencies: + reusify "^1.0.4" + +faye-websocket@^0.11.3: + version "0.11.4" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" + integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== + dependencies: + websocket-driver ">=0.5.1" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== + dependencies: + pend "~1.2.0" + +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA== + dependencies: + escape-string-regexp "^1.0.5" + +figures@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" + integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== + dependencies: + escape-string-regexp "^1.0.5" + +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + +file-loader@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" + integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + +file-type@^3.8.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" + integrity sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA== + +file-type@^4.2.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-4.4.0.tgz#1b600e5fca1fbdc6e80c0a70c71c8dba5f7906c5" + integrity sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ== + +file-type@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" + integrity sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ== + +file-type@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919" + integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg== + +file-type@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-8.1.0.tgz#244f3b7ef641bbe0cca196c7276e4b332399f68c" + integrity sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ== + +filelist@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== + dependencies: + minimatch "^5.0.1" + +filename-reserved-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" + integrity sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ== + +filenamify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.1.0.tgz#88faf495fb1b47abfd612300002a16228c677ee9" + integrity sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA== + dependencies: + filename-reserved-regex "^2.0.0" + strip-outer "^1.0.0" + trim-repeated "^1.0.0" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ== + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019" + integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ== + dependencies: + debug "2.6.9" + encodeurl "~2.0.0" + escape-html "~1.0.3" + on-finished "2.4.1" + parseurl "~1.3.3" + statuses "2.0.1" + unpipe "~1.0.0" + +find-cache-dir@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" + integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== + dependencies: + commondir "^1.0.1" + make-dir "^2.0.0" + pkg-dir "^3.0.0" + +find-cache-dir@^3.3.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== + dependencies: + commondir "^1.0.1" + make-dir "^3.0.2" + pkg-dir "^4.1.0" + +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + dependencies: + locate-path "^3.0.0" + +find-up@^4.0.0, find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +fkill@^7.1.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/fkill/-/fkill-7.2.1.tgz#7036200cd2edd28a6bc40f0defc1e159d9e24e64" + integrity sha512-eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ== + dependencies: + aggregate-error "^3.1.0" + arrify "^2.0.1" + execa "^5.0.0" + pid-port "^0.1.0" + process-exists "^4.0.0" + ps-list "^7.2.0" + taskkill "^3.1.0" + +flat-cache@^3.0.4: + version "3.2.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" + integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw== + dependencies: + flatted "^3.2.9" + keyv "^4.5.3" + rimraf "^3.0.2" + +flat@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" + integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== + +flatted@^3.2.9: + version "3.3.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.2.tgz#adba1448a9841bec72b42c532ea23dbbedef1a27" + integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA== + +flow-parser@0.*: + version "0.256.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.256.0.tgz#2a453925caa0f40beb83ef72ea6479ef7b25d739" + integrity sha512-HFb/GgB7hq+TYosLJuMLdLp8aGlyAVfrJaTvcM0w2rz2T33PjkVbRU419ncK/69cjowUksewuspkBheq9ZX9Hw== + +follow-redirects@^1.0.0: + version "1.15.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" + integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== + +for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fraction.js@^4.3.7: + version "4.3.7" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7" + integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew== + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA== + dependencies: + map-cache "^0.2.2" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== + +from2@^2.1.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g== + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.0" + +from@^0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" + integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g== + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-monkey@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.6.tgz#8ead082953e88d992cf3ff844faa907b26756da2" + integrity sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg== + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== + +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + +fswin@^2.17.1227: + version "2.17.1227" + resolved "https://registry.yarnpkg.com/fswin/-/fswin-2.17.1227.tgz#c598061e1ac1e7110e2e6ce884296efa27dc2507" + integrity sha512-xNDktvwzSsXT8Xqnpz59VbuFwGHhtn1w+dS7QQ+wAu5cbH0p3WMGKU9Duf7cPna+nubhR+5ZG1MTl6/V6xgRgw== + +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +geojson-stream@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/geojson-stream/-/geojson-stream-0.1.0.tgz#1b973b09c78f7bedc662b5f0b245ecdf162e90f1" + integrity sha512-svSg5fFXPaTiqzEBGXScA+nISaeC9rLvku2PH+wM5LToATUw2bLIrvls43ymnT9Xnp51nBPVyK9m4Af40KpJ7w== + dependencies: + JSONStream "^1.0.0" + through "^2.3.4" + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-intrinsic@^1.2.4, get-intrinsic@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.5.tgz#dfe7dd1b30761b464fe51bf4bb00ac7c37b681e7" + integrity sha512-Y4+pKa7XeRUPWFNvOOYHkRYrfzW07oraURSvjDmRVOJ748OrVmeXtpE4+GCEHncjCjkTxPNRt8kEbxDhsn6VTg== + dependencies: + call-bind-apply-helpers "^1.0.0" + dunder-proto "^1.0.0" + es-define-property "^1.0.1" + es-errors "^1.3.0" + function-bind "^1.1.2" + gopd "^1.2.0" + has-symbols "^1.1.0" + hasown "^2.0.2" + +get-proxy@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93" + integrity sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw== + dependencies: + npm-conf "^1.1.0" + +get-stream@3.0.0, get-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + integrity sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ== + +get-stream@^2.2.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" + integrity sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA== + dependencies: + object-assign "^4.0.1" + pinkie-promise "^2.0.0" + +get-stream@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== + +git-clone@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/git-clone/-/git-clone-0.1.0.tgz#0d76163778093aef7f1c30238f2a9ef3f07a2eb9" + integrity sha512-zs9rlfa7HyaJAKG9o+V7C6qfMzyc+tb1IIXdUFcOBcR1U7siKy/uPdauLlrH1mc0vOgUwIv4BF+QxPiiTYz3Rw== + +git-config-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/git-config-path/-/git-config-path-2.0.0.tgz#62633d61af63af4405a5024efd325762f58a181b" + integrity sha512-qc8h1KIQbJpp+241id3GuAtkdyJ+IK+LIVtkiFTRKRrmddDzs3SI9CvP1QYmWBFvm1I/PWRwj//of8bgAc0ltA== + +glob-parent@^5.1.2, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob-parent@^6.0.1, glob-parent@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== + dependencies: + is-glob "^4.0.3" + +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + +glob@^7.0.0, glob@^7.1.1, glob@^7.1.3: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-dirs@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" + integrity sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg== + dependencies: + ini "^1.3.4" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globals@^13.19.0, globals@^13.24.0: + version "13.24.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" + integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ== + dependencies: + type-fest "^0.20.2" + +globby@^11.0.2, globby@^11.0.3: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^3.0.0" + +gopd@^1.0.1, gopd@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1" + integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg== + +got@^8.3.1: + version "8.3.2" + resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937" + integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw== + dependencies: + "@sindresorhus/is" "^0.7.0" + cacheable-request "^2.1.1" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^3.0.0" + into-stream "^3.1.0" + is-retry-allowed "^1.1.0" + isurl "^1.0.0-alpha5" + lowercase-keys "^1.0.0" + mimic-response "^1.0.0" + p-cancelable "^0.4.0" + p-timeout "^2.0.1" + pify "^3.0.0" + safe-buffer "^5.1.1" + timed-out "^4.0.1" + url-parse-lax "^3.0.0" + url-to-options "^1.0.1" + +graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + +graphemer@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" + integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== + +graphql-subscriptions@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz#2142b2d729661ddf967b7388f7cf1dd4cf2e061d" + integrity sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g== + dependencies: + iterall "^1.3.0" + +graphql-tag@^2.10.3, graphql-tag@^2.11.0: + version "2.12.6" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1" + integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg== + dependencies: + tslib "^2.1.0" + +graphql-type-json@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115" + integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg== + +graphql@^15.5.0: + version "15.9.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.9.0.tgz#4e8ca830cfd30b03d44d3edd9cac2b0690304b53" + integrity sha512-GCOQdvm7XxV1S4U4CGrsdlEN37245eC8P9zaYCMr6K1BG0IPGy5lUwmJsEOGyl1GD6HXjOtl2keCP9asRBwNvA== + +growly@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" + integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw== + +gzip-size@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" + integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q== + dependencies: + duplexer "^0.1.2" + +handle-thing@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + +has-symbol-support-x@^1.4.1: + version "1.4.2" + resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" + integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== + +has-symbols@^1.0.3, has-symbols@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338" + integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ== + +has-to-string-tag-x@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" + integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw== + dependencies: + has-symbol-support-x "^1.4.1" + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q== + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw== + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ== + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ== + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +hash-sum@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" + integrity sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA== + +hash-sum@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a" + integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg== + +hasown@^2.0.0, hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + +he@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + +highlight.js@^10.7.1: + version "10.7.3" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" + integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== + +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + +hpack.js@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" + integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ== + dependencies: + inherits "^2.0.1" + obuf "^1.0.0" + readable-stream "^2.0.1" + wbuf "^1.1.0" + +html-entities@^2.3.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" + integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== + +html-escaper@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + +html-minifier-terser@^6.0.2: + version "6.1.0" + resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" + integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw== + dependencies: + camel-case "^4.1.2" + clean-css "^5.2.2" + commander "^8.3.0" + he "^1.2.0" + param-case "^3.0.4" + relateurl "^0.2.7" + terser "^5.10.0" + +html-tags@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b" + integrity sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g== + +html-tags@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce" + integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ== + +html-webpack-plugin@^5.1.0: + version "5.6.3" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz#a31145f0fee4184d53a794f9513147df1e653685" + integrity sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg== + dependencies: + "@types/html-minifier-terser" "^6.0.0" + html-minifier-terser "^6.0.2" + lodash "^4.17.21" + pretty-error "^4.0.0" + tapable "^2.0.0" + +htmlparser2@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.0.0" + domutils "^2.5.2" + entities "^2.0.0" + +http-cache-semantics@3.8.1: + version "3.8.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" + integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== + +http-deceiver@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" + integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw== + +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== + dependencies: + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" + +http-errors@~1.6.2: + version "1.6.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + +http-parser-js@>=0.5.1: + version "0.5.8" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" + integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== + +http-proxy-middleware@^2.0.3: + version "2.0.7" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6" + integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA== + dependencies: + "@types/http-proxy" "^1.17.8" + http-proxy "^1.18.1" + is-glob "^4.0.1" + is-plain-obj "^3.0.0" + micromatch "^4.0.2" + +http-proxy@^1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== + dependencies: + eventemitter3 "^4.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" + +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +iconv-lite@0.4.24, iconv-lite@^0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +icss-utils@^5.0.0, icss-utils@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +ignore@^5.2.0: + version "5.3.2" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" + integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== + +immutable@^4.0.0: + version "4.3.7" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381" + integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw== + +import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +import-global@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/import-global/-/import-global-0.1.0.tgz#97b38fd444114eec16824a935f8da575b57aa1ce" + integrity sha512-8+hPJLML+m1ym9NSeZXTXFkY5+ml0fYFAzO5yhZiaFQvk9kO0NkE7vd7e7kCVjkTmAxsDPbrWwLQACMwGTDgIg== + dependencies: + global-dirs "^0.1.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== + +ini@^1.3.4, ini@^1.3.5: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +ini@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== + +inquirer@^7.0.3: + version "7.3.3" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" + integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== + dependencies: + ansi-escapes "^4.2.1" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-width "^3.0.0" + external-editor "^3.0.3" + figures "^3.0.0" + lodash "^4.17.19" + mute-stream "0.0.8" + run-async "^2.4.0" + rxjs "^6.6.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + through "^2.3.6" + +inquirer@^8.0.0: + version "8.2.6" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.6.tgz#733b74888195d8d400a67ac332011b5fae5ea562" + integrity sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg== + dependencies: + ansi-escapes "^4.2.1" + chalk "^4.1.1" + cli-cursor "^3.1.0" + cli-width "^3.0.0" + external-editor "^3.0.3" + figures "^3.0.0" + lodash "^4.17.21" + mute-stream "0.0.8" + ora "^5.4.1" + run-async "^2.4.0" + rxjs "^7.5.5" + string-width "^4.1.0" + strip-ansi "^6.0.0" + through "^2.3.6" + wrap-ansi "^6.0.1" + +interpret@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== + +into-stream@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6" + integrity sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ== + dependencies: + from2 "^2.1.1" + p-is-promise "^1.1.0" + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +ipaddr.js@^2.0.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8" + integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA== + +is-accessor-descriptor@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz#3223b10628354644b86260db29b3e693f5ceedd4" + integrity sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA== + dependencies: + hasown "^2.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-ci@^1.0.10: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" + integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== + dependencies: + ci-info "^1.5.0" + +is-core-module@^2.13.0: + version "2.15.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" + integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== + dependencies: + hasown "^2.0.2" + +is-data-descriptor@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz#2109164426166d32ea38c405c1e0945d9e6a4eeb" + integrity sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw== + dependencies: + hasown "^2.0.0" + +is-descriptor@^0.1.0: + version "0.1.7" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.7.tgz#2727eb61fd789dcd5bdf0ed4569f551d2fe3be33" + integrity sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg== + dependencies: + is-accessor-descriptor "^1.0.1" + is-data-descriptor "^1.0.1" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.3.tgz#92d27cb3cd311c4977a4db47df457234a13cb306" + integrity sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw== + dependencies: + is-accessor-descriptor "^1.0.1" + is-data-descriptor "^1.0.1" + +is-docker@^2.0.0, is-docker@^2.1.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== + +is-file-esm@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-file-esm/-/is-file-esm-1.0.0.tgz#987086b0f5a5318179e9d30f4f2f8d37321e1b5f" + integrity sha512-rZlaNKb4Mr8WlRu2A9XdeoKgnO5aA53XdPHgCKVyCrQ/rWi89RET1+bq37Ru46obaQXeiX4vmFIm1vks41hoSA== + dependencies: + read-pkg-up "^7.0.1" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== + +is-natural-number@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" + integrity sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ== + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg== + dependencies: + kind-of "^3.0.2" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-object@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" + integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== + +is-path-inside@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + +is-plain-obj@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== + +is-plain-obj@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== + +is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-promise@^2.1.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" + integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== + +is-retry-allowed@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" + integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== + +is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +is-wsl@^2.1.1, is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== + +isbinaryfile@^4.0.6: + version "4.0.10" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" + integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== + +isurl@^1.0.0-alpha5: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" + integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w== + dependencies: + has-to-string-tag-x "^1.2.0" + is-object "^1.0.1" + +iterall@^1.2.1, iterall@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" + integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== + +jake@^10.8.5: + version "10.9.2" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f" + integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA== + dependencies: + async "^3.2.3" + chalk "^4.0.2" + filelist "^1.0.4" + minimatch "^3.1.2" + +javascript-stringify@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz#27c76539be14d8bd128219a2d731b09337904e79" + integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg== + +jest-worker@^27.0.2, jest-worker@^27.4.5: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest-worker@^28.0.2: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98" + integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +joi@^17.4.0: + version "17.13.3" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec" + integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA== + dependencies: + "@hapi/hoek" "^9.3.0" + "@hapi/topo" "^5.1.0" + "@sideway/address" "^4.1.5" + "@sideway/formula" "^3.0.1" + "@sideway/pinpoint" "^2.0.0" + +js-message@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.7.tgz#fbddd053c7a47021871bb8b2c95397cc17c20e47" + integrity sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA== + +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js-yaml@^4.0.0, js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +jscodeshift@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.11.0.tgz#4f95039408f3f06b0e39bb4d53bc3139f5330e2f" + integrity sha512-SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g== + dependencies: + "@babel/core" "^7.1.6" + "@babel/parser" "^7.1.6" + "@babel/plugin-proposal-class-properties" "^7.1.0" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.1.0" + "@babel/plugin-proposal-optional-chaining" "^7.1.0" + "@babel/plugin-transform-modules-commonjs" "^7.1.0" + "@babel/preset-flow" "^7.0.0" + "@babel/preset-typescript" "^7.1.0" + "@babel/register" "^7.0.0" + babel-core "^7.0.0-bridge.0" + colors "^1.1.2" + flow-parser "0.*" + graceful-fs "^4.2.4" + micromatch "^3.1.10" + neo-async "^2.5.0" + node-dir "^0.1.17" + recast "^0.20.3" + temp "^0.8.1" + write-file-atomic "^2.3.0" + +jsesc@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d" + integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA== + +jsesc@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" + integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== + +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== + +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== + +json-parse-better-errors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== + +json5@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== + dependencies: + minimist "^1.2.0" + +json5@^2.1.2, json5@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +jsonparse@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== + +keyv@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373" + integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA== + dependencies: + json-buffer "3.0.0" + +keyv@^4.5.3: + version "4.5.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== + dependencies: + json-buffer "3.0.1" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw== + dependencies: + is-buffer "^1.1.5" + +kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +klona@^2.0.5: + version "2.0.6" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" + integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== + +launch-editor-middleware@^2.2.1: + version "2.9.1" + resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.9.1.tgz#d1256339d3a21ca00035ba5d7f9bc53ac192f46c" + integrity sha512-4wF6AtPtaIENiZdH/a+3yW8Xni7uxzTEDd1z+gH00hUWBCSmQknFohznMd9BWhLk8MXObeB5ir69GbIr9qFW1w== + dependencies: + launch-editor "^2.9.1" + +launch-editor@^2.2.1, launch-editor@^2.6.0, launch-editor@^2.9.1: + version "2.9.1" + resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.9.1.tgz#253f173bd441e342d4344b4dae58291abb425047" + integrity sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w== + dependencies: + picocolors "^1.0.0" + shell-quote "^1.8.1" + +lazy-cache@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" + integrity sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ== + +leaflet.wms@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/leaflet.wms/-/leaflet.wms-0.2.0.tgz#b467eb24a17efa7909859b46fa726d912e97d2bc" + integrity sha512-mHcRuma69UjNEAf9OQybB9jSdzL7Ypz7NU66GV/aUI8i7ds/81J+FBdFDuv/zpldBqXsTZWZLK0r49UUIPCENQ== + dependencies: + uglify-js "^2.7.3" + +leaflet@^1.9.3: + version "1.9.4" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d" + integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA== + +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +license-checker@^25.0.1: + version "25.0.1" + resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-25.0.1.tgz#4d14504478a5240a857bb3c21cd0491a00d761fa" + integrity sha512-mET5AIwl7MR2IAKYYoVBBpV0OnkKQ1xGj2IMMeEFIs42QAkEVjRtFZGWmQ28WeU7MP779iAgOaOy93Mn44mn6g== + dependencies: + chalk "^2.4.1" + debug "^3.1.0" + mkdirp "^0.5.1" + nopt "^4.0.1" + read-installed "~4.0.3" + semver "^5.5.0" + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + spdx-satisfies "^4.0.0" + treeify "^1.1.0" + +lilconfig@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" + integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== + +lines-and-columns@^1.1.6: + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== + +loader-runner@^4.1.0, loader-runner@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" + integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== + +loader-utils@^1.0.2, loader-utils@^1.1.0: + version "1.4.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" + integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^1.0.1" + +loader-utils@^2.0.0, loader-utils@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" + integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== + +lodash.defaultsdeep@^4.6.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" + integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== + +lodash.kebabcase@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" + integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g== + +lodash.mapvalues@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" + integrity sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ== + +lodash.memoize@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== + +lodash.merge@^4.6.1, lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== + +lodash@4, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-symbols@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" + +log-update@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708" + integrity sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg== + dependencies: + ansi-escapes "^3.0.0" + cli-cursor "^2.0.0" + wrap-ansi "^3.0.1" + +loglevel@^1.6.8: + version "1.9.2" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.2.tgz#c2e028d6c757720107df4e64508530db6621ba08" + integrity sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg== + +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + +longest@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" + integrity sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg== + +lowdb@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lowdb/-/lowdb-1.0.0.tgz#5243be6b22786ccce30e50c9a33eac36b20c8064" + integrity sha512-2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ== + dependencies: + graceful-fs "^4.1.3" + is-promise "^2.1.0" + lodash "4" + pify "^3.0.0" + steno "^0.4.1" + +lower-case@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== + dependencies: + tslib "^2.0.3" + +lowercase-keys@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" + integrity sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A== + +lowercase-keys@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +"lru-cache@7.10.1 - 7.13.1": + version "7.13.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.1.tgz#267a81fbd0881327c46a81c5922606a2cfe336c4" + integrity sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ== + +lru-cache@^4.0.1, lru-cache@^4.1.2: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +magic-string@^0.30.11: + version "0.30.15" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.15.tgz#d5474a2c4c5f35f041349edaba8a5cb02733ed3c" + integrity sha512-zXeaYRgZ6ldS1RJJUrMrYgNJ4fdwnyI6tVqoiIhyCyv5IVTK9BU8Ic2l253GGETQHxI4HNUwhJ3fjDhKqEoaAw== + dependencies: + "@jridgewell/sourcemap-codec" "^1.5.0" + +make-dir@^1.0.0, make-dir@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" + integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== + dependencies: + pify "^3.0.0" + +make-dir@^2.0.0, make-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + +make-dir@^3.0.2, make-dir@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== + +map-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8" + integrity sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ== + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w== + dependencies: + object-visit "^1.0.0" + +mdn-data@2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== + +memfs@^3.4.3: + version "3.6.0" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6" + integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ== + dependencies: + fs-monkey "^1.0.4" + +merge-descriptors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5" + integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ== + +merge-source-map@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" + integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== + dependencies: + source-map "^0.6.1" + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.3.0, merge2@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== + +mgrs@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/mgrs/-/mgrs-1.0.0.tgz#fb91588e78c90025672395cb40b25f7cd6ad1829" + integrity sha512-awNbTOqCxK1DBGjalK3xqWIstBZgN6fxsMSiXLs9/spqWkF2pAhb2rrYCFSsr1/tT7PhcDGjZndG8SWYn0byYA== + +micromatch@^3.1.10: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: + version "4.0.8" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" + integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== + dependencies: + braces "^3.0.3" + picomatch "^2.3.1" + +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +"mime-db@>= 1.43.0 < 2", mime-db@^1.28.0: + version "1.53.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.53.0.tgz#3cb63cd820fc29896d9d4e8c32ab4fcd74ccb447" + integrity sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg== + +mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-response@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +mini-css-extract-plugin@^2.5.3: + version "2.9.2" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz#966031b468917a5446f4c24a80854b2947503c5b" + integrity sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w== + dependencies: + schema-utils "^4.0.0" + tapable "^2.2.1" + +minimalistic-assert@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + +minimatch@^3.0.2, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +minimatch@^5.0.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + +minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + +minipass@^3.1.1: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== + dependencies: + yallist "^4.0.0" + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp@^0.5.1, mkdirp@^0.5.6: + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== + dependencies: + minimist "^1.2.6" + +module-alias@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.3.tgz#ec2e85c68973bda6ab71ce7c93b763ec96053221" + integrity sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q== + +mrmime@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4" + integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw== + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== + +ms@2.1.3, ms@^2.1.1, ms@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +multicast-dns@^7.2.5: + version "7.2.5" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" + integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== + dependencies: + dns-packet "^5.2.2" + thunky "^1.0.2" + +mute-stream@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" + integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== + +mz@^2.4.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + +nanoid@^3.3.7: + version "3.3.8" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf" + integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w== + +nanoid@^3.3.8: + version "3.3.11" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b" + integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w== + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== + +needle@^3.2.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/needle/-/needle-3.3.1.tgz#63f75aec580c2e77e209f3f324e2cdf3d29bd049" + integrity sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q== + dependencies: + iconv-lite "^0.6.3" + sax "^1.2.4" + +negotiator@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +negotiator@~0.6.4: + version "0.6.4" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" + integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== + +neo-async@^2.5.0, neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +no-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" + integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== + dependencies: + lower-case "^2.0.2" + tslib "^2.0.3" + +node-abort-controller@^3.0.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548" + integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ== + +node-dir@^0.1.17: + version "0.1.17" + resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5" + integrity sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg== + dependencies: + minimatch "^3.0.2" + +node-fetch@^2.6.7: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + +node-forge@^1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" + integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== + +node-notifier@^10.0.0: + version "10.0.1" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-10.0.1.tgz#0e82014a15a8456c4cfcdb25858750399ae5f1c7" + integrity sha512-YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ== + dependencies: + growly "^1.3.0" + is-wsl "^2.2.0" + semver "^7.3.5" + shellwords "^0.1.1" + uuid "^8.3.2" + which "^2.0.2" + +node-releases@^2.0.18: + version "2.0.19" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314" + integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw== + +nopt@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== + dependencies: + abbrev "1" + osenv "^0.1.4" + +normalize-package-data@^2.0.0, normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379" + integrity sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA== + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== + +normalize-url@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6" + integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw== + dependencies: + prepend-http "^2.0.0" + query-string "^5.0.1" + sort-keys "^2.0.0" + +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== + +npm-conf@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" + integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== + dependencies: + config-chain "^1.1.11" + pify "^3.0.0" + +npm-normalize-package-bin@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw== + dependencies: + path-key "^2.0.0" + +npm-run-path@^4.0.0, npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +nth-check@^2.0.1, nth-check@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" + integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== + dependencies: + boolbase "^1.0.0" + +null-loader@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/null-loader/-/null-loader-4.0.1.tgz#8e63bd3a2dd3c64236a4679428632edd0a6dbc6a" + integrity sha512-pxqVbi4U6N26lq+LmgIbB5XATP0VdZKOG25DhHi8btMmJJefGArFyDg1yc4U3hWCJbMqSrw0qyrz1UQX+qYXqg== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ== + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-inspect@^1.13.3: + version "1.13.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a" + integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA== + +object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA== + dependencies: + isobject "^3.0.0" + +object.assign@^4.1.0: + version "4.1.5" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" + integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== + dependencies: + call-bind "^1.0.5" + define-properties "^1.2.1" + has-symbols "^1.0.3" + object-keys "^1.1.1" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== + dependencies: + isobject "^3.0.1" + +obuf@^1.0.0, obuf@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== + +on-finished@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== + dependencies: + wrappy "1" + +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ== + dependencies: + mimic-fn "^1.0.0" + +onetime@^5.1.0, onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +open@^8.0.2, open@^8.0.9: + version "8.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" + integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== + dependencies: + define-lazy-prop "^2.0.0" + is-docker "^2.1.1" + is-wsl "^2.2.0" + +opener@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" + integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== + +optionator@^0.9.3: + version "0.9.4" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734" + integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.5" + +ora@^5.3.0, ora@^5.4.1: + version "5.4.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== + dependencies: + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== + +os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== + +osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +p-cancelable@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0" + integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ== + +p-event@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/p-event/-/p-event-2.3.1.tgz#596279ef169ab2c3e0cae88c1cfbb08079993ef6" + integrity sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA== + dependencies: + p-timeout "^2.0.1" + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== + +p-finally@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" + integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== + +p-is-promise@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" + integrity sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg== + +p-limit@^2.0.0, p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== + dependencies: + p-limit "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +p-retry@^4.5.0: + version "4.6.2" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" + integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== + dependencies: + "@types/retry" "0.12.0" + retry "^0.13.1" + +p-timeout@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038" + integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA== + dependencies: + p-finally "^1.0.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +param-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== + dependencies: + dot-case "^3.0.4" + tslib "^2.0.3" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-git-config@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-3.0.0.tgz#4a2de08c7b74a2555efa5ae94d40cd44302a6132" + integrity sha512-wXoQGL1D+2COYWCD35/xbiKma1Z15xvZL8cI25wvxzled58V51SJM04Urt/uznS900iQor7QO04SgdfT/XlbuA== + dependencies: + git-config-path "^2.0.0" + ini "^1.3.5" + +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +parse5-htmlparser2-tree-adapter@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" + integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== + dependencies: + parse5 "^6.0.1" + +parse5@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" + integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== + +parse5@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + +parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +pascal-case@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" + integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== + +path-key@^2.0.0, path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-to-regexp@0.1.12: + version "0.1.12" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7" + integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ== + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +pause-stream@^0.0.11: + version "0.0.11" + resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" + integrity sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A== + dependencies: + through "~2.3" + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== + +picocolors@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" + integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== + +picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0, picocolors@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pid-port@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pid-port/-/pid-port-0.1.1.tgz#2ac86fa8a0e97ef2e7eb9e7e9567cdc1eda78098" + integrity sha512-boqPJtSgZC6KOgXKNPC+/XR3xwVtpOtaLa7JLcdf8jfVe0ZM2TwllBXxxLUO8GQbOLJ4/hEtf2+L1QCKbaoHUg== + dependencies: + execa "^5.0.0" + +pify@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== + +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw== + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== + +pirates@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" + integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== + +pkg-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" + integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== + dependencies: + find-up "^3.0.0" + +pkg-dir@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +pkg-dir@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" + integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== + dependencies: + find-up "^5.0.0" + +portfinder@^1.0.26: + version "1.0.32" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81" + integrity sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg== + dependencies: + async "^2.6.4" + debug "^3.2.7" + mkdirp "^0.5.6" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== + +postcss-calc@^8.2.3: + version "8.2.4" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5" + integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q== + dependencies: + postcss-selector-parser "^6.0.9" + postcss-value-parser "^4.2.0" + +postcss-colormin@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz#86c27c26ed6ba00d96c79e08f3ffb418d1d1988f" + integrity sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ== + dependencies: + browserslist "^4.21.4" + caniuse-api "^3.0.0" + colord "^2.9.1" + postcss-value-parser "^4.2.0" + +postcss-convert-values@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393" + integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA== + dependencies: + browserslist "^4.21.4" + postcss-value-parser "^4.2.0" + +postcss-discard-comments@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696" + integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ== + +postcss-discard-duplicates@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" + integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw== + +postcss-discard-empty@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c" + integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A== + +postcss-discard-overridden@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e" + integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw== + +postcss-loader@^6.1.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef" + integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q== + dependencies: + cosmiconfig "^7.0.0" + klona "^2.0.5" + semver "^7.3.5" + +postcss-merge-longhand@^5.1.7: + version "5.1.7" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz#24a1bdf402d9ef0e70f568f39bdc0344d568fb16" + integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ== + dependencies: + postcss-value-parser "^4.2.0" + stylehacks "^5.1.1" + +postcss-merge-rules@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c" + integrity sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g== + dependencies: + browserslist "^4.21.4" + caniuse-api "^3.0.0" + cssnano-utils "^3.1.0" + postcss-selector-parser "^6.0.5" + +postcss-minify-font-values@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" + integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-minify-gradients@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c" + integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw== + dependencies: + colord "^2.9.1" + cssnano-utils "^3.1.0" + postcss-value-parser "^4.2.0" + +postcss-minify-params@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352" + integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw== + dependencies: + browserslist "^4.21.4" + cssnano-utils "^3.1.0" + postcss-value-parser "^4.2.0" + +postcss-minify-selectors@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6" + integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg== + dependencies: + postcss-selector-parser "^6.0.5" + +postcss-modules-extract-imports@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz#b4497cb85a9c0c4b5aabeb759bb25e8d89f15002" + integrity sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q== + +postcss-modules-local-by-default@^4.0.5: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz#d150f43837831dae25e4085596e84f6f5d6ec368" + integrity sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw== + dependencies: + icss-utils "^5.0.0" + postcss-selector-parser "^7.0.0" + postcss-value-parser "^4.1.0" + +postcss-modules-scope@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz#1bbccddcb398f1d7a511e0a2d1d047718af4078c" + integrity sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA== + dependencies: + postcss-selector-parser "^7.0.0" + +postcss-modules-values@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== + dependencies: + icss-utils "^5.0.0" + +postcss-normalize-charset@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed" + integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg== + +postcss-normalize-display-values@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8" + integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-positions@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92" + integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-repeat-style@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2" + integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-string@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228" + integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-timing-functions@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb" + integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-normalize-unicode@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030" + integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA== + dependencies: + browserslist "^4.21.4" + postcss-value-parser "^4.2.0" + +postcss-normalize-url@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc" + integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew== + dependencies: + normalize-url "^6.0.1" + postcss-value-parser "^4.2.0" + +postcss-normalize-whitespace@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa" + integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-ordered-values@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38" + integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ== + dependencies: + cssnano-utils "^3.1.0" + postcss-value-parser "^4.2.0" + +postcss-reduce-initial@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz#798cd77b3e033eae7105c18c9d371d989e1382d6" + integrity sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg== + dependencies: + browserslist "^4.21.4" + caniuse-api "^3.0.0" + +postcss-reduce-transforms@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9" + integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ== + dependencies: + postcss-value-parser "^4.2.0" + +postcss-selector-parser@^6.0.15, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: + version "6.1.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de" + integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-selector-parser@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz#41bd8b56f177c093ca49435f65731befe25d6b9c" + integrity sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-svgo@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d" + integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA== + dependencies: + postcss-value-parser "^4.2.0" + svgo "^2.7.0" + +postcss-unique-selectors@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6" + integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA== + dependencies: + postcss-selector-parser "^6.0.5" + +postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== + +postcss@^7.0.36: + version "7.0.39" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" + integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== + dependencies: + picocolors "^0.2.1" + source-map "^0.6.1" + +postcss@^8.2.6, postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.33, postcss@^8.4.48: + version "8.4.49" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19" + integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA== + dependencies: + nanoid "^3.3.7" + picocolors "^1.1.1" + source-map-js "^1.2.1" + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== + +"prettier@^1.18.2 || ^2.0.0": + version "2.8.8" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" + integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== + +pretty-error@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" + integrity sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw== + dependencies: + lodash "^4.17.20" + renderkid "^3.0.0" + +prismjs@^1.23.0: + version "1.29.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12" + integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q== + +private@~0.1.5: + version "0.1.8" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" + integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== + +process-exists@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/process-exists/-/process-exists-4.1.0.tgz#4132c516324c1da72d65896851cdbd8bbdf5b9d8" + integrity sha512-BBJoiorUKoP2AuM5q/yKwIfT1YWRHsaxjW+Ayu9erLhqKOfnXzzVVML0XTYoQZuI1YvcWKmc1dh06DEy4+KzfA== + dependencies: + ps-list "^6.3.0" + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +progress-webpack-plugin@^1.0.12: + version "1.0.16" + resolved "https://registry.yarnpkg.com/progress-webpack-plugin/-/progress-webpack-plugin-1.0.16.tgz#278f5c1afd21af783aad72c5ec95241520230fe5" + integrity sha512-sdiHuuKOzELcBANHfrupYo+r99iPRyOnw15qX+rNlVUqXGfjXdH4IgxriKwG1kNJwVswKQHMdj1hYZMcb9jFaA== + dependencies: + chalk "^2.1.0" + figures "^2.0.0" + log-update "^2.3.0" + +proj4@^2.6.2: + version "2.15.0" + resolved "https://registry.yarnpkg.com/proj4/-/proj4-2.15.0.tgz#d77c9956861c8ed516071c4208d576cebe800eb5" + integrity sha512-LqCNEcPdI03BrCHxPLj29vsd5afsm+0sV1H/O3nTDKrv8/LA01ea1z4QADDMjUqxSXWnrmmQDjqFm1J/uZ5RLw== + dependencies: + mgrs "1.0.0" + wkt-parser "^1.4.0" + +proto-list@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== + +proxy-addr@~2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +ps-list@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/ps-list/-/ps-list-6.3.0.tgz#a2b775c2db7d547a28fbaa3a05e4c281771259be" + integrity sha512-qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA== + +ps-list@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/ps-list/-/ps-list-7.2.0.tgz#3d110e1de8249a4b178c9b1cf2a215d1e4e42fc0" + integrity sha512-v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ== + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== + +pump@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8" + integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" + integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== + +qs@6.13.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" + integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== + dependencies: + side-channel "^1.0.6" + +query-string@^5.0.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" + integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw== + dependencies: + decode-uri-component "^0.2.0" + object-assign "^4.1.0" + strict-uri-encode "^1.0.0" + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +range-parser@^1.2.1, range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + +read-installed@~4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067" + integrity sha512-O03wg/IYuV/VtnK2h/KXEt9VIbMUFbk3ERG0Iu4FhLZw0EP0T9znqrYDGn6ncbEsXUFaUjiVAWXHzxwt3lhRPQ== + dependencies: + debuglog "^1.0.1" + read-package-json "^2.0.0" + readdir-scoped-modules "^1.0.0" + semver "2 || 3 || 4 || 5" + slide "~1.1.3" + util-extend "^1.0.1" + optionalDependencies: + graceful-fs "^4.1.2" + +read-package-json@^2.0.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a" + integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA== + dependencies: + glob "^7.1.1" + json-parse-even-better-errors "^2.3.0" + normalize-package-data "^2.0.0" + npm-normalize-package-bin "^1.0.0" + +read-pkg-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + +read-pkg@^5.1.1, read-pkg@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.3.0, readable-stream@^2.3.5: + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.4.0: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdir-scoped-modules@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309" + integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw== + dependencies: + debuglog "^1.0.1" + dezalgo "^1.0.0" + graceful-fs "^4.1.2" + once "^1.3.0" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +recast@0.17.2: + version "0.17.2" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.17.2.tgz#f18f18cf20bf3fad4522621a7f9c2ada37276814" + integrity sha512-YHFvn4rBXl8eIjALjUiOV/AP3xFpyGNGNHDw9mAncAWuIdgnBKjbZQ9+P3VlsKcNaNapRVFlTEX1dvDRlYwyxg== + dependencies: + ast-types "0.12.1" + esprima "~4.0.0" + private "~0.1.5" + source-map "~0.6.1" + +recast@^0.20.3: + version "0.20.5" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.5.tgz#8e2c6c96827a1b339c634dd232957d230553ceae" + integrity sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ== + dependencies: + ast-types "0.14.2" + esprima "~4.0.0" + source-map "~0.6.1" + tslib "^2.0.1" + +rechoir@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw== + dependencies: + resolve "^1.1.6" + +regenerate-unicode-properties@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0" + integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA== + dependencies: + regenerate "^1.4.2" + +regenerate@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== + +regenerator-runtime@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== + +regenerator-transform@^0.15.2: + version "0.15.2" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4" + integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg== + dependencies: + "@babel/runtime" "^7.8.4" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +regexpu-core@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.2.0.tgz#0e5190d79e542bf294955dccabae04d3c7d53826" + integrity sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA== + dependencies: + regenerate "^1.4.2" + regenerate-unicode-properties "^10.2.0" + regjsgen "^0.8.0" + regjsparser "^0.12.0" + unicode-match-property-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.1.0" + +regjsgen@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab" + integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q== + +regjsparser@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.12.0.tgz#0e846df6c6530586429377de56e0475583b088dc" + integrity sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ== + dependencies: + jsesc "~3.0.2" + +relateurl@^0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog== + +renderkid@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a" + integrity sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg== + dependencies: + css-select "^4.1.3" + dom-converter "^0.2.0" + htmlparser2 "^6.1.0" + lodash "^4.17.21" + strip-ansi "^6.0.1" + +repeat-element@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== + +repeat-string@^1.5.2, repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== + +reproject@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/reproject/-/reproject-1.2.7.tgz#75e716896221267a93e47359a71865bbc89259ee" + integrity sha512-x3wGpoHBsXDa1iyZZA3Nn52iTgzfLLPBLvsj1j4v3Kwcy3if5IRgi/s/Ayy/qAIm6BsjCwnuojShpfYG+FBAjA== + dependencies: + concat-stream "^2.0.0" + event-stream "^4.0.0" + geojson-stream "0.1.0" + minimist "^1.2.5" + proj4 "^2.6.2" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== + +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +responselike@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ== + dependencies: + lowercase-keys "^1.0.0" + +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q== + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +retry@0.13.1, retry@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" + integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +right-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" + integrity sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg== + dependencies: + align-text "^0.1.1" + +rimraf@^3.0.0, rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +rimraf@~2.6.2: + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + dependencies: + glob "^7.1.3" + +rss-parser@^3.11.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/rss-parser/-/rss-parser-3.13.0.tgz#f1f83b0a85166b8310ec531da6fbaa53ff0f50f0" + integrity sha512-7jWUBV5yGN3rqMMj7CZufl/291QAhvrrGpDNE4k/02ZchL0npisiYYqULF71jCEKoIiHvK/Q2e6IkDwPziT7+w== + dependencies: + entities "^2.0.3" + xml2js "^0.5.0" + +run-async@^2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +rxjs@^6.6.0: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== + dependencies: + tslib "^1.9.0" + +rxjs@^7.2.0, rxjs@^7.5.5: + version "7.8.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== + dependencies: + tslib "^2.1.0" + +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg== + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sass-loader@^13.2.0: + version "13.3.3" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.3.tgz#60df5e858788cffb1a3215e5b92e9cba61e7e133" + integrity sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA== + dependencies: + neo-async "^2.6.2" + +sass@~1.56.1: + version "1.56.2" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.2.tgz#9433b345ab3872996c82a53a58c014fd244fd095" + integrity sha512-ciEJhnyCRwzlBCB+h5cCPM6ie/6f8HrhZMQOf5vlU60Y1bI1rx5Zb0vlDZvaycHsg/MqFfF1Eq2eokAa32iw8w== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + +sax@>=0.6.0, sax@^1.2.4: + version "1.4.1" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" + integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== + +schema-utils@^2.6.5: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== + dependencies: + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" + +schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" + integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + +schema-utils@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.0.tgz#3b669f04f71ff2dfb5aba7ce2d5a9d79b35622c0" + integrity sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g== + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.9.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.1.0" + +seek-bzip@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" + integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== + dependencies: + commander "^2.8.1" + +select-hose@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" + integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== + +selfsigned@^2.1.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0" + integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q== + dependencies: + "@types/node-forge" "^1.3.0" + node-forge "^1" + +"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0: + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== + +semver@^6.0.0, semver@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + +semver@^7.1.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.5.4, semver@^7.6.3: + version "7.6.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" + integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== + +send@0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8" + integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw== + dependencies: + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "2.0.0" + mime "1.6.0" + ms "2.1.3" + on-finished "2.4.1" + range-parser "~1.2.1" + statuses "2.0.1" + +serialize-javascript@^6.0.0, serialize-javascript@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== + dependencies: + randombytes "^2.1.0" + +serve-index@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" + integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw== + dependencies: + accepts "~1.3.4" + batch "0.6.1" + debug "2.6.9" + escape-html "~1.0.3" + http-errors "~1.6.2" + mime-types "~2.1.17" + parseurl "~1.3.2" + +serve-static@1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" + integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== + dependencies: + encodeurl "~2.0.0" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.19.0" + +set-function-length@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +setprototypeof@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +sha.js@^2.4.11: + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +shell-quote@^1.8.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a" + integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA== + +shelljs@^0.8.3: + version "0.8.5" + resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c" + integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow== + dependencies: + glob "^7.0.0" + interpret "^1.0.0" + rechoir "^0.6.2" + +shellwords@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" + integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== + +shortid@^2.2.15: + version "2.2.17" + resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.17.tgz#ea87297a36b7edd10a57818fbac5be798e0994bb" + integrity sha512-GpbM3gLF1UUXZvQw6MCyulHkWbRseNO4cyBEZresZRorwl1+SLu1ZdqgVtuwqz8mB6RpwPkm541mYSqrKyJSaA== + dependencies: + nanoid "^3.3.8" + +side-channel-list@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad" + integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA== + dependencies: + es-errors "^1.3.0" + object-inspect "^1.13.3" + +side-channel-map@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42" + integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA== + dependencies: + call-bound "^1.0.2" + es-errors "^1.3.0" + get-intrinsic "^1.2.5" + object-inspect "^1.13.3" + +side-channel-weakmap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea" + integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A== + dependencies: + call-bound "^1.0.2" + es-errors "^1.3.0" + get-intrinsic "^1.2.5" + object-inspect "^1.13.3" + side-channel-map "^1.0.1" + +side-channel@^1.0.6: + version "1.1.0" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9" + integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw== + dependencies: + es-errors "^1.3.0" + object-inspect "^1.13.3" + side-channel-list "^1.0.0" + side-channel-map "^1.0.1" + side-channel-weakmap "^1.0.2" + +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + +sirv@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0" + integrity sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ== + dependencies: + "@polka/url" "^1.0.0-next.24" + mrmime "^2.0.0" + totalist "^3.0.0" + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slide@~1.1.3: + version "1.1.6" + resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" + integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw== + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +sockjs@^0.3.24: + version "0.3.24" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" + integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== + dependencies: + faye-websocket "^0.11.3" + uuid "^8.3.2" + websocket-driver "^0.7.4" + +sort-keys-length@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188" + integrity sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw== + dependencies: + sort-keys "^1.0.0" + +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg== + dependencies: + is-plain-obj "^1.0.0" + +sort-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" + integrity sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg== + dependencies: + is-plain-obj "^1.0.0" + +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.0, source-map-js@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-support@^0.5.16, source-map-support@~0.5.20: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-url@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== + +source-map@^0.5.6, source-map@~0.5.1: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +spdx-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7" + integrity sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A== + dependencies: + array-find-index "^1.0.2" + spdx-expression-parse "^3.0.0" + spdx-ranges "^2.0.0" + +spdx-correct@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" + integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66" + integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-expression-validate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz#25c9408e1c63fad94fff5517bb7101ffcd23350b" + integrity sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg== + dependencies: + spdx-expression-parse "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.20" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz#e44ed19ed318dd1e5888f93325cee800f0f51b89" + integrity sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw== + +spdx-ranges@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/spdx-ranges/-/spdx-ranges-2.1.1.tgz#87573927ba51e92b3f4550ab60bfc83dd07bac20" + integrity sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA== + +spdx-satisfies@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-4.0.1.tgz#9a09a68d80f5f1a31cfaebb384b0c6009e4969fe" + integrity sha512-WVzZ/cXAzoNmjCWiEluEA3BjHp5tiUmmhn9MK+X0tBbR9sOqtC6UQwmgCNrAIZvNlMuBUYAaHYfb2oqlF9SwKA== + dependencies: + spdx-compare "^1.0.0" + spdx-expression-parse "^3.0.0" + spdx-ranges "^2.0.0" + +spdy-transport@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== + dependencies: + debug "^4.1.0" + detect-node "^2.0.4" + hpack.js "^2.1.6" + obuf "^1.1.2" + readable-stream "^3.0.6" + wbuf "^1.7.3" + +spdy@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== + dependencies: + debug "^4.1.0" + handle-thing "^2.0.0" + http-deceiver "^1.2.7" + select-hose "^2.0.0" + spdy-transport "^3.0.0" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + +split@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" + integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== + dependencies: + through "2" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== + +ssri@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== + dependencies: + minipass "^3.1.1" + +stable@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" + integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== + +stackframe@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" + integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g== + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +"statuses@>= 1.4.0 < 2": + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== + +steno@^0.4.1: + version "0.4.4" + resolved "https://registry.yarnpkg.com/steno/-/steno-0.4.4.tgz#071105bdfc286e6615c0403c27e9d7b5dcb855cb" + integrity sha512-EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w== + dependencies: + graceful-fs "^4.1.3" + +stream-combiner@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858" + integrity sha512-6yHMqgLYDzQDcAkL+tjJDC5nSNuNIx0vZtRZeiPh7Saef7VHX9H5Ijn9l2VIol2zaNYlYEX6KyuT/237A58qEQ== + dependencies: + duplexer "~0.1.1" + through "~2.3.4" + +strict-uri-encode@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" + integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ== + +string-width@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow== + dependencies: + ansi-regex "^3.0.0" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-dirs@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5" + integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== + dependencies: + is-natural-number "^4.0.1" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q== + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-indent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" + integrity sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA== + +strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +strip-outer@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631" + integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg== + dependencies: + escape-string-regexp "^1.0.2" + +stylehacks@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9" + integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw== + dependencies: + browserslist "^4.21.4" + postcss-selector-parser "^6.0.4" + +subscriptions-transport-ws@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz#baf88f050cba51d52afe781de5e81b3c31f89883" + integrity sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ== + dependencies: + backo2 "^1.0.2" + eventemitter3 "^3.1.0" + iterall "^1.2.1" + symbol-observable "^1.0.4" + ws "^5.2.0 || ^6.0.0 || ^7.0.0" + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA== + +svgo@^2.7.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" + integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== + dependencies: + "@trysound/sax" "0.2.0" + commander "^7.2.0" + css-select "^4.1.3" + css-tree "^1.1.3" + csso "^4.2.0" + picocolors "^1.0.0" + stable "^0.1.8" + +symbol-observable@^1.0.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + +tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== + +tar-stream@^1.5.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" + integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A== + dependencies: + bl "^1.0.0" + buffer-alloc "^1.2.0" + end-of-stream "^1.0.0" + fs-constants "^1.0.0" + readable-stream "^2.3.0" + to-buffer "^1.1.1" + xtend "^4.0.0" + +taskkill@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/taskkill/-/taskkill-3.1.0.tgz#28001339feb23bfae3f447902c4b4abcdd057680" + integrity sha512-5KcOFzPvd1nGFVrmB7H4+QAWVjYOf//+QTbOj0GpXbqtqbKGWVczG+rq6VhXAtdtlKLTs16NAmHRyF5vbggQ2w== + dependencies: + arrify "^2.0.1" + execa "^3.3.0" + +temp@^0.8.1: + version "0.8.4" + resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2" + integrity sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg== + dependencies: + rimraf "~2.6.2" + +terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.3.10: + version "5.3.10" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" + integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== + dependencies: + "@jridgewell/trace-mapping" "^0.3.20" + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.1" + terser "^5.26.0" + +terser@^5.10.0, terser@^5.26.0: + version "5.37.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.37.0.tgz#38aa66d1cfc43d0638fab54e43ff8a4f72a21ba3" + integrity sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA== + dependencies: + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" + commander "^2.20.0" + source-map-support "~0.5.20" + +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== + +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA== + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.1" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== + dependencies: + any-promise "^1.0.0" + +thread-loader@^3.0.0: + version "3.0.4" + resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-3.0.4.tgz#c392e4c0241fbc80430eb680e4886819b504a31b" + integrity sha512-ByaL2TPb+m6yArpqQUZvP+5S1mZtXsEP7nWKKlAUTm7fCml8kB5s1uI3+eHRP2bk5mVYfRSBI7FFf+tWEyLZwA== + dependencies: + json-parse-better-errors "^1.0.2" + loader-runner "^4.1.0" + loader-utils "^2.0.0" + neo-async "^2.6.2" + schema-utils "^3.0.0" + +through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.4: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== + +thunky@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" + integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== + +timed-out@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" + integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== + +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + +to-buffer@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" + integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + +totalist@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8" + integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ== + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + +treeify@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8" + integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A== + +trim-repeated@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21" + integrity sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg== + dependencies: + escape-string-regexp "^1.0.2" + +tslib@^1.9.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0: + version "2.8.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" + integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== + dependencies: + safe-buffer "^5.0.1" + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== + +typescript@~4.5.5: + version "4.5.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" + integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== + +uglify-js@^2.7.3: + version "2.8.29" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" + integrity sha512-qLq/4y2pjcU3vhlhseXGGJ7VbFO4pBANu0kwl8VCa9KEI0V8VfZIx2Fy3w01iSTA/pGwKZSmu/+I4etLNDdt5w== + dependencies: + source-map "~0.5.1" + yargs "~3.10.0" + optionalDependencies: + uglify-to-browserify "~1.0.0" + +uglify-to-browserify@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" + integrity sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q== + +unbzip2-stream@^1.0.9: + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== + dependencies: + buffer "^5.2.1" + through "^2.3.8" + +undici-types@~6.20.0: + version "6.20.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" + integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== + +unicode-canonical-property-names-ecmascript@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz#cb3173fe47ca743e228216e4a3ddc4c84d628cc2" + integrity sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg== + +unicode-match-property-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== + dependencies: + unicode-canonical-property-names-ecmascript "^2.0.0" + unicode-property-aliases-ecmascript "^2.0.0" + +unicode-match-property-value-ecmascript@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz#a0401aee72714598f739b68b104e4fe3a0cb3c71" + integrity sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg== + +unicode-property-aliases-ecmascript@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd" + integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w== + +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + +universalify@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" + integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +update-browserslist-db@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== + dependencies: + escalade "^3.2.0" + picocolors "^1.1.0" + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== + +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== + dependencies: + prepend-http "^2.0.0" + +url-to-options@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" + integrity sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A== + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + +util-extend@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" + integrity sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA== + +utila@~0.4: + version "0.4.0" + resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" + integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA== + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== + +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + +uuid@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" + integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +validate-npm-package-name@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e" + integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw== + dependencies: + builtins "^1.0.3" + +value-or-promise@1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" + integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg== + +value-or-promise@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c" + integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q== + +vary@^1, vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== + +vue-cli-plugin-vuetify@~2.5.8: + version "2.5.8" + resolved "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.5.8.tgz#a67ef81375fb2cd9f4f912e665e5190de105f2f6" + integrity sha512-uqi0/URJETJBbWlQHD1l0pnY7JN8Ytu+AL1fw50HFlGByPa8/xx+mq19GkFXA9FcwFT01IqEc/TkxMPugchomg== + dependencies: + null-loader "^4.0.1" + semver "^7.1.2" + shelljs "^0.8.3" + +vue-codemod@^0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/vue-codemod/-/vue-codemod-0.0.5.tgz#679b3a7f5b053feba1abde907fd70f961a398470" + integrity sha512-DE+24W1d3oanGqq7yna4ddOKXmVzjECgku2ddMcm7OS9Bp9QOblMHT88PzKiCc7npGiHf5+mTfrEW1JVIBbA2A== + dependencies: + "@babel/core" "^7.10.3" + "@babel/preset-env" "^7.10.3" + "@babel/types" "^7.12.12" + "@types/jscodeshift" "^0.7.1" + "@vue/compiler-core" "^3.0.5" + "@vue/compiler-dom" "^3.0.5" + debug "^4.1.1" + globby "^11.0.2" + inquirer "^7.0.3" + jscodeshift "^0.11.0" + lru-cache "^6.0.0" + source-map "^0.6.1" + yargs "^16.2.0" + +vue-eslint-parser@^9.4.3: + version "9.4.3" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz#9b04b22c71401f1e8bca9be7c3e3416a4bde76a8" + integrity sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg== + dependencies: + debug "^4.3.4" + eslint-scope "^7.1.1" + eslint-visitor-keys "^3.3.0" + espree "^9.3.1" + esquery "^1.4.0" + lodash "^4.17.21" + semver "^7.3.6" + +vue-hot-reload-api@^2.3.0: + version "2.3.4" + resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" + integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== + +vue-loader@^17.0.0: + version "17.4.2" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-17.4.2.tgz#f87f0d8adfcbbe8623de9eba1979d41ba223c6da" + integrity sha512-yTKOA4R/VN4jqjw4y5HrynFL8AK0Z3/Jt7eOJXEitsm0GMRHDBjCfCiuTiLP7OESvsZYo2pATCWhDqxC5ZrM6w== + dependencies: + chalk "^4.1.0" + hash-sum "^2.0.0" + watchpack "^2.4.0" + +vue-router@^3.6.5: + version "3.6.5" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.6.5.tgz#95847d52b9a7e3f1361cb605c8e6441f202afad8" + integrity sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ== + +vue-style-loader@^4.1.0, vue-style-loader@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35" + integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg== + dependencies: + hash-sum "^1.0.2" + loader-utils "^1.0.2" + +vue-template-compiler@^2.7.16: + version "2.7.16" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz#c81b2d47753264c77ac03b9966a46637482bb03b" + integrity sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ== + dependencies: + de-indent "^1.0.2" + he "^1.2.0" + +vue-template-es2015-compiler@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" + integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== + +vue2-leaflet@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257" + integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ== + +vue@^2.6.14: + version "2.7.16" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.16.tgz#98c60de9def99c0e3da8dae59b304ead43b967c9" + integrity sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw== + dependencies: + "@vue/compiler-sfc" "2.7.16" + csstype "^3.1.0" + +vuetify-loader@^1.9.2: + version "1.9.2" + resolved "https://registry.yarnpkg.com/vuetify-loader/-/vuetify-loader-1.9.2.tgz#adcadac71c6d9b24bde42a5b81dfda1871f73f81" + integrity sha512-8PP2w7aAs/rjA+Izec6qY7sHVb75MNrGQrDOTZJ5IEnvl+NiFhVpU2iWdRDZ3eMS842cWxSWStvkr+KJJKy+Iw== + dependencies: + acorn "^8.4.1" + acorn-walk "^8.2.0" + decache "^4.6.0" + file-loader "^6.2.0" + loader-utils "^2.0.0" + +vuetify@^2.6.12: + version "2.7.2" + resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.7.2.tgz#b2b687e519257d789a63b87c418f98099f38990f" + integrity sha512-qr04ww7uzAPQbpk751x4fSdjsJ+zREzjQ/rBlcQGuWS6MIMFMXcXcwvp4+/tnGsULZxPMWfQ0kmZmg5Yc/XzgQ== + +vuex@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71" + integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw== + +watchpack@^2.4.0, watchpack@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da" + integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + +wbuf@^1.1.0, wbuf@^1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" + integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== + dependencies: + minimalistic-assert "^1.0.0" + +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg== + dependencies: + defaults "^1.0.3" + +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== + +webpack-bundle-analyzer@^4.4.0: + version "4.10.2" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd" + integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw== + dependencies: + "@discoveryjs/json-ext" "0.5.7" + acorn "^8.0.4" + acorn-walk "^8.0.0" + commander "^7.2.0" + debounce "^1.2.1" + escape-string-regexp "^4.0.0" + gzip-size "^6.0.0" + html-escaper "^2.0.2" + opener "^1.5.2" + picocolors "^1.0.0" + sirv "^2.0.3" + ws "^7.3.1" + +webpack-chain@^6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-6.5.1.tgz#4f27284cbbb637e3c8fbdef43eef588d4d861206" + integrity sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA== + dependencies: + deepmerge "^1.5.2" + javascript-stringify "^2.0.1" + +webpack-dev-middleware@^5.3.4: + version "5.3.4" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517" + integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q== + dependencies: + colorette "^2.0.10" + memfs "^3.4.3" + mime-types "^2.1.31" + range-parser "^1.2.1" + schema-utils "^4.0.0" + +webpack-dev-server@^4.7.3: + version "4.15.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz#9e0c70a42a012560860adb186986da1248333173" + integrity sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g== + dependencies: + "@types/bonjour" "^3.5.9" + "@types/connect-history-api-fallback" "^1.3.5" + "@types/express" "^4.17.13" + "@types/serve-index" "^1.9.1" + "@types/serve-static" "^1.13.10" + "@types/sockjs" "^0.3.33" + "@types/ws" "^8.5.5" + ansi-html-community "^0.0.8" + bonjour-service "^1.0.11" + chokidar "^3.5.3" + colorette "^2.0.10" + compression "^1.7.4" + connect-history-api-fallback "^2.0.0" + default-gateway "^6.0.3" + express "^4.17.3" + graceful-fs "^4.2.6" + html-entities "^2.3.2" + http-proxy-middleware "^2.0.3" + ipaddr.js "^2.0.1" + launch-editor "^2.6.0" + open "^8.0.9" + p-retry "^4.5.0" + rimraf "^3.0.2" + schema-utils "^4.0.0" + selfsigned "^2.1.1" + serve-index "^1.9.1" + sockjs "^0.3.24" + spdy "^4.0.2" + webpack-dev-middleware "^5.3.4" + ws "^8.13.0" + +webpack-license-plugin@^4.2.2: + version "4.5.0" + resolved "https://registry.yarnpkg.com/webpack-license-plugin/-/webpack-license-plugin-4.5.0.tgz#31aba8f00d0ac6659da5949e3b33af048cf7be9e" + integrity sha512-qtxmKEtbW8evdZE0kkB9Kcy1o0Y6g08e3/HXrsopRwM/eHPKb8aAqrZWFDkDlV/jwPSYfp1eWu+Ek2ju812NYQ== + dependencies: + chalk "^5.3.0" + lodash "^4.17.21" + needle "^3.2.0" + spdx-expression-validate "^2.0.0" + webpack-sources "^3.2.3" + +webpack-merge@^5.7.3: + version "5.10.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" + integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA== + dependencies: + clone-deep "^4.0.1" + flat "^5.0.2" + wildcard "^2.0.0" + +webpack-sources@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" + integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== + +webpack-virtual-modules@^0.4.2: + version "0.4.6" + resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz#3e4008230731f1db078d9cb6f68baf8571182b45" + integrity sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA== + +webpack@^5.54.0: + version "5.97.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.97.1.tgz#972a8320a438b56ff0f1d94ade9e82eac155fa58" + integrity sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg== + dependencies: + "@types/eslint-scope" "^3.7.7" + "@types/estree" "^1.0.6" + "@webassemblyjs/ast" "^1.14.1" + "@webassemblyjs/wasm-edit" "^1.14.1" + "@webassemblyjs/wasm-parser" "^1.14.1" + acorn "^8.14.0" + browserslist "^4.24.0" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.17.1" + es-module-lexer "^1.2.1" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.11" + json-parse-even-better-errors "^2.3.1" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.2.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.3.10" + watchpack "^2.4.1" + webpack-sources "^3.2.3" + +websocket-driver@>=0.5.1, websocket-driver@^0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== + dependencies: + http-parser-js ">=0.5.1" + safe-buffer ">=5.1.0" + websocket-extensions ">=0.1.1" + +websocket-extensions@>=0.1.1: + version "0.1.4" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== + +whatwg-fetch@^3.6.2: + version "3.6.20" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz#580ce6d791facec91d37c72890995a0b48d31c70" + integrity sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg== + +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1, which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +widest-line@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== + dependencies: + string-width "^4.0.0" + +wildcard@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" + integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== + +window-size@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" + integrity sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg== + +wkt-parser@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.4.0.tgz#7cca07a6ee5b4baf059b723e62d7fe95bc923bf5" + integrity sha512-qpwO7Ihds/YYDTi1aADFTI1Sm9YC/tTe3SHD24EeIlZxy7Ik6a1b4HOz7jAi0xdUAw487duqpo8OGu+Tf4nwlQ== + +word-wrap@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + +wordwrap@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" + integrity sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q== + +wrap-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" + integrity sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ== + dependencies: + string-width "^2.1.1" + strip-ansi "^4.0.0" + +wrap-ansi@^6.0.1: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== + +write-file-atomic@^2.3.0: + version "2.4.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481" + integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ== + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + signal-exit "^3.0.2" + +"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.3.1: + version "7.5.10" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9" + integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ== + +ws@^8.13.0: + version "8.18.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" + integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== + +xml-name-validator@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" + integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== + +xml2js@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" + integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== + +xss@^1.0.8: + version "1.0.15" + resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.15.tgz#96a0e13886f0661063028b410ed1b18670f4e59a" + integrity sha512-FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg== + dependencies: + commander "^2.20.3" + cssfilter "0.0.10" + +xtend@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== + +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml-front-matter@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/yaml-front-matter/-/yaml-front-matter-4.1.1.tgz#66eaa9a998fc3dd723708c73aa8e06e79cac91c9" + integrity sha512-ULGbghCLsN8Hs8vfExlqrJIe8Hl2TUjD7/zsIGMP8U+dgRXEsDXk4yydxeZJgdGiimP1XB7zhmhOB4/HyfqOyQ== + dependencies: + commander "^6.2.0" + js-yaml "^3.14.1" + +yaml@^1.10.0, yaml@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs@^16.0.0, yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yargs@~3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" + integrity sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A== + dependencies: + camelcase "^1.0.2" + cliui "^2.1.0" + decamelize "^1.0.0" + window-size "0.1.0" + +yauzl@^2.4.2: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + +yorkie@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yorkie/-/yorkie-2.0.0.tgz#92411912d435214e12c51c2ae1093e54b6bb83d9" + integrity sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw== + dependencies: + execa "^0.8.0" + is-ci "^1.0.10" + normalize-path "^1.0.0" + strip-indent "^2.0.0" diff --git a/qgis-mime.xml b/qgis-mime.xml deleted file mode 100644 index 8d2e214..0000000 --- a/qgis-mime.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - - QGIS Project - QGIS-Projekt - - - - - - - - - - - - - QGIS Project - QGIS-Projekt - - - - - - - - - - - - - QGIS layer settings - QGIS-Layereinstellungen - - - - - - - - - - - - QGIS layer definition - QGIS-Layerdefinition - - - - - - - - - - - - QGIS composer template - QGIS-Druckzusammenstellungsvorlage - - - - - - - - - - - - ESRI shape file - ESRI-Shapedatei - - - - - - - - - - - - - - - - - - - - - - ESRI coordinate reference system - ESRI-Koordinatenreferenzsystem - - - - - - - - - - - AIG raster data - AIG-Rasterdaten - - - - - - ECW raster data - ECW-Rasterdaten - - - - - - MrSID raster data - MrSID-Rasterdaten - - - - - - MapInfo file - MapInfo-Datei - - - - - - - - - - - - - - - Adobe FrameMaker MIF file - - - - - - - - Keyhole Markup Language data - - - - - - - Zipped Keyhole Markup Language data - - - - - - - GeoPackage data - - - - - - diff --git a/qgis.spec b/qgis.spec index 155327d..c6d5071 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.42.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -14,18 +14,17 @@ Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 # ./prepare_vendor.sh Source1: %{name}-%{version}-vendor.tar.xz Source2: %{name}-%{version}-vendor-licenses.txt +Source3: %{name}-%{version}-yarn.lock # Sample configuration files for QGIS server -Source3: %{name}-server-httpd.conf -Source4: %{name}-server-README.fedora -# MIME definitions -# Based on debian/qgis.xml but excluding already defined or proprietary types -#TODO: Path; Still necessary? -Source5: %{name}-mime.xml +Source4: %{name}-server-httpd.conf +Source5: %{name}-server-README.fedora # Fix QGIS Server prefix calculation Patch0: %{name}-serverprefix.patch # Pass --offline to yarn, plus replace deprecated md4 with sha256 in webpack sources Patch1: %{name}-yarn-offline.patch +# Applied by prepare_vendor.sh +# CVE-2024-55565.prebundle.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -156,9 +155,11 @@ Please refer to %{name}-server-README.fedora for details! # %%{name}-%%{version}-vendor-licenses.txt cp -a %{SOURCE2} . +# %%{name}-%%{version}-yarn.lock +cp -a %{SOURCE3} resources/server/src/landingpage/yarn.lock # Readme file for QGIS server configuration and Lighttpd example -install -pm0644 %{SOURCE4} . +install -pm0644 %{SOURCE5} . gzip ChangeLog @@ -212,7 +213,7 @@ install -pm0644 images/icons/%{name}-mime-icon.png %{buildroot}%{_datadir}/pixma # Install basic QGIS Mapserver configuration for Apache install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d -install -pm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-server.conf +install -pm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-server.conf # Remove install instructions rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* @@ -302,6 +303,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Mar 23 2025 Sandro Mani - 3.42.1-2 +- Fix CVE-2024-55565 + * Fri Mar 21 2025 Sandro Mani - 3.42.1-1 - Update to 3.42.1 diff --git a/sources b/sources index 84faffc..d2941fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (qgis-3.42.1.tar.bz2) = 7e0db8a958a7ea5510557d8c23743fe09f9d885d26728d011987898bf2e318e77f00b4ba672d885a66af5cf4270100ab5b00d151da04ef288d55cadf34f7b6b1 -SHA512 (qgis-3.42.1-vendor.tar.xz) = 991e96ba98dbbd021b9a572e701f89a959cdcb2371c47334ea526b43a5fc96e7135ea1fdd7adf30c3087ee1605ddcc93f31dd4540d4c38ccbbd564a7d3cfc947 +SHA512 (qgis-3.42.1-vendor.tar.xz) = 76c2c7a79e5bfc602e9c7f778ad532a99b905d4abce6ee9d73cb5ea7fc1db134dc26eb28f3e99d6896252db3f3a16f758f9d804d68615e66e35f31403ae6772f From a6bcea5b1bf9500cd99e820c422689444b219080 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 18 Apr 2025 14:39:23 +0200 Subject: [PATCH 180/201] Update to 3.42.2 --- .gitignore | 2 ++ ...vendor-licenses.txt => qgis-3.42.2-vendor-licenses.txt | 2 +- qgis-3.42.1-yarn.lock => qgis-3.42.2-yarn.lock | 0 qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 7 files changed, 17 insertions(+), 12 deletions(-) rename qgis-3.42.1-vendor-licenses.txt => qgis-3.42.2-vendor-licenses.txt (97%) rename qgis-3.42.1-yarn.lock => qgis-3.42.2-yarn.lock (100%) diff --git a/.gitignore b/.gitignore index 089990b..10edbb3 100644 --- a/.gitignore +++ b/.gitignore @@ -146,3 +146,5 @@ qgis_1.5.0.tar.gz /qgis-3.42.0.tar.bz2 /qgis-3.42.1.tar.bz2 /qgis-3.42.1-vendor.tar.xz +/qgis-3.42.2.tar.bz2 +/qgis-3.42.2-vendor.tar.xz diff --git a/qgis-3.42.1-vendor-licenses.txt b/qgis-3.42.2-vendor-licenses.txt similarity index 97% rename from qgis-3.42.1-vendor-licenses.txt rename to qgis-3.42.2-vendor-licenses.txt index 62bc787..c08c2b7 100644 --- a/qgis-3.42.1-vendor-licenses.txt +++ b/qgis-3.42.2-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.55s. +Done in 2.47s. diff --git a/qgis-3.42.1-yarn.lock b/qgis-3.42.2-yarn.lock similarity index 100% rename from qgis-3.42.1-yarn.lock rename to qgis-3.42.2-yarn.lock diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index c1420a3..2f42783 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.42.1/src/core/qgsapplication.cpp qgis-3.42.1-new/src/core/qgsapplication.cpp ---- qgis-3.42.1/src/core/qgsapplication.cpp 2025-03-21 13:35:59.000000000 +0100 -+++ qgis-3.42.1-new/src/core/qgsapplication.cpp 2025-03-21 23:10:42.424261211 +0100 -@@ -366,6 +366,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.42.2/src/core/qgsapplication.cpp qgis-3.42.2-new/src/core/qgsapplication.cpp +--- qgis-3.42.2/src/core/qgsapplication.cpp 2025-04-18 14:00:50.000000000 +0200 ++++ qgis-3.42.2-new/src/core/qgsapplication.cpp 2025-04-18 14:14:46.348226204 +0200 +@@ -368,6 +368,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index e502206..12f678a 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.42.1/resources/CMakeLists.txt qgis-3.42.1-new/resources/CMakeLists.txt ---- qgis-3.42.1/resources/CMakeLists.txt 2025-03-21 13:35:59.000000000 +0100 -+++ qgis-3.42.1-new/resources/CMakeLists.txt 2025-03-21 23:10:45.380292073 +0100 +diff -rupN --no-dereference qgis-3.42.2/resources/CMakeLists.txt qgis-3.42.2-new/resources/CMakeLists.txt +--- qgis-3.42.2/resources/CMakeLists.txt 2025-04-18 14:00:50.000000000 +0200 ++++ qgis-3.42.2-new/resources/CMakeLists.txt 2025-04-18 14:14:48.551958017 +0200 @@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake diff --git a/qgis.spec b/qgis.spec index c6d5071..58f9af5 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.42.1 -Release: 2%{?dist} +Version: 3.42.2 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -303,6 +303,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Apr 18 2025 Sandro Mani - 3.42.2-1 +- Update to 3.42.2 + * Sun Mar 23 2025 Sandro Mani - 3.42.1-2 - Fix CVE-2024-55565 diff --git a/sources b/sources index d2941fe..f35855f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.42.1.tar.bz2) = 7e0db8a958a7ea5510557d8c23743fe09f9d885d26728d011987898bf2e318e77f00b4ba672d885a66af5cf4270100ab5b00d151da04ef288d55cadf34f7b6b1 -SHA512 (qgis-3.42.1-vendor.tar.xz) = 76c2c7a79e5bfc602e9c7f778ad532a99b905d4abce6ee9d73cb5ea7fc1db134dc26eb28f3e99d6896252db3f3a16f758f9d804d68615e66e35f31403ae6772f +SHA512 (qgis-3.42.2.tar.bz2) = 66c976064f383cbcb61bf385255f4e7705c047ff083a4ee123e4806110a7036f1ba6605dab6b927871607bf4cf2e5bd23e6f9fa01c48ef3bb881e4e0355d7d97 +SHA512 (qgis-3.42.2-vendor.tar.xz) = ecc7ab68c1d3f16d080756cf06f6378a6a74ae8f209793db36f4238e09e1e574f5776a2addf818e248b778291cb913721d27b2525580471bdead22439507e3d7 From feeb5864b092a45922ea43ea7c4a3064e0db32c8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 16 May 2025 19:44:53 +0200 Subject: [PATCH 181/201] Update to 3.42.3 --- .gitignore | 2 ++ ...2-vendor-licenses.txt => qgis-3.42.3-vendor-licenses.txt | 2 +- qgis-3.42.2-yarn.lock => qgis-3.42.3-yarn.lock | 0 qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 7 files changed, 15 insertions(+), 10 deletions(-) rename qgis-3.42.2-vendor-licenses.txt => qgis-3.42.3-vendor-licenses.txt (97%) rename qgis-3.42.2-yarn.lock => qgis-3.42.3-yarn.lock (100%) diff --git a/.gitignore b/.gitignore index 10edbb3..3494f37 100644 --- a/.gitignore +++ b/.gitignore @@ -148,3 +148,5 @@ qgis_1.5.0.tar.gz /qgis-3.42.1-vendor.tar.xz /qgis-3.42.2.tar.bz2 /qgis-3.42.2-vendor.tar.xz +/qgis-3.42.3.tar.bz2 +/qgis-3.42.3-vendor.tar.xz diff --git a/qgis-3.42.2-vendor-licenses.txt b/qgis-3.42.3-vendor-licenses.txt similarity index 97% rename from qgis-3.42.2-vendor-licenses.txt rename to qgis-3.42.3-vendor-licenses.txt index c08c2b7..725e204 100644 --- a/qgis-3.42.2-vendor-licenses.txt +++ b/qgis-3.42.3-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.47s. +Done in 3.38s. diff --git a/qgis-3.42.2-yarn.lock b/qgis-3.42.3-yarn.lock similarity index 100% rename from qgis-3.42.2-yarn.lock rename to qgis-3.42.3-yarn.lock diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 2f42783..4abc971 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.42.2/src/core/qgsapplication.cpp qgis-3.42.2-new/src/core/qgsapplication.cpp ---- qgis-3.42.2/src/core/qgsapplication.cpp 2025-04-18 14:00:50.000000000 +0200 -+++ qgis-3.42.2-new/src/core/qgsapplication.cpp 2025-04-18 14:14:46.348226204 +0200 +diff -rupN --no-dereference qgis-3.42.3/src/core/qgsapplication.cpp qgis-3.42.3-new/src/core/qgsapplication.cpp +--- qgis-3.42.3/src/core/qgsapplication.cpp 2025-05-16 14:06:30.000000000 +0200 ++++ qgis-3.42.3-new/src/core/qgsapplication.cpp 2025-05-16 19:19:57.453444562 +0200 @@ -368,6 +368,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 12f678a..11a6651 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.42.2/resources/CMakeLists.txt qgis-3.42.2-new/resources/CMakeLists.txt ---- qgis-3.42.2/resources/CMakeLists.txt 2025-04-18 14:00:50.000000000 +0200 -+++ qgis-3.42.2-new/resources/CMakeLists.txt 2025-04-18 14:14:48.551958017 +0200 +diff -rupN --no-dereference qgis-3.42.3/resources/CMakeLists.txt qgis-3.42.3-new/resources/CMakeLists.txt +--- qgis-3.42.3/resources/CMakeLists.txt 2025-05-16 14:06:30.000000000 +0200 ++++ qgis-3.42.3-new/resources/CMakeLists.txt 2025-05-16 19:20:00.160989202 +0200 @@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake diff --git a/qgis.spec b/qgis.spec index 58f9af5..27bd67b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.42.2 +Version: 3.42.3 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -303,6 +303,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri May 16 2025 Sandro Mani - 3.42.3-1 +- Update to 3.42.3 + * Fri Apr 18 2025 Sandro Mani - 3.42.2-1 - Update to 3.42.2 diff --git a/sources b/sources index f35855f..ee5d572 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.42.2.tar.bz2) = 66c976064f383cbcb61bf385255f4e7705c047ff083a4ee123e4806110a7036f1ba6605dab6b927871607bf4cf2e5bd23e6f9fa01c48ef3bb881e4e0355d7d97 -SHA512 (qgis-3.42.2-vendor.tar.xz) = ecc7ab68c1d3f16d080756cf06f6378a6a74ae8f209793db36f4238e09e1e574f5776a2addf818e248b778291cb913721d27b2525580471bdead22439507e3d7 +SHA512 (qgis-3.42.3.tar.bz2) = d1f027d78f807f032b11035ddef40f31c18a7ee74771775a4898f4dbc1aa4cda55d9df1f547fa06c2740532194f71bdf4c8f8bf8415ee7fe74c68d09802a64af +SHA512 (qgis-3.42.3-vendor.tar.xz) = 73446c8993bd8d732961363f4e2b115a1714fcce367adeb95085b361af703ce89a69a2b12869e73a3480734bc59de00144665ab181317911f8b9c0f9f9c4f7de From fc1b0ba3de46917ed7ec08c9416b6d4a4c568d7d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 30 May 2025 16:28:56 +0200 Subject: [PATCH 182/201] Fix incorrectly installed mime definitions --- qgis.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index 27bd67b..bef658f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.42.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -204,7 +204,7 @@ desktop-file-edit \ # Install MIME type definitions install -d %{buildroot}%{_datadir}/mime/packages -install -pm0644 %{SOURCE5} %{buildroot}%{_datadir}/mime/packages/%{name}.xml +install -pm0644 rpm/sources/qgis-mime.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml install -pd %{buildroot}%{_datadir}/pixmaps install -pm0644 images/icons/%{name}-icon-512x512.png %{buildroot}%{_datadir}/pixmaps/%{name}.png @@ -303,6 +303,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri May 30 2025 Sandro Mani - 3.42.3-2 +- Fix incorrectly installed mime definitions + * Fri May 16 2025 Sandro Mani - 3.42.3-1 - Update to 3.42.3 From 7e429d8916e60931549002f1ea9df494a540fc07 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 16:43:25 +0200 Subject: [PATCH 183/201] Rebuilt for Python 3.14 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index bef658f..50d73ec 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.42.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -303,6 +303,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Jun 03 2025 Python Maint - 3.42.3-3 +- Rebuilt for Python 3.14 + * Fri May 30 2025 Sandro Mani - 3.42.3-2 - Fix incorrectly installed mime definitions From 06686fdd732f73f726b45df2ca5cb745f1ac60ed Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 20 Jun 2025 16:59:46 +0200 Subject: [PATCH 184/201] Update to 3.44.0 --- .gitignore | 2 ++ ...icenses.txt => qgis-3.44.0-vendor-licenses.txt | 2 +- qgis-3.42.3-yarn.lock => qgis-3.44.0-yarn.lock | 0 qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 15 ++++++++++----- sources | 4 ++-- 7 files changed, 22 insertions(+), 15 deletions(-) rename qgis-3.42.3-vendor-licenses.txt => qgis-3.44.0-vendor-licenses.txt (97%) rename qgis-3.42.3-yarn.lock => qgis-3.44.0-yarn.lock (100%) diff --git a/.gitignore b/.gitignore index 3494f37..248098e 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,5 @@ qgis_1.5.0.tar.gz /qgis-3.42.2-vendor.tar.xz /qgis-3.42.3.tar.bz2 /qgis-3.42.3-vendor.tar.xz +/qgis-3.44.0.tar.bz2 +/qgis-3.44.0-vendor.tar.xz diff --git a/qgis-3.42.3-vendor-licenses.txt b/qgis-3.44.0-vendor-licenses.txt similarity index 97% rename from qgis-3.42.3-vendor-licenses.txt rename to qgis-3.44.0-vendor-licenses.txt index 725e204..1712870 100644 --- a/qgis-3.42.3-vendor-licenses.txt +++ b/qgis-3.44.0-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 3.38s. +Done in 4.58s. diff --git a/qgis-3.42.3-yarn.lock b/qgis-3.44.0-yarn.lock similarity index 100% rename from qgis-3.42.3-yarn.lock rename to qgis-3.44.0-yarn.lock diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 4abc971..3263515 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.42.3/src/core/qgsapplication.cpp qgis-3.42.3-new/src/core/qgsapplication.cpp ---- qgis-3.42.3/src/core/qgsapplication.cpp 2025-05-16 14:06:30.000000000 +0200 -+++ qgis-3.42.3-new/src/core/qgsapplication.cpp 2025-05-16 19:19:57.453444562 +0200 -@@ -368,6 +368,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.44.0/src/core/qgsapplication.cpp qgis-3.44.0-new/src/core/qgsapplication.cpp +--- qgis-3.44.0/src/core/qgsapplication.cpp 2025-06-20 14:08:50.000000000 +0200 ++++ qgis-3.44.0-new/src/core/qgsapplication.cpp 2025-06-20 15:51:29.919542060 +0200 +@@ -373,6 +373,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 11a6651..d8aaa0c 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.42.3/resources/CMakeLists.txt qgis-3.42.3-new/resources/CMakeLists.txt ---- qgis-3.42.3/resources/CMakeLists.txt 2025-05-16 14:06:30.000000000 +0200 -+++ qgis-3.42.3-new/resources/CMakeLists.txt 2025-05-16 19:20:00.160989202 +0200 +diff -rupN --no-dereference qgis-3.44.0/resources/CMakeLists.txt qgis-3.44.0-new/resources/CMakeLists.txt +--- qgis-3.44.0/resources/CMakeLists.txt 2025-06-20 14:08:50.000000000 +0200 ++++ qgis-3.44.0-new/resources/CMakeLists.txt 2025-06-20 15:51:32.239941070 +0200 @@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake diff --git a/qgis.spec b/qgis.spec index 50d73ec..995c9c7 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.42.3 -Release: 3%{?dist} +Version: 3.44.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -23,6 +23,7 @@ Source5: %{name}-server-README.fedora Patch0: %{name}-serverprefix.patch # Pass --offline to yarn, plus replace deprecated md4 with sha256 in webpack sources Patch1: %{name}-yarn-offline.patch + # Applied by prepare_vendor.sh # CVE-2024-55565.prebundle.patch @@ -39,8 +40,9 @@ BuildRequires: geos-devel BuildRequires: grass-devel BuildRequires: gsl-devel BuildRequires: laszip-devel -BuildRequires: libspatialite-devel BuildRequires: libdxfrw-devel +BuildRequires: libpq-devel +BuildRequires: libspatialite-devel BuildRequires: libxml2-devel BuildRequires: libzip-devel BuildRequires: ninja-build @@ -51,7 +53,6 @@ BuildRequires: opencl-headers BuildRequires: PDAL BuildRequires: PDAL-devel BuildRequires: poly2tri-devel -BuildRequires: postgresql-devel BuildRequires: proj-devel BuildRequires: protobuf-lite-devel BuildRequires: python3-devel @@ -174,10 +175,11 @@ sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 -D QGIS_MANUAL_SUBDIR=/share/man \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ -D WITH_BINDINGS:BOOL=TRUE \ + -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \ -D WITH_GRASS8:BOOL=TRUE \ -D GRASS_PREFIX8=`pkg-config --variable=prefix grass` \ -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \ - -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \ + -D BUILD_TESTING:BOOL=FALSE \ -D ENABLE_TESTS:BOOL=FALSE \ -D WITH_EPT:BOOL=TRUE \ -D WITH_PDAL:BOOL=TRUE \ @@ -303,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jun 20 2025 Sandro Mani - 3.44.0-1 +- Update to 3.44.0 + * Tue Jun 03 2025 Python Maint - 3.42.3-3 - Rebuilt for Python 3.14 diff --git a/sources b/sources index ee5d572..aff5afe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.42.3.tar.bz2) = d1f027d78f807f032b11035ddef40f31c18a7ee74771775a4898f4dbc1aa4cda55d9df1f547fa06c2740532194f71bdf4c8f8bf8415ee7fe74c68d09802a64af -SHA512 (qgis-3.42.3-vendor.tar.xz) = 73446c8993bd8d732961363f4e2b115a1714fcce367adeb95085b361af703ce89a69a2b12869e73a3480734bc59de00144665ab181317911f8b9c0f9f9c4f7de +SHA512 (qgis-3.44.0.tar.bz2) = 2ff1d79117f79194d6ac351d2ef2d60313192ba1cdda28ea252ceb3bcc2dd05c09c8aa9ccca1497b0bdaffa8db1592d1021c2e766d2c40a9fc8307556ff8d8ce +SHA512 (qgis-3.44.0-vendor.tar.xz) = c7ea5a9fa5db0c1b8a51554230233a18e81cc4fc3ee88a819c116d8c1d3b5634b1a263d257ecfe278f0952d81d3d27faaf11554cae672048af0b017810ff932d From c8b8759cb28bc86390ed402c9dc9200e882f181b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 20 Jul 2025 19:59:46 +0200 Subject: [PATCH 185/201] Update to 3.44.1 --- .gitignore | 2 ++ ...0-vendor-licenses.txt => qgis-3.44.1-vendor-licenses.txt | 2 +- qgis-3.44.0-yarn.lock => qgis-3.44.1-yarn.lock | 0 qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 7 files changed, 15 insertions(+), 10 deletions(-) rename qgis-3.44.0-vendor-licenses.txt => qgis-3.44.1-vendor-licenses.txt (97%) rename qgis-3.44.0-yarn.lock => qgis-3.44.1-yarn.lock (100%) diff --git a/.gitignore b/.gitignore index 248098e..68e528a 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,5 @@ qgis_1.5.0.tar.gz /qgis-3.42.3-vendor.tar.xz /qgis-3.44.0.tar.bz2 /qgis-3.44.0-vendor.tar.xz +/qgis-3.44.1.tar.bz2 +/qgis-3.44.1-vendor.tar.xz diff --git a/qgis-3.44.0-vendor-licenses.txt b/qgis-3.44.1-vendor-licenses.txt similarity index 97% rename from qgis-3.44.0-vendor-licenses.txt rename to qgis-3.44.1-vendor-licenses.txt index 1712870..a543c69 100644 --- a/qgis-3.44.0-vendor-licenses.txt +++ b/qgis-3.44.1-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 4.58s. +Done in 2.86s. diff --git a/qgis-3.44.0-yarn.lock b/qgis-3.44.1-yarn.lock similarity index 100% rename from qgis-3.44.0-yarn.lock rename to qgis-3.44.1-yarn.lock diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 3263515..d87b61c 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.44.0/src/core/qgsapplication.cpp qgis-3.44.0-new/src/core/qgsapplication.cpp ---- qgis-3.44.0/src/core/qgsapplication.cpp 2025-06-20 14:08:50.000000000 +0200 -+++ qgis-3.44.0-new/src/core/qgsapplication.cpp 2025-06-20 15:51:29.919542060 +0200 +diff -rupN --no-dereference qgis-3.44.1/src/core/qgsapplication.cpp qgis-3.44.1-new/src/core/qgsapplication.cpp +--- qgis-3.44.1/src/core/qgsapplication.cpp 2025-07-18 14:02:25.000000000 +0200 ++++ qgis-3.44.1-new/src/core/qgsapplication.cpp 2025-07-20 19:21:23.531702214 +0200 @@ -373,6 +373,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index d8aaa0c..4c21229 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.44.0/resources/CMakeLists.txt qgis-3.44.0-new/resources/CMakeLists.txt ---- qgis-3.44.0/resources/CMakeLists.txt 2025-06-20 14:08:50.000000000 +0200 -+++ qgis-3.44.0-new/resources/CMakeLists.txt 2025-06-20 15:51:32.239941070 +0200 +diff -rupN --no-dereference qgis-3.44.1/resources/CMakeLists.txt qgis-3.44.1-new/resources/CMakeLists.txt +--- qgis-3.44.1/resources/CMakeLists.txt 2025-07-18 14:02:25.000000000 +0200 ++++ qgis-3.44.1-new/resources/CMakeLists.txt 2025-07-20 19:21:26.127857408 +0200 @@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake diff --git a/qgis.spec b/qgis.spec index 995c9c7..4f53bdd 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.44.0 +Version: 3.44.1 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Jul 20 2025 Sandro Mani - 3.44.1-1 +- Update to 3.44.1 + * Fri Jun 20 2025 Sandro Mani - 3.44.0-1 - Update to 3.44.0 diff --git a/sources b/sources index aff5afe..b86bbc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.44.0.tar.bz2) = 2ff1d79117f79194d6ac351d2ef2d60313192ba1cdda28ea252ceb3bcc2dd05c09c8aa9ccca1497b0bdaffa8db1592d1021c2e766d2c40a9fc8307556ff8d8ce -SHA512 (qgis-3.44.0-vendor.tar.xz) = c7ea5a9fa5db0c1b8a51554230233a18e81cc4fc3ee88a819c116d8c1d3b5634b1a263d257ecfe278f0952d81d3d27faaf11554cae672048af0b017810ff932d +SHA512 (qgis-3.44.1.tar.bz2) = 2eba0a23a75b397aef182adb15f9b0cec0acb4a5207c55a75a05ba810dd1102c4101c7fe80a23391bd848899951926a29496b146b4e081268047837dbb49e166 +SHA512 (qgis-3.44.1-vendor.tar.xz) = 345b2a2bbe4fbdd52a576dbc2fe1c0880c064969c88f86268c780f18c8bb0705c0a6892ebf8d99aad0382580d0ad274e664e123235366b775bf25d706ed32fdf From 84aa831fad46f64adc7bb5c4c1e1dbcb0404547f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 11:24:17 +0000 Subject: [PATCH 186/201] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 4f53bdd..16fde34 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.44.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.44.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jul 20 2025 Sandro Mani - 3.44.1-1 - Update to 3.44.1 From e24d10aa380991c918a7c1c6902eb4e48230bcd1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 30 Jul 2025 11:09:42 +0200 Subject: [PATCH 187/201] Rebuild (GDAL) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 16fde34..8d0fdb3 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.44.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Wed Jul 30 2025 Sandro Mani - 3.44.1-3 +- Rebuild (GDAL) + * Fri Jul 25 2025 Fedora Release Engineering - 3.44.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 88bf1bdfe6a0b498482f7a715a9db4838df35e44 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 3 Aug 2025 21:17:11 +0200 Subject: [PATCH 188/201] Rebuild (PDAL) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 8d0fdb3..4686761 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.44.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Aug 03 2025 Sandro Mani - 3.44.1-4 +- Rebuild (PDAL) + * Wed Jul 30 2025 Sandro Mani - 3.44.1-3 - Rebuild (GDAL) From 0d659ae9c14076c58408352e6e074b0266953138 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 4 Aug 2025 00:15:27 +0200 Subject: [PATCH 189/201] Rebuild (PDAL) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 4686761..06a2e01 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.44.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Aug 03 2025 Sandro Mani - 3.44.1-5 +- Rebuild (PDAL) + * Sun Aug 03 2025 Sandro Mani - 3.44.1-4 - Rebuild (PDAL) From eccf6da9ee02120a1dcc83800fcd58a262834f8c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:14:44 +0200 Subject: [PATCH 190/201] Rebuilt for Python 3.14.0rc2 bytecode --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 06a2e01..db1500a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.44.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Aug 15 2025 Python Maint - 3.44.1-6 +- Rebuilt for Python 3.14.0rc2 bytecode + * Sun Aug 03 2025 Sandro Mani - 3.44.1-5 - Rebuild (PDAL) From d6d73acf96eba466d6615a68fc8d11ac4b8b902e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 15 Aug 2025 15:36:13 +0200 Subject: [PATCH 191/201] Update to 3.44.2 --- .gitignore | 2 ++ ...-vendor-licenses.txt => qgis-3.44.2-vendor-licenses.txt | 2 +- qgis-3.44.1-yarn.lock => qgis-3.44.2-yarn.lock | 0 qgis.spec | 7 +++++-- sources | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) rename qgis-3.44.1-vendor-licenses.txt => qgis-3.44.2-vendor-licenses.txt (97%) rename qgis-3.44.1-yarn.lock => qgis-3.44.2-yarn.lock (100%) diff --git a/.gitignore b/.gitignore index 68e528a..da051e1 100644 --- a/.gitignore +++ b/.gitignore @@ -154,3 +154,5 @@ qgis_1.5.0.tar.gz /qgis-3.44.0-vendor.tar.xz /qgis-3.44.1.tar.bz2 /qgis-3.44.1-vendor.tar.xz +/qgis-3.44.2-vendor.tar.xz +/qgis-3.44.2.tar.bz2 diff --git a/qgis-3.44.1-vendor-licenses.txt b/qgis-3.44.2-vendor-licenses.txt similarity index 97% rename from qgis-3.44.1-vendor-licenses.txt rename to qgis-3.44.2-vendor-licenses.txt index a543c69..fea0bb2 100644 --- a/qgis-3.44.1-vendor-licenses.txt +++ b/qgis-3.44.2-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.86s. +Done in 2.42s. diff --git a/qgis-3.44.1-yarn.lock b/qgis-3.44.2-yarn.lock similarity index 100% rename from qgis-3.44.1-yarn.lock rename to qgis-3.44.2-yarn.lock diff --git a/qgis.spec b/qgis.spec index db1500a..e7aa62c 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.44.1 -Release: 6%{?dist} +Version: 3.44.2 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Aug 15 2025 Sandro Mani - 3.44.2-1 +- Update to 3.44.2 + * Fri Aug 15 2025 Python Maint - 3.44.1-6 - Rebuilt for Python 3.14.0rc2 bytecode diff --git a/sources b/sources index b86bbc9..a469518 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.44.1.tar.bz2) = 2eba0a23a75b397aef182adb15f9b0cec0acb4a5207c55a75a05ba810dd1102c4101c7fe80a23391bd848899951926a29496b146b4e081268047837dbb49e166 -SHA512 (qgis-3.44.1-vendor.tar.xz) = 345b2a2bbe4fbdd52a576dbc2fe1c0880c064969c88f86268c780f18c8bb0705c0a6892ebf8d99aad0382580d0ad274e664e123235366b775bf25d706ed32fdf +SHA512 (qgis-3.44.2-vendor.tar.xz) = 3dabd21e4f1f52dfc0ec74897e83d7e8d62a56a5d54abcb753bf5a166f7b2138d189e58e50002140fb05644380b4f24c5e877d8692149c2ddc21b30b3e91ea0b +SHA512 (qgis-3.44.2.tar.bz2) = a7c6d299e1201175183acbc355731d7599082331d799f068a7c3a9f8042b29f28846bc1098879b39fe32a1a4930deaa68f14de4bf14c4b588d02c26d81ba5a2b From 999aec683af01cf0593670b8207e8dcb2a03de2a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 08:40:06 -0600 Subject: [PATCH 192/201] Rebuild for netcdf 4.9.3 soname bump --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index e7aa62c..9bddbc3 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.44.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Aug 22 2025 Orion Poplawski - 3.44.2-2 +- Rebuild for netcdf 4.9.3 soname bump + * Fri Aug 15 2025 Sandro Mani - 3.44.2-1 - Update to 3.44.2 From bff4a441a3a488740d75dc6474cbffb0ae7c907d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 12 Sep 2025 15:27:44 +0200 Subject: [PATCH 193/201] Update to 3.44.3 --- .gitignore | 2 ++ ...vendor-licenses.txt => qgis-3.44.3-vendor-licenses.txt | 2 +- qgis-3.44.2-yarn.lock => qgis-3.44.3-yarn.lock | 0 qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 7 files changed, 17 insertions(+), 12 deletions(-) rename qgis-3.44.2-vendor-licenses.txt => qgis-3.44.3-vendor-licenses.txt (97%) rename qgis-3.44.2-yarn.lock => qgis-3.44.3-yarn.lock (100%) diff --git a/.gitignore b/.gitignore index da051e1..de00ead 100644 --- a/.gitignore +++ b/.gitignore @@ -156,3 +156,5 @@ qgis_1.5.0.tar.gz /qgis-3.44.1-vendor.tar.xz /qgis-3.44.2-vendor.tar.xz /qgis-3.44.2.tar.bz2 +/qgis-3.44.3.tar.bz2 +/qgis-3.44.3-vendor.tar.xz diff --git a/qgis-3.44.2-vendor-licenses.txt b/qgis-3.44.3-vendor-licenses.txt similarity index 97% rename from qgis-3.44.2-vendor-licenses.txt rename to qgis-3.44.3-vendor-licenses.txt index fea0bb2..ec0faa7 100644 --- a/qgis-3.44.2-vendor-licenses.txt +++ b/qgis-3.44.3-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.42s. +Done in 2.39s. diff --git a/qgis-3.44.2-yarn.lock b/qgis-3.44.3-yarn.lock similarity index 100% rename from qgis-3.44.2-yarn.lock rename to qgis-3.44.3-yarn.lock diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index d87b61c..e99b856 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.44.1/src/core/qgsapplication.cpp qgis-3.44.1-new/src/core/qgsapplication.cpp ---- qgis-3.44.1/src/core/qgsapplication.cpp 2025-07-18 14:02:25.000000000 +0200 -+++ qgis-3.44.1-new/src/core/qgsapplication.cpp 2025-07-20 19:21:23.531702214 +0200 -@@ -373,6 +373,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.44.3/src/core/qgsapplication.cpp qgis-3.44.3-new/src/core/qgsapplication.cpp +--- qgis-3.44.3/src/core/qgsapplication.cpp 2025-09-12 14:06:44.000000000 +0200 ++++ qgis-3.44.3-new/src/core/qgsapplication.cpp 2025-09-12 15:04:52.998933120 +0200 +@@ -374,6 +374,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 4c21229..f250d0c 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.44.1/resources/CMakeLists.txt qgis-3.44.1-new/resources/CMakeLists.txt ---- qgis-3.44.1/resources/CMakeLists.txt 2025-07-18 14:02:25.000000000 +0200 -+++ qgis-3.44.1-new/resources/CMakeLists.txt 2025-07-20 19:21:26.127857408 +0200 +diff -rupN --no-dereference qgis-3.44.3/resources/CMakeLists.txt qgis-3.44.3-new/resources/CMakeLists.txt +--- qgis-3.44.3/resources/CMakeLists.txt 2025-09-12 14:06:44.000000000 +0200 ++++ qgis-3.44.3-new/resources/CMakeLists.txt 2025-09-12 15:04:55.373785407 +0200 @@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake diff --git a/qgis.spec b/qgis.spec index 9bddbc3..99f7d6a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.44.2 -Release: 2%{?dist} +Version: 3.44.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Sep 12 2025 Sandro Mani - 3.44.3-1 +- Update to 3.44.3 + * Fri Aug 22 2025 Orion Poplawski - 3.44.2-2 - Rebuild for netcdf 4.9.3 soname bump diff --git a/sources b/sources index a469518..c1e56d7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.44.2-vendor.tar.xz) = 3dabd21e4f1f52dfc0ec74897e83d7e8d62a56a5d54abcb753bf5a166f7b2138d189e58e50002140fb05644380b4f24c5e877d8692149c2ddc21b30b3e91ea0b -SHA512 (qgis-3.44.2.tar.bz2) = a7c6d299e1201175183acbc355731d7599082331d799f068a7c3a9f8042b29f28846bc1098879b39fe32a1a4930deaa68f14de4bf14c4b588d02c26d81ba5a2b +SHA512 (qgis-3.44.3.tar.bz2) = f995766fac0aa6db90d58e0a42a8180c31e996dfb0c4087279ee4928bcd2f3d3fd894f83d17719ca8a173f4f82f007baf46ca9de35cbfa48e5bc3a4e178cd5ea +SHA512 (qgis-3.44.3-vendor.tar.xz) = 658183bd51ef3b82bf9efc3866437c45d0c5575d57abff2b99107144141f912a7aca8696d82721fee1d1582d3db2d4a388137f3e5434a050c6bbe99a53ee8531 From 399aaa167222c2ac873d36a8166b0d7d6d15d545 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:51:59 +0200 Subject: [PATCH 194/201] Rebuilt for Python 3.14.0rc3 bytecode --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 99f7d6a..b209a4a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.44.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Sep 19 2025 Python Maint - 3.44.3-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Sep 12 2025 Sandro Mani - 3.44.3-1 - Update to 3.44.3 From 6f8e6ba62f91f03ee1e957f97a37802781b736ba Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 27 Oct 2025 11:31:35 +0100 Subject: [PATCH 195/201] Update to 3.44.4 --- .gitignore | 2 ++ ...endor-licenses.txt => qgis-3.44.4-vendor-licenses.txt | 2 +- qgis-3.44.3-yarn.lock => qgis-3.44.4-yarn.lock | 0 qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 9 ++++++--- sources | 4 ++-- 7 files changed, 17 insertions(+), 12 deletions(-) rename qgis-3.44.3-vendor-licenses.txt => qgis-3.44.4-vendor-licenses.txt (97%) rename qgis-3.44.3-yarn.lock => qgis-3.44.4-yarn.lock (100%) diff --git a/.gitignore b/.gitignore index de00ead..1a2b446 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,5 @@ qgis_1.5.0.tar.gz /qgis-3.44.2.tar.bz2 /qgis-3.44.3.tar.bz2 /qgis-3.44.3-vendor.tar.xz +/qgis-3.44.4.tar.bz2 +/qgis-3.44.4-vendor.tar.xz diff --git a/qgis-3.44.3-vendor-licenses.txt b/qgis-3.44.4-vendor-licenses.txt similarity index 97% rename from qgis-3.44.3-vendor-licenses.txt rename to qgis-3.44.4-vendor-licenses.txt index ec0faa7..6147c26 100644 --- a/qgis-3.44.3-vendor-licenses.txt +++ b/qgis-3.44.4-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.39s. +Done in 2.87s. diff --git a/qgis-3.44.3-yarn.lock b/qgis-3.44.4-yarn.lock similarity index 100% rename from qgis-3.44.3-yarn.lock rename to qgis-3.44.4-yarn.lock diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index e99b856..025e96d 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.44.3/src/core/qgsapplication.cpp qgis-3.44.3-new/src/core/qgsapplication.cpp ---- qgis-3.44.3/src/core/qgsapplication.cpp 2025-09-12 14:06:44.000000000 +0200 -+++ qgis-3.44.3-new/src/core/qgsapplication.cpp 2025-09-12 15:04:52.998933120 +0200 +diff -rupN --no-dereference qgis-3.44.4/src/core/qgsapplication.cpp qgis-3.44.4-new/src/core/qgsapplication.cpp +--- qgis-3.44.4/src/core/qgsapplication.cpp 2025-10-24 14:09:21.000000000 +0200 ++++ qgis-3.44.4-new/src/core/qgsapplication.cpp 2025-10-24 14:23:05.937878705 +0200 @@ -374,6 +374,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index f250d0c..70dcbc0 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.44.3/resources/CMakeLists.txt qgis-3.44.3-new/resources/CMakeLists.txt ---- qgis-3.44.3/resources/CMakeLists.txt 2025-09-12 14:06:44.000000000 +0200 -+++ qgis-3.44.3-new/resources/CMakeLists.txt 2025-09-12 15:04:55.373785407 +0200 +diff -rupN --no-dereference qgis-3.44.4/resources/CMakeLists.txt qgis-3.44.4-new/resources/CMakeLists.txt +--- qgis-3.44.4/resources/CMakeLists.txt 2025-10-24 14:09:21.000000000 +0200 ++++ qgis-3.44.4-new/resources/CMakeLists.txt 2025-10-24 14:23:08.382047699 +0200 @@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake diff --git a/qgis.spec b/qgis.spec index b209a4a..fdaba3b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.44.3 -Release: 2%{?dist} +Version: 3.44.4 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -73,7 +73,7 @@ BuildRequires: qt5-qttools-static BuildRequires: qt5-qtwebkit-devel BuildRequires: qtkeychain-qt5-devel BuildRequires: qwt-qt5-devel -BuildRequires: spatialindex-devel +BuildRequires: spatialindex2.0-devel BuildRequires: sqlite-devel BuildRequires: libzstd-devel BuildRequires: yarnpkg @@ -305,6 +305,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Oct 24 2025 Sandro Mani - 3.44.4-1 +- Update to 3.44.4 + * Fri Sep 19 2025 Python Maint - 3.44.3-2 - Rebuilt for Python 3.14.0rc3 bytecode diff --git a/sources b/sources index c1e56d7..fce8fa6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.44.3.tar.bz2) = f995766fac0aa6db90d58e0a42a8180c31e996dfb0c4087279ee4928bcd2f3d3fd894f83d17719ca8a173f4f82f007baf46ca9de35cbfa48e5bc3a4e178cd5ea -SHA512 (qgis-3.44.3-vendor.tar.xz) = 658183bd51ef3b82bf9efc3866437c45d0c5575d57abff2b99107144141f912a7aca8696d82721fee1d1582d3db2d4a388137f3e5434a050c6bbe99a53ee8531 +SHA512 (qgis-3.44.4.tar.bz2) = 2760087dfaecb5d90ee10b09eac9ba27f05d4ef486b5d8802d960d0c8e2d16ea023afcf00c55396d43bdf5f10c0b2ba974fff3662386eff6df98092a0240bfa5 +SHA512 (qgis-3.44.4-vendor.tar.xz) = 159e0e5006cd7145ca555f0c55d8463bf5eae09938fb1d8b5acb7840c521f3887cd526d38c82ee9675941cab92e61e7845845373da8dd09b75217c7259f183b0 From ff59e3c92b3d0223d09a8e6d6ec1bc6b7d802190 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 27 Oct 2025 16:36:55 +0100 Subject: [PATCH 196/201] BR: spatialindex2.0-devel onl for fedora >= 43 --- qgis.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qgis.spec b/qgis.spec index fdaba3b..cad38c8 100644 --- a/qgis.spec +++ b/qgis.spec @@ -73,7 +73,11 @@ BuildRequires: qt5-qttools-static BuildRequires: qt5-qtwebkit-devel BuildRequires: qtkeychain-qt5-devel BuildRequires: qwt-qt5-devel +%if 0%{?fedora} >= 43 BuildRequires: spatialindex2.0-devel +%else +BuildRequires: spatialindex-devel +%endif BuildRequires: sqlite-devel BuildRequires: libzstd-devel BuildRequires: yarnpkg From ebfef0b4c389bbf67e664c8b7df5a0583ed52d17 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 22 Nov 2025 10:50:08 +0100 Subject: [PATCH 197/201] Update to 3.44.5 --- .gitignore | 2 ++ ...vendor-licenses.txt => qgis-3.44.5-vendor-licenses.txt | 2 +- qgis-3.44.4-yarn.lock => qgis-3.44.5-yarn.lock | 0 qgis-serverprefix.patch | 8 ++++---- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 7 files changed, 16 insertions(+), 11 deletions(-) rename qgis-3.44.4-vendor-licenses.txt => qgis-3.44.5-vendor-licenses.txt (97%) rename qgis-3.44.4-yarn.lock => qgis-3.44.5-yarn.lock (100%) diff --git a/.gitignore b/.gitignore index 1a2b446..9006121 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,5 @@ qgis_1.5.0.tar.gz /qgis-3.44.3-vendor.tar.xz /qgis-3.44.4.tar.bz2 /qgis-3.44.4-vendor.tar.xz +/qgis-3.44.5.tar.bz2 +/qgis-3.44.5-vendor.tar.xz diff --git a/qgis-3.44.4-vendor-licenses.txt b/qgis-3.44.5-vendor-licenses.txt similarity index 97% rename from qgis-3.44.4-vendor-licenses.txt rename to qgis-3.44.5-vendor-licenses.txt index 6147c26..3740fb6 100644 --- a/qgis-3.44.4-vendor-licenses.txt +++ b/qgis-3.44.5-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.87s. +Done in 2.45s. diff --git a/qgis-3.44.4-yarn.lock b/qgis-3.44.5-yarn.lock similarity index 100% rename from qgis-3.44.4-yarn.lock rename to qgis-3.44.5-yarn.lock diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 025e96d..ab1c24d 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.44.4/src/core/qgsapplication.cpp qgis-3.44.4-new/src/core/qgsapplication.cpp ---- qgis-3.44.4/src/core/qgsapplication.cpp 2025-10-24 14:09:21.000000000 +0200 -+++ qgis-3.44.4-new/src/core/qgsapplication.cpp 2025-10-24 14:23:05.937878705 +0200 -@@ -374,6 +374,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.44.5/src/core/qgsapplication.cpp qgis-3.44.5-new/src/core/qgsapplication.cpp +--- qgis-3.44.5/src/core/qgsapplication.cpp 2025-11-21 13:01:00.000000000 +0100 ++++ qgis-3.44.5-new/src/core/qgsapplication.cpp 2025-11-22 10:24:22.510104621 +0100 +@@ -387,6 +387,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 70dcbc0..628f646 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.44.4/resources/CMakeLists.txt qgis-3.44.4-new/resources/CMakeLists.txt ---- qgis-3.44.4/resources/CMakeLists.txt 2025-10-24 14:09:21.000000000 +0200 -+++ qgis-3.44.4-new/resources/CMakeLists.txt 2025-10-24 14:23:08.382047699 +0200 +diff -rupN --no-dereference qgis-3.44.5/resources/CMakeLists.txt qgis-3.44.5-new/resources/CMakeLists.txt +--- qgis-3.44.5/resources/CMakeLists.txt 2025-11-21 13:01:00.000000000 +0100 ++++ qgis-3.44.5-new/resources/CMakeLists.txt 2025-11-22 10:24:24.964734670 +0100 @@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake diff --git a/qgis.spec b/qgis.spec index cad38c8..09391ec 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.44.4 +Version: 3.44.5 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -309,6 +309,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Nov 21 2025 Sandro Mani - 3.44.5-1 +- Update to 3.44.5 + * Fri Oct 24 2025 Sandro Mani - 3.44.4-1 - Update to 3.44.4 diff --git a/sources b/sources index fce8fa6..7d0f112 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.44.4.tar.bz2) = 2760087dfaecb5d90ee10b09eac9ba27f05d4ef486b5d8802d960d0c8e2d16ea023afcf00c55396d43bdf5f10c0b2ba974fff3662386eff6df98092a0240bfa5 -SHA512 (qgis-3.44.4-vendor.tar.xz) = 159e0e5006cd7145ca555f0c55d8463bf5eae09938fb1d8b5acb7840c521f3887cd526d38c82ee9675941cab92e61e7845845373da8dd09b75217c7259f183b0 +SHA512 (qgis-3.44.5.tar.bz2) = 5955ef7f3f79571efda149c23d95b4ac320ba38c218fed3493dde0b8e721ce895cdbab6245e300086c22d063cfdc46151381a08ce4dd4f73092cbb156bf8f5d8 +SHA512 (qgis-3.44.5-vendor.tar.xz) = a414a4f3bde94402a2a032cc8e59e6f2b392a646a6cf9f6813d13adf1b8177a96c1897d7e06e9f375773cb722a41187af96ccf21c420b7b66d4bf51dc839754d From af9cd79ebeab1093b021b4e18b809ebfb1a4fa09 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 25 Nov 2025 22:25:27 +0100 Subject: [PATCH 198/201] Rebuild (gdal) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 09391ec..3c9c87b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.44.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -309,6 +309,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Nov 25 2025 Sandro Mani - 3.44.5-2 +- Rebuild (gdal) + * Fri Nov 21 2025 Sandro Mani - 3.44.5-1 - Update to 3.44.5 From f46d46018a39ea4434efe27b711eab979c883430 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 20 Dec 2025 14:36:18 +0100 Subject: [PATCH 199/201] Update to 3.44.6 --- .gitignore | 2 ++ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 7 +++++-- sources | 4 ++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 9006121..468c701 100644 --- a/.gitignore +++ b/.gitignore @@ -162,3 +162,5 @@ qgis_1.5.0.tar.gz /qgis-3.44.4-vendor.tar.xz /qgis-3.44.5.tar.bz2 /qgis-3.44.5-vendor.tar.xz +/qgis-3.44.6.tar.bz2 +/qgis-3.44.6-vendor.tar.xz diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index ab1c24d..936fe1a 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.44.5/src/core/qgsapplication.cpp qgis-3.44.5-new/src/core/qgsapplication.cpp ---- qgis-3.44.5/src/core/qgsapplication.cpp 2025-11-21 13:01:00.000000000 +0100 -+++ qgis-3.44.5-new/src/core/qgsapplication.cpp 2025-11-22 10:24:22.510104621 +0100 +diff -rupN --no-dereference qgis-3.44.6/src/core/qgsapplication.cpp qgis-3.44.6-new/src/core/qgsapplication.cpp +--- qgis-3.44.6/src/core/qgsapplication.cpp 2025-12-19 13:02:37.000000000 +0100 ++++ qgis-3.44.6-new/src/core/qgsapplication.cpp 2025-12-20 13:43:24.341223415 +0100 @@ -387,6 +387,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 628f646..a14cc3e 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.44.5/resources/CMakeLists.txt qgis-3.44.5-new/resources/CMakeLists.txt ---- qgis-3.44.5/resources/CMakeLists.txt 2025-11-21 13:01:00.000000000 +0100 -+++ qgis-3.44.5-new/resources/CMakeLists.txt 2025-11-22 10:24:24.964734670 +0100 +diff -rupN --no-dereference qgis-3.44.6/resources/CMakeLists.txt qgis-3.44.6-new/resources/CMakeLists.txt +--- qgis-3.44.6/resources/CMakeLists.txt 2025-12-19 13:02:37.000000000 +0100 ++++ qgis-3.44.6-new/resources/CMakeLists.txt 2025-12-20 13:43:26.680887755 +0100 @@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake diff --git a/qgis.spec b/qgis.spec index 3c9c87b..b0680dd 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.44.5 -Release: 2%{?dist} +Version: 3.44.6 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -309,6 +309,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sat Dec 20 2025 Sandro Mani - 3.44.6-1 +- Update to 3.44.6 + * Tue Nov 25 2025 Sandro Mani - 3.44.5-2 - Rebuild (gdal) diff --git a/sources b/sources index 7d0f112..e32da7b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.44.5.tar.bz2) = 5955ef7f3f79571efda149c23d95b4ac320ba38c218fed3493dde0b8e721ce895cdbab6245e300086c22d063cfdc46151381a08ce4dd4f73092cbb156bf8f5d8 -SHA512 (qgis-3.44.5-vendor.tar.xz) = a414a4f3bde94402a2a032cc8e59e6f2b392a646a6cf9f6813d13adf1b8177a96c1897d7e06e9f375773cb722a41187af96ccf21c420b7b66d4bf51dc839754d +SHA512 (qgis-3.44.6.tar.bz2) = 7ab868fb214f571b7feac5172a4c60b1bba617df3cf55a6a3167b6ca87737be5fddec94155d3f0ec8ce0ca9efba19ee719d33ee3fba851c9fae6db409bf86f85 +SHA512 (qgis-3.44.6-vendor.tar.xz) = 04f711a21a75e06c2f327cb542b4b50cae8f6f2db5817173ffaf9057d2bd81c596fd067bf8cc4952f9d0bdc04e3b389d7dd3c8d8928c767975dab884f0f1705a From 4e7c56999854e2c5df3fb2bca6a22a2c132f07b2 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 20 Dec 2025 14:47:43 +0100 Subject: [PATCH 200/201] Add missing files --- ....44.5-vendor-licenses.txt => qgis-3.44.6-vendor-licenses.txt | 2 +- qgis-3.44.5-yarn.lock => qgis-3.44.6-yarn.lock | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename qgis-3.44.5-vendor-licenses.txt => qgis-3.44.6-vendor-licenses.txt (97%) rename qgis-3.44.5-yarn.lock => qgis-3.44.6-yarn.lock (100%) diff --git a/qgis-3.44.5-vendor-licenses.txt b/qgis-3.44.6-vendor-licenses.txt similarity index 97% rename from qgis-3.44.5-vendor-licenses.txt rename to qgis-3.44.6-vendor-licenses.txt index 3740fb6..4a4f069 100644 --- a/qgis-3.44.5-vendor-licenses.txt +++ b/qgis-3.44.6-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.45s. +Done in 2.65s. diff --git a/qgis-3.44.5-yarn.lock b/qgis-3.44.6-yarn.lock similarity index 100% rename from qgis-3.44.5-yarn.lock rename to qgis-3.44.6-yarn.lock From 5f09b3c7f098dea4f91f58b816348c951ae219c9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 13 Jan 2026 18:18:21 -0500 Subject: [PATCH 201/201] Drop support for i686 --- qgis.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index b0680dd..7c10ddf 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.44.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -27,6 +27,9 @@ Patch1: %{name}-yarn-offline.patch # Applied by prepare_vendor.sh # CVE-2024-55565.prebundle.patch +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: draco-devel @@ -309,6 +312,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Jan 13 2026 Elliott Sales de Andrade - 3.44.6-2 +- Drop support for i686 + * Sat Dec 20 2025 Sandro Mani - 3.44.6-1 - Update to 3.44.6