From nobody Thu Jul 25 17:12:26 2024 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 4WVHWH0HZWz5Qtxm; Thu, 25 Jul 2024 17:12:27 +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 4WVHWG6ydKz4wYv; Thu, 25 Jul 2024 17:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721927547; 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=HCN/sqjMfBMP05MHt+9yLvqN6uqJ9/mWOZA5W/Lcn2k=; b=JEckQJ/S78JsXhktIjbR/8fqcn8TcSJIjgamDun7scxq31GyzaF78c18wpZJZzNQJibgnI WO06nQPvyhagWJJj8hnzkXZdIn1wFqZu0aLEMqgssHKFzI9lhDf8Xk7stHVXbu0kxDWSGP +6L9o5JuQ9MLFEAMamUrlF5kQKExVWNT3XtjFHpxvLQO3kBzswxtRevpW1GkG1NlKmUCST KtyzZ9vnTYb1MvH2wLmek1Z5dHrUIvtosLtoNwp3cm4c1y6vPFoHPtMTWRWggR+YwJDVe1 4My+dGoQWioP6xghJu798+zsEgN+3h5SHE9ADhlcYz95VYhmvxpIgaQ9NE2RHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721927547; a=rsa-sha256; cv=none; b=CUDRlBWOMWY16KiOA2VL3xgFzug8BmAGp5T1Jkuy3M5ZHp60wst9WWhdd0d1fIoKI9XWqA Ok1KDHEL6zbU6Ni0mpmTI3oHr4QUeuQcjx88wuqRUTYMNPBSEj1IuYqpxinXfX5SpGet+H +PGxeaoixWMK0/7u6Z/W+aS2ibyxsrMMRD+V5pkdLMVGhioCrFbdkqteGWKc0qdPBY7fCJ XykD/uSyuvJsqbwfqdA54FDj8fEGAf+HapixhRqQ5GyH06TLH+dJe9KeErRP0/6vVyC1+1 /ENu29kCOxNwf49fke4iX71Z15KNSdqmgc8gI60yNTcK0KR171C1KRZz88keTw== 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=1721927547; 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=HCN/sqjMfBMP05MHt+9yLvqN6uqJ9/mWOZA5W/Lcn2k=; b=wRrUb1rU5FADCzCO9QhV/r6ek94NcFeGdhZJUCTt6lJO9vQ+7jc3DU7r7pxF5rjq+TDM0M nFuJiUPK125eJatmLZk2ufmZ3GhIf03pSzmDorpD/dpAnNAEeDaNuhMAgvP9nUh61XswDy zxtpR+WQA+v6R58nci2ybahMRDHsgS6OkD/DVyoYL4o91lMqUc8gBlVB48G6U95IdK3Fwm K5EKExJAa4AM75k7UmoIFhYzEFKUGJ8j71v/4WerJbH7HY7zsDxDJx1zT+D6BUMcHn8ABH mjAMXOdEf9TXVn+jRABuqWSgE1SoPrPx740NXLx9CisQnIgxaCkT/dVZ4CsCLQ== 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 4WVHWG6YwTz13rq; Thu, 25 Jul 2024 17:12:26 +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 46PHCQXn003902; Thu, 25 Jul 2024 17:12:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46PHCQNv003899; Thu, 25 Jul 2024 17:12:26 GMT (envelope-from git) Date: Thu, 25 Jul 2024 17:12:26 GMT Message-Id: <202407251712.46PHCQNv003899@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: 9815c7b35e0d - 2024Q3 - devel/zeal: Unbreak build with Qt 6 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 9815c7b35e0d1f4064c7de3f46da1ef03d4278b6 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9815c7b35e0d1f4064c7de3f46da1ef03d4278b6 commit 9815c7b35e0d1f4064c7de3f46da1ef03d4278b6 Author: Gleb Popov AuthorDate: 2024-07-15 07:00:21 +0000 Commit: Gleb Popov CommitDate: 2024-07-25 17:12:08 +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 (cherry picked from commit 25237138341dc07b467664d4a83306338fc13ec0) --- 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()