From nobody Mon Jul 15 07:10:34 2024 X-Original-To: dev-commits-ports-main@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 4WMtdQ5hj3z5QlcJ; Mon, 15 Jul 2024 07:10:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WMtdQ5CZHz4fgQ; Mon, 15 Jul 2024 07:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721027434; 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=HvDKGtu1syqNn3x6mZeA3BrZxbZ5ChvIx3pYL6GZA+k=; b=G8ddAeQ/7oOjeQUrgVPS9f0EFmjAyo6ZpxmGOzLqrJqxHW8yLuXfkgJQFqrVfDCN+hIK9X 0k1jW/8X0uUI8x+zrrRoEshSclwnvwUws6rLpCqVsuzsasaJVwarnnlyXpk6S0H727uzF1 US4R6I4K5T6mPv3EEBoN/eptvctluZ9hefWvmOlOInMKx1TjaVXdKOEAMmOJvQ3igADuRg NqMur40qpQh8zZmHOwjcGfFyzClK8qWmLF/lOvLpBSbRSXTeVc69QTk8ZMxqW7l+43Jtpr W2JRR0DoU7y9owl4VMNM0znFxxogoo8QQlfwTk45Dl71A2Sf5GjRZVcWMdSPRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721027434; a=rsa-sha256; cv=none; b=u51z3YTvYhNTedD6/ja6crLyiWZZRPWhAzEPdCRaeNcq1XPYNV71KPD0ai0o1z0gOD2W+m nBZnD9kadp/7REosIR/MwiWTuW0bY4dEe6swOSj5h3aoAkdWrDT1k0duHLYaa8ySaIF1oP 9dgIlcayq30wQbUxSpeXjc6pZ9Kk/CxK7qEu6dn+I3vWZHTusjg3SI8MM1jF+W1roMjPew eZk+HrAGiicDdISK4A6WAJh84pyoyP1fBTLP5sOGlqqcVpU91MSV8ibPwxG8YplTUcHuES u5OzaDijBK8yuloVjOcVZ5a0ITFu1ebHeFZ0166m+LzKySN1domM+odp3yopxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721027434; 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=HvDKGtu1syqNn3x6mZeA3BrZxbZ5ChvIx3pYL6GZA+k=; b=ja/7fNpLl3TTjJ2VAo69EpdDPpULDg8O7IoROdEnyE8U5r3MSugfc+Qo5suDgAzxgansTd jGeISge9itqCJExcBT4pndEwaVo4ao6psmSKwbyZBgalbmof3CFbysHpPySCWNYEX7R0Qw GjUZEW6o7J+doUrGW5fO6N159uSdc8HD50ghM0/PBrjax5BY0CHqcC7Gr3o/FitKpOf0ju 77Grg9C+IbB4jEbA8E3lOT6jSX+4TjtwjaodkFEE8SdwigdQ2F/Jhw4jqnZrVTGmBax+w4 IJufxoKcWO4UnVYcgZU9t03tN7C9G8nQRf/KKvbjj691CG+O895irgcnNd72Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WMtdQ4kxczhtG; Mon, 15 Jul 2024 07:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46F7AY7c007478; Mon, 15 Jul 2024 07:10:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46F7AYmC007475; Mon, 15 Jul 2024 07:10:34 GMT (envelope-from git) Date: Mon, 15 Jul 2024 07:10:34 GMT Message-Id: <202407150710.46F7AYmC007475@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 25237138341d - main - devel/zeal: Unbreak build with Qt 6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25237138341dc07b467664d4a83306338fc13ec0 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=25237138341dc07b467664d4a83306338fc13ec0 commit 25237138341dc07b467664d4a83306338fc13ec0 Author: Gleb Popov AuthorDate: 2024-07-15 07:00:21 +0000 Commit: Gleb Popov CommitDate: 2024-07-15 07:10:28 +0000 devel/zeal: Unbreak build with Qt 6 The port still fails at the moment because it picks Qt 5, but this will be fixed once we switch to kf6-extra-cmake-modules PR: 280070 --- devel/zeal/Makefile | 2 +- devel/zeal/files/patch-src_app_CMakeLists.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/devel/zeal/Makefile b/devel/zeal/Makefile index 06a890d5fb61..7a2456a7a6e9 100644 --- a/devel/zeal/Makefile +++ b/devel/zeal/Makefile @@ -23,7 +23,7 @@ USE_GITHUB= yes GH_ACCOUNT= zealdocs USE_GL= opengl USE_KDE= ecm -USE_QT= base declarative positioning webchannel webengine +USE_QT= base declarative positioning webchannel webengine tools:build USE_XORG= ice sm x11 xcb xext .include diff --git a/devel/zeal/files/patch-src_app_CMakeLists.txt b/devel/zeal/files/patch-src_app_CMakeLists.txt new file mode 100644 index 000000000000..0d4057fb3f7e --- /dev/null +++ b/devel/zeal/files/patch-src_app_CMakeLists.txt @@ -0,0 +1,8 @@ +--- src/app/CMakeLists.txt.orig 2023-09-20 05:24:18 UTC ++++ src/app/CMakeLists.txt +@@ -1,4 +1,4 @@ +-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED) ++find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Concurrent Network WebChannel WebEngineWidgets Widgets REQUIRED) + if (Qt${QT_VERSION_MAJOR}Widgets_VERSION VERSION_LESS QT_MINIMUM_VERSION) + message(FATAL_ERROR "Qt version >= ${QT_MINIMUM_VERSION} is required.") + endif()