From 6fd543e78bd0f0283963bc417da501e3c018e02b Mon Sep 17 00:00:00 2001 From: Tobias Schmidt <13055656+schmidtnz@users.noreply.github.com> Date: Thu, 9 Apr 2026 14:18:11 +1200 Subject: [PATCH 1/4] feat: explicitly state lib dir --- modules/Draco.json | 3 +++ modules/exiv2.json | 4 +++- modules/gdal.json | 1 + modules/geographiclib.json | 3 ++- modules/geos.json | 3 +++ modules/libzip.json | 5 ++++- modules/pdal.json | 1 + modules/proj.json | 3 ++- modules/protobuf.json | 3 ++- modules/qca.json | 3 ++- modules/spatialindex.json | 3 ++- modules/spatialite.json | 3 +++ modules/zstd.json | 3 ++- 13 files changed, 30 insertions(+), 8 deletions(-) diff --git a/modules/Draco.json b/modules/Draco.json index cbefe05..9cb78b2 100644 --- a/modules/Draco.json +++ b/modules/Draco.json @@ -1,5 +1,8 @@ { "name": "Draco", + "config-opts": [ + "-DCMAKE_INSTALL_LIBDIR=lib" + ], "buildsystem": "cmake-ninja", "builddir": true, "build-options": { diff --git a/modules/exiv2.json b/modules/exiv2.json index 59e7c5d..3ce0412 100644 --- a/modules/exiv2.json +++ b/modules/exiv2.json @@ -8,7 +8,9 @@ "-DCMAKE_BUILD_TYPE=Release", "-DEXIV2_BUILD_EXIV2_COMMAND=OFF", "-DEXIV2_BUILD_SAMPLES=OFF", - "-DEXIV2_ENABLE_INIH=OFF" + "-DEXIV2_ENABLE_INIH=OFF", + "-DCMAKE_INSTALL_LIBDIR=lib" + ], "sources": [ { diff --git a/modules/gdal.json b/modules/gdal.json index ea30ac1..264bff2 100644 --- a/modules/gdal.json +++ b/modules/gdal.json @@ -2,6 +2,7 @@ "name": "gdal", "buildsystem": "cmake-ninja", "config-opts": [ + "-DCMAKE_INSTALL_LIBDIR=lib", "-DGDAL_USE_EXPAT=ON", "-DENABLE_IPO=ON", "-DBUILD_PYTHON_BINDINGS=ON", diff --git a/modules/geographiclib.json b/modules/geographiclib.json index b413942..e4578af 100644 --- a/modules/geographiclib.json +++ b/modules/geographiclib.json @@ -2,7 +2,8 @@ "name": "geographiclib", "buildsystem": "cmake-ninja", "config-opts": [ - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=Release", + "-DCMAKE_INSTALL_LIBDIR=lib" ], "sources": [ { diff --git a/modules/geos.json b/modules/geos.json index 0f3111a..69ac85f 100644 --- a/modules/geos.json +++ b/modules/geos.json @@ -1,6 +1,9 @@ { "name": "geos", "buildsystem": "cmake-ninja", + "config-opts": [ + "-DCMAKE_INSTALL_LIBDIR=lib" + ], "sources": [ { "type": "archive", diff --git a/modules/libzip.json b/modules/libzip.json index 871b6ac..1c31881 100644 --- a/modules/libzip.json +++ b/modules/libzip.json @@ -1,6 +1,9 @@ { "name": "libzip", - "buildsystem": "cmake-ninja", + "config-opts": [ + "-DCMAKE_INSTALL_LIBDIR=lib" + ], + "buildsystem": "cmake-ninja", "cleanup": [ "/bin", "/include", diff --git a/modules/pdal.json b/modules/pdal.json index 7e75590..755d50d 100644 --- a/modules/pdal.json +++ b/modules/pdal.json @@ -3,6 +3,7 @@ "config-opts": [ "-DCMAKE_BUILD_TYPE=Release", "-DWITH_BACKTRACE=OFF", + "-DCMAKE_INSTALL_LIBDIR=lib", "-DWITH_TESTS=OFF" ], "buildsystem": "cmake-ninja", diff --git a/modules/proj.json b/modules/proj.json index 87c9bb9..882dcf2 100644 --- a/modules/proj.json +++ b/modules/proj.json @@ -2,7 +2,8 @@ "name": "proj", "buildsystem": "cmake-ninja", "config-opts": [ - "-DBUILD_TESTING=OFF" + "-DBUILD_TESTING=OFF", + "-DCMAKE_INSTALL_LIBDIR=lib" ], "sources": [ { diff --git a/modules/protobuf.json b/modules/protobuf.json index 4acb208..49fc7f9 100644 --- a/modules/protobuf.json +++ b/modules/protobuf.json @@ -5,7 +5,8 @@ "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", "-Dprotobuf_ABSL_PROVIDER=package", "-Dprotobuf_BUILD_SHARED_LIBS=ON", - "-Dprotobuf_BUILD_TESTS=OFF" + "-Dprotobuf_BUILD_TESTS=OFF", + "-DCMAKE_INSTALL_LIBDIR=lib" ], "cleanup": [ "/bin/protoc*", diff --git a/modules/qca.json b/modules/qca.json index a363ee2..af62440 100644 --- a/modules/qca.json +++ b/modules/qca.json @@ -3,7 +3,8 @@ "buildsystem": "cmake-ninja", "config-opts": [ "-DBUILD_TESTS=OFF", - "-DBUILD_WITH_QT6=ON" + "-DBUILD_WITH_QT6=ON", + "-DCMAKE_INSTALL_LIBDIR=lib" ], "sources": [ { diff --git a/modules/spatialindex.json b/modules/spatialindex.json index 8e229a4..8931399 100644 --- a/modules/spatialindex.json +++ b/modules/spatialindex.json @@ -2,7 +2,8 @@ "name": "spatialindex", "buildsystem": "cmake-ninja", "config-opts": [ - "-DBUILD_TESTING=OFF" + "-DBUILD_TESTING=OFF", + "-DCMAKE_INSTALL_LIBDIR=lib" ], "sources": [ { diff --git a/modules/spatialite.json b/modules/spatialite.json index 4e29a76..49d884e 100644 --- a/modules/spatialite.json +++ b/modules/spatialite.json @@ -52,6 +52,9 @@ }, { "name": "rttopo", + "config-opts": [ + "--with-geosconfig=/app/bin/geos-config" + ], "sources": [ { "type": "git", diff --git a/modules/zstd.json b/modules/zstd.json index 3217212..a4724dc 100644 --- a/modules/zstd.json +++ b/modules/zstd.json @@ -2,7 +2,8 @@ "name": "zstd", "buildsystem": "cmake-ninja", "config-opts": [ - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=Release", + "-DCMAKE_INSTALL_LIBDIR=lib" ], "subdir": "build/cmake", "sources": [ From 735f7533e1351b96726ba678e7169417f2249d6a Mon Sep 17 00:00:00 2001 From: Tobias Schmidt <13055656+schmidtnz@users.noreply.github.com> Date: Thu, 9 Apr 2026 14:19:18 +1200 Subject: [PATCH 2/4] feat: update icon --- files/nz.govt.linz.qgis.svg | 4 ++-- nz.govt.linz.qgis.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/nz.govt.linz.qgis.svg b/files/nz.govt.linz.qgis.svg index a82a3be..08058af 100644 --- a/files/nz.govt.linz.qgis.svg +++ b/files/nz.govt.linz.qgis.svg @@ -241,7 +241,7 @@ inkscape:deskcolor="#d1d1d1" showgrid="false" inkscape:zoom="2.8007812" - inkscape:cx="83.548117" + inkscape:cx="83.548119" inkscape:cy="127.82148" inkscape:window-width="2560" inkscape:window-height="1300" @@ -275,7 +275,7 @@ transform="translate(90.955478,95.821478)"> Date: Thu, 9 Apr 2026 14:20:07 +1200 Subject: [PATCH 3/4] chore: ignore temp flatpak folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ee3bed5..f497923 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build/ repo/ app/ linz/ +.flatpak-state/ From 5f9c3f4555fcd87864ebeb914e501d4eab35e6b9 Mon Sep 17 00:00:00 2001 From: Tobias Schmidt <13055656+schmidtnz@users.noreply.github.com> Date: Thu, 9 Apr 2026 14:30:38 +1200 Subject: [PATCH 4/4] feat: set dcmake libdir on qgis --- nz.govt.linz.qgis.json | 1 + 1 file changed, 1 insertion(+) diff --git a/nz.govt.linz.qgis.json b/nz.govt.linz.qgis.json index caa5d1c..e54849f 100644 --- a/nz.govt.linz.qgis.json +++ b/nz.govt.linz.qgis.json @@ -74,6 +74,7 @@ } ], "config-opts": [ + "-DCMAKE_INSTALL_LIBDIR=lib", "-DBUILD_WITH_QT6=TRUE", "-DENABLE_TESTS=FALSE", "-DWITH_3D=FALSE",