From f7613e7827ebfd546511f75cb9022284cb315fcd Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:39:29 +0100 Subject: [PATCH 1/9] Rebuilt for removed libstdc++ symbol (#1937698) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 09bb2a2..043307f 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 +* Tue Mar 30 2021 Jonathan Wakely - 3.18.0-2 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Fri Feb 19 2021 Sandro Mani - 3.18.0-1 - Update to 3.18.0 From 101dafd58f8f21c40a1c85b90d180b43c4d15ad8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 8 Mar 2021 13:30:11 +0100 Subject: [PATCH 2/9] 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 043307f..1aeed66 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 dd4132e55b423e12cf86963f1277638f76328fc6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 8 Mar 2021 19:28:56 +0100 Subject: [PATCH 3/9] 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 2c109a95d8144b40d4860b7ebd3164dbea95e610 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 24 Mar 2021 01:00:31 +0100 Subject: [PATCH 4/9] 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 1aeed66..5c70b01 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 + * Tue Mar 30 2021 Jonathan Wakely - 3.18.0-2 - Rebuilt for removed libstdc++ symbol (#1937698) 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 07e94685a414687e7533ba91871daa644f3ee6fa Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 24 Mar 2021 09:37:18 +0100 Subject: [PATCH 5/9] BR: libxml2-devel --- qgis.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qgis.spec b/qgis.spec index 5c70b01..3648b44 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 c98321069c92c7082dcebd47742619b42d96ea83 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 24 Mar 2021 10:07:38 +0100 Subject: [PATCH 6/9] 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 3648b44..b1f4e95 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 d56c88303c10f2b0ee34cd5584cfacb0fecbd4ee Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 31 Mar 2021 17:37:34 +0100 Subject: [PATCH 7/9] 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 b1f4e95..cfca2bf 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 5cea18a5cf676026cdabf64ce2a2994b68120412 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 17 Apr 2021 10:20:17 +0200 Subject: [PATCH 8/9] 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 cfca2bf..a1b2a70 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 5a540951b9335e2de1f5a4f01ae853e51aa66a56 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 16 May 2021 10:13:44 +0200 Subject: [PATCH 9/9] Update to 3.18.3 --- .gitignore | 1 + qgis.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 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.spec b/qgis.spec index a1b2a70..ccca2ee 100644 --- a/qgis.spec +++ b/qgis.spec @@ -7,7 +7,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.18.2 +Version: 3.18.3 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -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 + * Sat Apr 17 2021 Sandro Mani - 3.18.2-1 - Update to 3.18.2 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