Switch to latest KDE qt5 patchset.

.github/actions/build_linux/Dockerfile

@@ -0,0 +1,6 @@
+FROM ubuntu:18.04
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt update
+RUN apt install -y build-essential curl wget software-properties-common
+RUN apt install -y cmake libxcb1-dev libgtk-3-dev libxcb-*-dev libxkbcommon-dev libxkbcommon-x11-dev

.github/actions/build_linux/action.yml

@@ -0,0 +1,7 @@
+name: 'Build linux'
+description: 'Build cutter deps in a docker image'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  entrypoint: './.github/actions/build_linux/entrypoint.sh'
+

.github/actions/build_linux/entrypoint.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -exu
+pwd
+ls
+
+apt-get install -y libxcb1-dev libxkbcommon-dev libxkbcommon-x11-dev libgtk-3-dev libgl1-mesa-dev libglu1-mesa-dev libxcb-*-dev git
+apt list --installed
+cat /etc/*ease
+
+GIT_HASH=32be154325bfba3ad2ba8bf75dad702f3588e8d3
+git init qt-src-git
+cd qt-src-git
+git remote add origin https://invent.kde.org/qt/qt/qt5.git
+git fetch --depth=1 origin $GIT_HASH
+git checkout $GIT_HASH
+git submodule update --init --depth 1
+cd ..
+
+make

.github/workflows/package-build.yml

@@ -21,18 +21,17 @@ jobs:
         include:
           - name: linux-x86_64
             os: ubuntu-latest
-            container:
-              image: ubuntu:18.04
             arch: x86_64
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
     - name: build linux
+      if: contains(matrix.os, 'ubuntu')
+      uses: ./.github/actions/build_linux
+    - name: build linux outputs
       if: contains(matrix.os, 'ubuntu')
       run: |
-        sudo apt-get install libxcb1-dev libxkbcommon-dev libxkbcommon-x11-dev libgtk-3-dev libgl1-mesa-dev libglu1-mesa-dev libxcb-*-dev
-        make ARCH=${{ matrix.arch }}
-        echo UPLOAD_FILE=cutter-deps-qt-linux-${{ matrix.arch }}.tar.gz >> $GITHUB_ENV
+        echo UPLOAD_FILE=cutter-deps-qt5-linux-${{ matrix.arch }}.tar.gz >> $GITHUB_ENV
         echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV
     - uses: actions/upload-artifact@v4
       if: startsWith(github.event.ref, 'refs/tags') == false

Makefile

@@ -34,7 +34,7 @@ QT_SRC_MD5=0fbcde36556a366df8ecf24a7ea1f7ec
 QT_SRC_URL=${BASE_URL}/official_releases/qt/5.15/5.15.5/single/qt-everywhere-opensource-src-5.15.5.tar.xz
 endif
 
-QT_SRC_DIR=qt-everywhere-src-5.15.5
+QT_SRC_DIR=qt-src-git
 QT_BUILD_DIR=${QT_SRC_DIR}/build
 QT_PREFIX=${ROOT_DIR}/qt
 
@@ -57,7 +57,7 @@ endif
 
 BUILD_THREADS:=4
 
-PACKAGE_FILE=cutter-deps-qt-${PLATFORM}-${ARCH}.tar.gz
+PACKAGE_FILE=cutter-deps-qt5-${PLATFORM}-${ARCH}.tar.gz
 
 all: qt pkg
 
@@ -153,11 +153,11 @@ ${QT_SRC_DIR}:
 	@echo "# Downloading Qt Source #"
 	@echo "#########################"
 	@echo ""
-	$(call download_extract,${QT_SRC_URL},${QT_SRC_FILE},${QT_SRC_MD5})
+	#$(call download_extract,${QT_SRC_URL},${QT_SRC_FILE},${QT_SRC_MD5})
 	# Add patches here if required
-	patch ${QT_SRC_DIR}/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h qiosurfacegraphicsbuffer.h.patch
-	# https://github.com/macports/macports-ports/blob/d2a7c094acba41c84dbe792480f6a1b32371d5e7/aqua/qt5/Portfile#L1057-L1059
-	cd ${QT_SRC_DIR}/qtbase && patch -p0 < ../../patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff
+	# Examples
+	#patch ${QT_SRC_DIR}/srcfile.h patch_name.patch
+	#cd ${QT_SRC_DIR}/qtbase && patch -p0 < ../../patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff
 
 .PHONY: src
 src: ${QT_SRC_DIR}