qt6: 6.7.3 -> 6.8.0

WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/ -A '*.tar.xz' )

WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.0/submodules/ -A '*.tar.xz' )

qtModule rec {

  pname = "qtmqtt";

  version = "6.7.3";

  version = "6.8.0";

  src = fetchFromGitHub {

    owner = "qt";

    repo = "qtmqtt";

    rev = "v${version}";

    hash = "sha256-QVLt1nhxYIMmmVY1rZ8pnkXNs0N6hp1o8rv33o8ptxM=";

    hash = "sha256-WvqBEq7Zv1CONMMuDHdj8/nJHoY4y7ysrqliTZHi7x8=";

  };

  propagatedBuildInputs = [ qtbase ];

, wayland-scanner

, pkg-config

, libdrm

, fetchpatch

}:

qtModule {

  buildInputs = [ wayland libdrm ];

  nativeBuildInputs = [ pkg-config ];

  patches = [

    # Update wayland.xml to version 1.23.0

    (fetchpatch {

      url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff";

      sha256 = "sha256-ZcK/LT65oFvTzCukZB8aDYWH5L6RK5MOPs8VtpYQpq0=";

    })

  ];

  # Replace vendored wayland.xml with our matching version

  # FIXME: remove when upstream updates past 1.23

  postPatch = ''

    cp ${wayland-scanner}/share/wayland/wayland.xml src/3rdparty/protocol/wayland/wayland.xml

  '';

}

, qtwebchannel

, qtpositioning

, qtwebsockets

, fetchpatch2

, buildPackages

, bison

, coreutils

    # Override locales install path so they go to QtWebEngine's $out

    ../patches/qtwebengine-locales-path.patch

    # Support FFmpeg 7

    (fetchpatch2 {

      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-webengine/-/raw/6bee5464ac6340e925e08c7ed023026e727ae9d5/qtwebengine-ffmpeg-7.patch";

      hash = "sha256-OdCIu1KMW3YcpCnfUP1uD7OJRl6Iwap9X4aJhGpoaNs=";

      stripLen = 1;

      extraPrefix = "src/3rdparty/chromium/";

    })

  ];

  postPatch = ''

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Nick Cao <nickcao@nichi.co>

Date: Fri, 14 Apr 2023 21:43:04 +0800

Subject: [PATCH] qtbase: qmake: fix mkspecs for darwin

---

 mkspecs/common/mac.conf               |   2 +-

 mkspecs/features/mac/default_post.prf | 264 --------------------------

 mkspecs/features/mac/default_pre.prf  |  58 ------

 mkspecs/features/mac/sdk.mk           |  27 ---

 mkspecs/features/mac/sdk.prf          |  61 ------

 mkspecs/features/mac/toolchain.prf    |   5 -

 6 files changed, 1 insertion(+), 416 deletions(-)

diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf

index 61bea952b22..9909dae7260 100644

index 61bea952b2..9909dae726 100644

--- a/mkspecs/common/mac.conf

+++ b/mkspecs/common/mac.conf

@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL     = \

 QMAKE_LFLAGS_REL_RPATH  =

diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf

index 0b64a586b93..3b40328304d 100644

index 22c84d6473..4d46762bec 100644

--- a/mkspecs/features/mac/default_post.prf

+++ b/mkspecs/features/mac/default_post.prf

@@ -1,9 +1,5 @@

 load(default_post)

-# Recompute SDK version in case the user set it explicitly

-sdk_version = $$QMAKE_MAC_SDK_VERSION

-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)

-

 contains(TEMPLATE, .*app) {

     !macx-xcode:if(isEmpty(BUILDS)|build_pass) {

         # Detect changes to the platform SDK

@@ -15,270 +11,10 @@ contains(TEMPLATE, .*app) {

@@ -15,278 +15,10 @@ contains(TEMPLATE, .*app) {

         QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk)

     }

-

-    QMAKE_XCODE_ARCHS =

-

-    !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) {

-        arch_device.name = "ARCHS[sdk=$${device.sdk}*]"

-        arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS

-        QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS

-        QMAKE_MAC_XCODE_SETTINGS += arch_device

-    }

-

-    ios:simulator {

-        arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]"

-            platform_identifier = $$device.sdk

-            sysroot_path  = $$xcodeSDKInfo(Path, $$device.sdk)

-        }

-        QMAKE_CFLAGS += -isysroot $$sysroot_path

-        QMAKE_CXXFLAGS += -isysroot $$sysroot_path

-        QMAKE_LFLAGS += -isysroot $$sysroot_path

-

-        !isEmpty(version_identifier):!isEmpty(deployment_target) {

-            version_min_flag = -m$${version_identifier}-version-min=$$deployment_target

-        QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag

-        QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag

-        QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag

-            QMAKE_CFLAGS += $$version_min_flag

-            QMAKE_CXXFLAGS += $$version_min_flag

-            QMAKE_LFLAGS += $$version_min_flag

-        }

-    }

-

-    # Enable precompiled headers for multiple architectures

     generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS

     generate_xcode_project.target = xcodeproj

diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf

index e3534561a56..3b01424e67b 100644

index e3534561a5..3b01424e67 100644

--- a/mkspecs/features/mac/default_pre.prf

+++ b/mkspecs/features/mac/default_pre.prf

@@ -1,60 +1,2 @@

-xcode_copy_phase_strip_setting.value = NO

-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting

diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk

index a32ceacb6ce..e69de29bb2d 100644

index a32ceacb6c..e69de29bb2 100644

--- a/mkspecs/features/mac/sdk.mk

+++ b/mkspecs/features/mac/sdk.mk

@@ -1,27 +0,0 @@

-    endif

-endif

diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf

index 3a9c2778bbe..e69de29bb2d 100644

index 3a9c2778bb..e69de29bb2 100644

--- a/mkspecs/features/mac/sdk.prf

+++ b/mkspecs/features/mac/sdk.prf

@@ -1,61 +0,0 @@

-    cache($$tool_variable, set stash, $$tool)

-}

diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf

index df191eb13c4..e69de29bb2d 100644

index df191eb13c..e69de29bb2 100644

--- a/mkspecs/features/mac/toolchain.prf

+++ b/mkspecs/features/mac/toolchain.prf

@@ -1,5 +0,0 @@