Merge branch 'develop' into 'master'

Merge develop into master

See merge request Scientific-IT-Systems/gr!781

.gitlab-ci.yml

@@ -3,8 +3,8 @@ stages:
 - build
 - test
 - package
+- sync
 - deploy
-- deploy-to-aur
 
 tag-type-check:
   stage: prebuild
@@ -923,7 +923,7 @@ darwin-self-contained:
   - export MACOSX_DEPLOYMENT_TARGET=10.11
   - sudo mkdir /usr/local/gr
   - sudo chown administrator:wheel /usr/local/gr
-  - make self GRDIR=/usr/local/gr QMAKE=/usr/local/qt5/bin/qmake QT5_QMAKE=/usr/local/qt5/bin/qmake
+  - make self GRDIR=/usr/local/gr QMAKE=/usr/local/qt5/bin/qmake QT5_QMAKE=/usr/local/qt5/bin/qmake QT6_QMAKE=/usr/local/qt6/bin/qmake
   - mkdir artifacts
   - cp lib/gks/demo artifacts/gksdemo
   - cp lib/gr/demo artifacts/grdemo
@@ -1196,9 +1196,9 @@ packages-tar:
     paths:
     - Downloads/
 
-deploy:
-  stage: deploy
-  image: iffregistry.fz-juelich.de/docker-images/gr-build-images/$CI_JOB_NAME
+sync:
+  stage: sync
+  image: iffregistry.fz-juelich.de/docker-images/gr-build-images/deploy
   variables:
     GIT_STRATEGY: none
   only:
@@ -1240,7 +1240,7 @@ deploy-to-obs:
   - osc commit science\:gr-framework/gr/_service -m "Release $CI_COMMIT_TAG"
 
 deploy-to-aur:
-  stage: deploy-to-aur
+  stage: deploy
   image: iffregistry.fz-juelich.de/docker-images/gr-build-images/$CI_JOB_NAME
   only:
     - develop@Scientific-IT-Systems/gr

3rdparty/cairo/Makefile

@@ -2,7 +2,7 @@ ifeq ($(strip $(PREFIX)),)
 override PREFIX = $(abspath $(CURDIR)/../build)
 endif
 
-VERSION = 1.14.6
+VERSION = 1.16.0
 CAIRO_EXTRA_CONFIGURE_FLAGS ?=
 ifeq ($(shell uname),Darwin)
 CAIRO_EXTRA_CONFIGURE_FLAGS += CFLAGS=-mmacosx-version-min=10.11

3rdparty/freetype/Makefile

@@ -24,7 +24,7 @@ endif
         ftsynth.o \
         ftsystem.o \
         fttype1.o \
-        ftxf86.o \
+        ftmm.o \
         cff.o \
         psaux.o \
         pshinter.o \