From 17a77f6a41e601e54ce4578736617f8d663af3f7 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 16 Mar 2024 17:34:47 +0100 Subject: [PATCH] Fix linux UI build Signed-off-by: falkTX --- .github/workflows/build.yml | 4 ++-- src/PawPaw | 2 +- src/plugin/WebViewX11.cpp | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77a8a5e..81e18b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,7 +62,7 @@ jobs: else freetypepkgname="libfreetype-dev" fi - apt-get install -yqq ${freetypepkgname} libgl1-mesa-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev p7zip-full unzip wget xdg-user-dirs zip + apt-get install -yqq ${freetypepkgname} libgl1-mesa-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev libxxf86vm-dev p7zip-full unzip wget xdg-user-dirs zip - name: Set up cache id: cache uses: actions/cache@v3 @@ -157,7 +157,7 @@ jobs: else freetypepkgname="libfreetype-dev" fi - apt-get install -yqq ${freetypepkgname} libgl1-mesa-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev p7zip-full unzip wget xdg-user-dirs zip + apt-get install -yqq ${freetypepkgname} libgl1-mesa-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev libxxf86vm-dev p7zip-full unzip wget xdg-user-dirs zip - name: Set up cache id: cache uses: actions/cache@v3 diff --git a/src/PawPaw b/src/PawPaw index 6250a88..fdf2543 160000 --- a/src/PawPaw +++ b/src/PawPaw @@ -1 +1 @@ -Subproject commit 6250a88ce79a67ebb67ef72b62593684cea336ea +Subproject commit fdf25438063ede9b967d311ac66c3406a56a67f5 diff --git a/src/plugin/WebViewX11.cpp b/src/plugin/WebViewX11.cpp index 61e3d57..a1fb143 100644 --- a/src/plugin/WebViewX11.cpp +++ b/src/plugin/WebViewX11.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2023-2024 MOD Audio UG // SPDX-License-Identifier: AGPL-3.0-or-later +#define QT_NO_VERSION_TAGGING #include #include #include @@ -294,7 +295,7 @@ static bool qt5webengine(const Window winId, const double scaleFactor, const cha using QApplication__init_t = void (*)(QApplication*, int&, char**, int); using QApplication_exec_t = void (*)(); using QApplication_setAttribute_t = void (*)(Qt::ApplicationAttribute, bool); - using QString__init_t = void (*)(void*, const QChar*, qsizetype); + using QString__init_t = void (*)(void*, const QChar*, ptrdiff_t); using QUrl__init_t = void (*)(void*, const QString&, int /* QUrl::ParsingMode */); using QWebEngineView__init_t = void (*)(QWebEngineView*, void*); using QWebEngineView_move_t = void (*)(QWebEngineView*, const QPoint&);