Ship a seperate srs.db file for proj >= 6 builds

It's too dangerous to reuse the existing one, as it breaks the ability to run multiple versions of qgis (i.e. proj < 6 and proj >= 6) on the same machine Fixes #30569
qgis · Jul 15, 2019 · 56d03f7 · 56d03f7
1 parent da8b574
commit 56d03f7
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 0 deletions.
diff --git a/debian/qgis-providers-common.postinst b/debian/qgis-providers-common.postinst
@@ -3,6 +3,7 @@ set -e
 
 if [ "$1" = "configure" ] && [ -x /usr/lib/qgis/crssync ]; then
 	cp /usr/share/qgis/resources/srs-template.db /usr/share/qgis/resources/srs.db
+	cp /usr/share/qgis/resources/srs6-template.db /usr/share/qgis/resources/srs6.db
 	dpkg-trigger qgis-crssync
 fi
 

diff --git a/debian/qgis-providers-common.prerm b/debian/qgis-providers-common.prerm
@@ -4,5 +4,8 @@ set -e
 if [ "$1" = "remove" ] && [ -e /usr/share/qgis/resources/srs.db ]; then
 	rm -f /usr/share/qgis/resources/srs.db || true
 fi
+if [ "$1" = "remove" ] && [ -e /usr/share/qgis/resources/srs6.db ]; then
+	rm -f /usr/share/qgis/resources/srs6.db || true
+fi
 
 #DEBHELPER#
diff --git a/debian/qgis-providers.postinst b/debian/qgis-providers.postinst
@@ -5,6 +5,9 @@ if [ "$1" = "triggered" ] || [ "$1" = "configure" ]; then
 	if [ -w /usr/share/qgis/resources/srs.db ] && [ -x /usr/lib/qgis/crssync ]; then
 		/usr/lib/qgis/crssync
 	fi
+	if [ -w /usr/share/qgis/resources/srs6.db ] && [ -x /usr/lib/qgis/crssync ]; then
+		/usr/lib/qgis/crssync
+	fi
 fi
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
@@ -300,6 +300,7 @@ override_dh_auto_install:
 
 	# Don't ship srs.db, automatically updated in postinst with crssync
 	mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db
+	mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs6.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs6-template.db
 
 	# Mime info
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/mime/packages

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -322,6 +322,7 @@ for %%i in (%packages%) do (
 	"apps/%PACKAGENAME%/resources/qgis.db" ^
 	"apps/%PACKAGENAME%/resources/spatialite.db" ^
 	"apps/%PACKAGENAME%/resources/srs.db" ^
+	"apps/%PACKAGENAME%/resources/srs.db" ^
 	"apps/%PACKAGENAME%/resources/symbology-style.xml" ^
 	"apps/%PACKAGENAME%/resources/cpt-city-qgis-min/" ^
 	"apps/%PACKAGENAME%/svg/" ^

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -1,4 +1,5 @@
 INSTALL(FILES srs.db
+              srs6.db
               qgis.db
               symbology-style.xml
               spatialite.db

diff --git a/resources/srs6.db b/resources/srs6.db
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -955,6 +955,27 @@ QString QgsApplication::iconsPath()
 
 QString QgsApplication::srsDatabaseFilePath()
 {
+#if PROJ_VERSION_MAJOR>=6
+  if ( ABISYM( mRunningFromBuildDir ) )
+  {
+    QString tempCopy = QDir::tempPath() + "/srs6.db";
+
+    if ( !QFile( tempCopy ).exists() )
+    {
+      QFile f( pkgDataPath() + "/resources/srs6.db" );
+      if ( !f.copy( tempCopy ) )
+      {
+        qFatal( "Could not create temporary copy" );
+      }
+    }
+
+    return tempCopy;
+  }
+  else
+  {
+    return pkgDataPath() + QStringLiteral( "/resources/srs6.db" );
+  }
+#else
   if ( ABISYM( mRunningFromBuildDir ) )
   {
     QString tempCopy = QDir::tempPath() + "/srs.db";
@@ -974,6 +995,7 @@ QString QgsApplication::srsDatabaseFilePath()
   {
     return pkgDataPath() + QStringLiteral( "/resources/srs.db" );
   }
+#endif
 }
 
 QStringList QgsApplication::svgPaths()