From nobody Tue Aug 16 20:19:21 2022 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 4M6jD936Sxz4ZLl0; Tue, 16 Aug 2022 20:19:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M6jD92HNxz3cX8; Tue, 16 Aug 2022 20:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660681161; 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=PisneP4LRdDMijnDYLuyX8ougDrmG+RuueZ1kbQGRm0=; b=mLSpLxt1+JWk5IQic5sa+/ioST1GyD57ulx7gkj7ai2zDhUzxmU4G1VT4x1Py4KSHZxI/C oVyM05zENy9/P9cLgJKSQvjJGNn3WfrdZamQCwrpT/49IZgBc1IcQlNvMppfyYkJRtlyw6 dia5LMB9cefHYNpAFF6R0ASSTE3lLuIFYKwNUxA31NqXa67gwlwrtAWk1NaoRr3nd4DI8t hFOuDRiWKxq4iTowLBuV88nojipBorZNj55rmn3UhJk3bgtAIvbyp94Fs7xdwsS827mw/s OkJ4R2piMUn8F0x/NyjrzeaaZNaulFFPxYXW/WwVthwuf6pdMzhAZTO0PsNMdw== 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 4M6jD91Hy0zMPr; Tue, 16 Aug 2022 20:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27GKJLwR087193; Tue, 16 Aug 2022 20:19:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27GKJLbW087192; Tue, 16 Aug 2022 20:19:21 GMT (envelope-from git) Date: Tue, 16 Aug 2022 20:19:21 GMT Message-Id: <202208162019.27GKJLbW087192@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: f701da3ef022 - main - audio/musescore: ignore qmake (the Qt3 one) 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f701da3ef02213e358f37fece79075c2837e0f23 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660681161; 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=PisneP4LRdDMijnDYLuyX8ougDrmG+RuueZ1kbQGRm0=; b=j/+FLwP5GK5Xh4gEuZ5jbUt1fTTSaa5Oi6Etx7vqRXWm0FyekT2wIxzh+UTT0almXhtvMl 5PAeaW3ylDtjaEg4nk5ZkSA2wCWnqazNmS/a82CBfdj0heUr1lNZYkkG8wTYj4vqdZLYcB 4y7mTUL7o9UwU0M55ntoMZJ4r9LZJ+diXbL8YogoUMPcSXnN52ZZdikn9PYF85u7epRf6e FRYtGwqlUmW2QyCmPLzDMgD02SVcm7rNnHU/eKEKRXE5LLWtvZ/o6qQzr+fPVHuSK7wIZx QQxAdU6SQ37QHDvjrxrmLD20XhXgekO9KPs2q4W2UrVWSzKPrNmbCkCJWoB8OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660681161; a=rsa-sha256; cv=none; b=jYJUrZYXTFSecr1ilR+sTwuBCLXdKNYIU7mjbUVV8HUcq6G5ua8Cd1UdlDLjvYqD5QLivj 2MDD+RE2zg7fdBFZ6448Cws9J95ANeAWXHECGwM9R48g9gyJdq+8xqmm0sNSGxaI59P/5u EWx/AnWEY24fBsiL2QrYpbD4XJXAj0dcMByd7exEkx7yx1tJht6L9iVH5OtBqvZaZT9G63 pd0oDF4PE5vpE0vfNp5vYTMtG3PVJ0juy4hEMyyE4pBGOqIxCpbTDBr6NjIMp3k3F+vUyI 07piUjIK55whJTuB1KRbpHshQEeRBr22fgVcVgLZXmkyky5Gk0VHczNfMa2cbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=f701da3ef02213e358f37fece79075c2837e0f23 commit f701da3ef02213e358f37fece79075c2837e0f23 Author: Mamoru Iwaki <> AuthorDate: 2022-08-16 20:10:59 +0000 Commit: Adriaan de Groot CommitDate: 2022-08-16 20:10:59 +0000 audio/musescore: ignore qmake (the Qt3 one) If devel/qmake (the Qt3 version) is installed, it is un-suffixed and is found as "qmake", rather than the current "qmake-qt5" which is what Musescore needs. Patch out the name "qmake" entirely. Submitted by Mamoru Iwaki in the linked PR. I don't know if we have a policy on adding people's email addresses out of the PR database, so I left it out in this commit. PR: 265775 --- audio/musescore/files/patch-CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/musescore/files/patch-CMakeLists.txt b/audio/musescore/files/patch-CMakeLists.txt index efc92056415c..7403aa40adaf 100644 --- a/audio/musescore/files/patch-CMakeLists.txt +++ b/audio/musescore/files/patch-CMakeLists.txt @@ -10,7 +10,7 @@ up with the dependency loop; make handles this without complaint) # Print Qt version or fail the build if Qt (qmake) is not in PATH. -fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake) -+fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake qmake-qt5) ++fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake-qt5) # Libraries linked via full path no longer produce linker search paths. cmake_policy(SET CMP0003 NEW)