From nobody Fri Dec 05 01:04:42 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMtSp70X6z6K5wm for ; Fri, 05 Dec 2025 01:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMtSp5XKWz3MZT for ; Fri, 05 Dec 2025 01:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764896682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a15pLyIZqg0Z2PRnZwTKBOBJw4PKodKJFx9YcKuw7nw=; b=MGF9qVqsVwYO3i72xwYsKUBAK9kehjXeCFis2rh76JzfcqWf+Y7nyakzyMwS5j6d/aHnYq H1hsxBStLiY9ToFLCOvNqKG4AMRjBRJobWHsLBUNBaffde9deJg4vvm1K+QsQh7KhAwPA8 /TBG2pywqy4uWO6Qi290F0q7B01SDkczRJ3vAYrVGDRh2j+Ro4kUGXhSHFdO/bCjtJ+PZH Tez4UB7JEJLeMF/QYXdxyremrPYqVnuIjjbpD4e8qO7MDQ8QWfjcZsCdgnT/papLl0r+IG fsMB1SI5pUULmSom2Mjbb8X1HYPkgHp5TH/EtyYvCUXWFija1ssB8Qj//Dfd2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764896682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a15pLyIZqg0Z2PRnZwTKBOBJw4PKodKJFx9YcKuw7nw=; b=K72RSolQwdq7ucvklAGfai08J843Jqr9MjYvgmxe2ClGjhqRhYRUvhrYh/LHnhUb65duDJ V8KAyJl3GRLeHLRUCVnXlv07jSQrvyO37Y72dXosWUp4vvdAttUgSO7ms/euN+CC0c3kM8 L9FPD102suMv0lWO/TNTxne/TtO95zhKkdDY470GF0M1FSswj2272524oizju+lQEC91q9 +4t7+oSSsQ7vMLMuL5RF3pKxMu30d0vW915fECPiyyIUyFPU6kcuIuRuDE7K2naNGO1uZn NUJW+vG7k9wc0UYquK3w2f9BrtCLCtaSELFB4Byc3E7eK8BQPY4Gnsef0i0QxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764896682; a=rsa-sha256; cv=none; b=LvxVeZoYXC0GgjZbgXs5C/wA3xHCz3+NRmXrRR+YvIGAfkXTOLMiJDCxlXzLV1/366JioO anvIC+tGlXTNvezYcJubRrLYUUykrtS+6Q5mg8clpohlwoy550tD0f8Y+evBzQPGR9u7oL hmJ4mkO+QS98NHRFg+GUCmJ+Z32KvdndK3kKJwu3rye/tZaXTM2Z9m+3ek4usFh3m7xSJT +VyyNQ5VhRWS163T/mfKMN3NRCO9ZqdNhaYDaJvCVvtPKVCwB2J9rnVVaaCduPMrTH9aDC 3asKcnnCxg2QjpC3D5l/ewX/1jY+usYU5ctfKiH3VffyC8qb83MTVG8SHDVhag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMtSp4vz3zntr for ; Fri, 05 Dec 2025 01:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25b1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 01:04:42 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jason E. Hale Subject: git: 8da1f27e86ab - main - x11-toolkits/como: Prepare for Qt 6.10 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8da1f27e86ab326d32b8cf107d4436cd3571750c Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 01:04:42 +0000 Message-Id: <69322faa.25b1b.69837e52@gitrepo.freebsd.org> The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=8da1f27e86ab326d32b8cf107d4436cd3571750c commit 8da1f27e86ab326d32b8cf107d4436cd3571750c Author: Jason E. Hale AuthorDate: 2025-12-05 00:49:50 +0000 Commit: Jason E. Hale CommitDate: 2025-12-05 01:03:45 +0000 x11-toolkits/como: Prepare for Qt 6.10 Add several patches to fix build with Qt 6.10. With hat: kde@ --- x11-toolkits/como/files/patch-CMakeLists.txt | 17 +++++++++++++++++ x11-toolkits/como/files/patch-como-config.cmake.in | 13 +++++++++++++ .../como/files/patch-plugins_qpa_CMakeLists.txt | 15 +++++++++++++++ .../como/files/patch-plugins_qpa_integration.cpp | 20 ++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/x11-toolkits/como/files/patch-CMakeLists.txt b/x11-toolkits/como/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..df67175e66bc --- /dev/null +++ b/x11-toolkits/como/files/patch-CMakeLists.txt @@ -0,0 +1,17 @@ +Since Qt 6.9.0, the GuiPrivate target has had it's own CMake config, but +beginning with Qt 6.10.0, this must be found separately. + +--- CMakeLists.txt.orig 2024-10-09 12:19:16 UTC ++++ CMakeLists.txt +@@ -47,6 +47,11 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COM + UiTools + Widgets + ) ++if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0) ++ find_package(Qt6 6.10.0 CONFIG REQUIRED COMPONENTS ++ GuiPrivate ++ ) ++endif() + + find_package(Qt6Test ${QT_MIN_VERSION} CONFIG QUIET) + set_package_properties(Qt6Test PROPERTIES diff --git a/x11-toolkits/como/files/patch-como-config.cmake.in b/x11-toolkits/como/files/patch-como-config.cmake.in new file mode 100644 index 000000000000..2f9e3f741f4f --- /dev/null +++ b/x11-toolkits/como/files/patch-como-config.cmake.in @@ -0,0 +1,13 @@ +Export Qt6::GuiPrivate to consumers. This is required since Qt 6.10.0. + +--- como-config.cmake.in.orig 2024-10-09 12:19:16 UTC ++++ como-config.cmake.in +@@ -10,7 +10,7 @@ find_dependency(wlroots @WLROOTS_MIN_VERSION@) + find_dependency(epoxy) + find_dependency(Pixman) + find_dependency(wlroots @WLROOTS_MIN_VERSION@) +-find_dependency(Qt6Gui @QT_MIN_VERSION@) ++find_dependency(Qt6 @QT_MIN_VERSION@ COMPONENTS Gui GuiPrivate) + find_dependency(KF6 @KF6_MIN_VERSION@ COMPONENTS + Auth + ColorScheme diff --git a/x11-toolkits/como/files/patch-plugins_qpa_CMakeLists.txt b/x11-toolkits/como/files/patch-plugins_qpa_CMakeLists.txt new file mode 100644 index 000000000000..a3a1e1b30637 --- /dev/null +++ b/x11-toolkits/como/files/patch-plugins_qpa_CMakeLists.txt @@ -0,0 +1,15 @@ +Remove unneeded Qt::CorePrivate target. Qt upstream has been cracking +down on use of private headers/targets since 6.9.0 and keeping these +unused targets is becoming increasingly problematic. This appears to +be a carryover from Qt5. + +--- plugins/qpa/CMakeLists.txt.orig 2024-10-09 12:19:16 UTC ++++ plugins/qpa/CMakeLists.txt +@@ -25,7 +25,6 @@ target_link_libraries(ComoQpaPlugin PRIVATE + + target_link_libraries(ComoQpaPlugin PRIVATE + epoxy::epoxy +- Qt::CorePrivate + Qt::GuiPrivate + Freetype::Freetype # Must be after Qt platform support libs + Fontconfig::Fontconfig diff --git a/x11-toolkits/como/files/patch-plugins_qpa_integration.cpp b/x11-toolkits/como/files/patch-plugins_qpa_integration.cpp new file mode 100644 index 000000000000..4424cdf8aa0d --- /dev/null +++ b/x11-toolkits/como/files/patch-plugins_qpa_integration.cpp @@ -0,0 +1,20 @@ +Adapt for Qt 6.10.0. The private QPA header genericunixthemes_p.h was +renamed to qgenericunixtheme_p.h. + +--- plugins/qpa/integration.cpp.orig 2024-10-09 12:19:16 UTC ++++ plugins/qpa/integration.cpp +@@ -25,8 +25,13 @@ SPDX-License-Identifier: GPL-2.0-or-later + #include + + #include +-#include + #include ++ ++#if QT_VERSION >= QT_VERSION_CHECK(6,10,0) ++#include ++#else ++#include ++#endif + + #if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) + #include