qgis3: update to 3.42.0

qgis3-ltr: update to 3.40.4
nilason · Feb 24, 2025 · 01fc31b · 01fc31b
1 parent 39d19ff
commit 01fc31b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 145 deletions.
diff --git a/gis/qgis3/Portfile b/gis/qgis3/Portfile
@@ -25,36 +25,25 @@ subport ${name-ltr} {}
 
 if {${subport} eq ${name}} {
     # Latest version
-    github.setup    qgis QGIS 3_40_3 final-
+    github.setup    qgis QGIS 3_42_0 final-
     github.tarball_from archive
-    revision        1
+    revision        0
     set app_name    QGIS3
 
-    checksums       rmd160  63458d5e7cffca50e3ff71f31ad85f05e551a3f0 \
-                    sha256  5590ab80f78f3311a5d7d72f5543538203151040dd098c695e773f56c8832338 \
-                    size    210945106
-
-    set grass_utils_file grass_utils.py
+    checksums       rmd160  b89f5717b4daceb4a6c31634efc25eebe430187b \
+                    sha256  9b2714bde3f4d72be39e5c253997d894143e294f51b9dfe3c5c2d01cefeb0078 \
+                    size    215467357
 } else {
     # LTR version
-    github.setup    qgis QGIS 3_34_15 final-
+    github.setup    qgis QGIS 3_40_4 final-
     github.tarball_from archive
     revision        0
     set app_name    QGIS3-LTR
     description     {*}${description} (LTR)
 
-    checksums       rmd160  658a73d8056582383f9941f57bb9f49b3e0c52eb \
-                    sha256  d16a05ebd7acfba25fe330552ec3d66227f892525f3159cc5388e121adbeae27 \
-                    size    198080196
-
-    set grass_utils_file Grass7Utils.py
-
-    patchfiles-append patch-configure_PROJ94.diff
-    post-patch {
-        # Fix configure with PROJ 9.4, use CMake default FindSQLite3
-        # works together with patch-configure_PROJ94.diff
-        file delete ${worksrcpath}/cmake/FindSqlite3.cmake
-    }
+    checksums       rmd160  e5118df097cbb31cda0569d968cc700e5e991fb4 \
+                    sha256  e8ac20aaf5d1022d31ca569e10203d86202317897195a42f803fc9b0e6b707f9 \
+                    size    211674268
 }
 
 version             [string map {_ .} ${github.version}]
@@ -208,7 +197,7 @@ variant grass7 conflicts grass description "Build GRASS 7 plugin" {
     }
     post-patch {
         reinplace "s|command = None|command = '${prefix}/bin/grass${grass_version}'|g" \
-            ${worksrcpath}/python/plugins/grassprovider/${grass_utils_file}
+            ${worksrcpath}/python/plugins/grassprovider/grass_utils.py
     }
 }
 
@@ -222,7 +211,7 @@ variant grass conflicts grass7 description "Build GRASS (latest) plugin" {
     }
     post-patch {
         reinplace "s|command = None|command = '${prefix}/bin/grass'|g" \
-            ${worksrcpath}/python/plugins/grassprovider/${grass_utils_file}
+            ${worksrcpath}/python/plugins/grassprovider/grass_utils.py
     }
 }
 

diff --git a/gis/qgis3/files/patch-configure_PROJ94.diff b/gis/qgis3/files/patch-configure_PROJ94.diff