Merge 73be9c4a5a into be6b017534

Signed-off-by: Michael Keller <github@ike.ch>

.github/workflows/mac.yml

@@ -15,7 +15,7 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-12
+    runs-on: macOS-13
     steps:
     - name: checkout sources
       uses: actions/checkout@v4

.github/workflows/windows.yml

@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: docker://subsurface/mxe-build:3.3.0
+      image: docker://subsurface/mxe-build:3.4.0
 
     steps:
     - name: checkout sources

packaging/windows/docker-build.sh

@@ -34,7 +34,7 @@ if [[ -z "${CONTAINER_ID}" ]]; then
 		croak "Please make sure GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL are set for the first run of this script."
 	fi
 
-	docker create -v ${SUBSURFACE_ROOT}:${CONTAINER_SUBSURFACE_DIR} --name=${CONTAINER_NAME} subsurface/mxe-build:3.3.0 sleep infinity
+	docker create -v ${SUBSURFACE_ROOT}:${CONTAINER_SUBSURFACE_DIR} --name=${CONTAINER_NAME} subsurface/mxe-build:3.4.0 sleep infinity
 fi
 
 # Start the container

scripts/get-dep-lib.sh

@@ -15,9 +15,10 @@ CURRENT_LIBXML2="v2.9.4"
 CURRENT_LIBFTDI="abd19b721f7e9b4d514ed319ece173ebc7b1ea72"
 CURRENT_KIRIGAMI="v5.76.0"
 CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02"
+CURRENT_GOOGLEMAPS="master"
 CURRENT_MDBTOOLS="v1.0.0"
-CURRENT_QT_ANDROID_CMAKE="master"
-CURRENT_LIBMTP="master"
+CURRENT_QT_ANDROID_CMAKE="fa363d60e389afbcd56c31ab4dd9723708b79fbe"
+CURRENT_LIBMTP="d578ba117e4a6f4de666e22c4ea380c2c0befea1"
 
 # Checkout library from git
 # Ensure specified version is checked out,
@@ -169,7 +170,7 @@ for package in "${PACKAGES[@]}" ; do
 			git_checkout_library breeze-icons $CURRENT_BREEZE_ICONS https://github.com/kde/breeze-icons.git
 			;;
 		googlemaps)
-			git_checkout_library googlemaps master https://github.com/Subsurface/googlemaps.git
+			git_checkout_library googlemaps $CURRENT_GOOGLEMAPS https://github.com/Subsurface/googlemaps.git
 			;;
 		hidapi)
 			git_checkout_library hidapi master https://github.com/libusb/hidapi.git