From nobody Mon Sep 09 18:48:15 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 4X2bSb2tNRz5ThFC; Mon, 09 Sep 2024 18:48:15 +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 4X2bSb2MQbz4NbX; Mon, 9 Sep 2024 18:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725907695; 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=ZTSsbika8z9cRrPlQzzVMOUdMyMHg10+GpA8JTFtxTY=; b=agNYHOPlTyTKP0U/zqZrdXJnef4aAqIp/rHwOMCOynBld90e4YabOQgqfoFe/kPhP3jcF8 4fFwyQxjQkuAOuuC8bb0bwWN/DiPk5+R/xRqHUoY2SM/LgR6PPJWixLGpy4Q5wMmJGTMdI XDyuzZ5FHz6cqrzp6XEoxm3GHqV2GT7vR4EiO4AMuI27pwy5pQA+MMf9D8JsP9nO0gr7V1 XzpuKNauxwgkFtjMNA2YnGU1KU59J/EpvIWN5qouDHDu6A/1AvtiN3+I/Glwv0+SwKnUuP l57d5qkXnzuDf0LxDI0nQX8hmHRfFG6VTfKCcTX4qdls1GtNxMhdtmGo14fVsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725907695; a=rsa-sha256; cv=none; b=pIzKpBX384lilJ6PNAu1fhhgmxm0o0swLp+gclvpCTmVI9ULjlUGzj2BPZvqQsynMC6+KR qX+2ik/kWPDyfcCHMP6/QCqd/cuNkWX44u8xnJRm0Ou1POW1SOX9pVKErXynjunGf0uRrt gZhTnre5K+7LCxVWX+MCDTxFeuJGxUEQ3TSDdNCwq4feW8YUHIYfYj5Q2OuN+uP8oJYbqn 2UqvfxdRavOtZbtJ5JKuk3bHVUGmkTT8SeNCAdTPLSPjraAqPUxqstk70xEq8tiEjy9dOj LnqCxZQN5Kvcpik6+CVFYIxQsBHGwFU+UaHhnBaQHem/EtO6GI2ORf0KNDFegA== 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=1725907695; 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=ZTSsbika8z9cRrPlQzzVMOUdMyMHg10+GpA8JTFtxTY=; b=Wu1zQc9f76hhh8s7kOyDdW1ixGqphBabzTQOPWOv/YGtQoq5h0CLULb5g/D8Rxw0efMmoG W2kij+4vtcGHYiMYd19ndIzzfW+GtAQ/OioL7M6/WixiTlq3br7q4Qjk+AmXepLs4tqeXg EunJWnxBxf0ZnvGiPbTmz9fsY0x4//A0n8DEXsJgcbPSmBrb89ioxE05aharHzuNzttnyW srqp+PwBs5/4X1gjwThN+7ffGfImmC5wXiR7MD+n7gfSu/911KHi3B8MR5UQ1BtroJVEIv YluhU9uW2YM+lhtPRJPoCRoEITBrBECyx+zGNO/kOAXe0Khq33NGL/zy7/72gQ== 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 4X2bSb1vzhzFcV; Mon, 9 Sep 2024 18:48:15 +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 489ImFFG014481; Mon, 9 Sep 2024 18:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 489ImFGu014478; Mon, 9 Sep 2024 18:48:15 GMT (envelope-from git) Date: Mon, 9 Sep 2024 18:48:15 GMT Message-Id: <202409091848.489ImFGu014478@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 1079dca83e68 - main - games/prismlauncher: Replace hardcoded /usr/local with LOCALBASE 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1079dca83e68bc158791d69083095a90fc901c7e Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1079dca83e68bc158791d69083095a90fc901c7e commit 1079dca83e68bc158791d69083095a90fc901c7e Author: Vladimir Druzenko AuthorDate: 2024-09-09 18:42:28 +0000 Commit: Vladimir Druzenko CommitDate: 2024-09-09 18:48:00 +0000 games/prismlauncher: Replace hardcoded /usr/local with LOCALBASE Approved by: Alexander Vereeken (maintainer) --- games/prismlauncher/Makefile | 5 +++++ games/prismlauncher/files/patch-launcher_minecraft_LaunchProfile.cpp | 2 +- .../files/patch-launcher_minecraft_MinecraftInstance.cpp | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/games/prismlauncher/Makefile b/games/prismlauncher/Makefile index 714390e18e4d..7bc29be57b6c 100644 --- a/games/prismlauncher/Makefile +++ b/games/prismlauncher/Makefile @@ -32,4 +32,9 @@ USE_QT= 5compat base CMAKE_ARGS= -DJAVA_HOME=${JAVA_HOME} -DJava_JAVAC_EXECUTABLE=${JAVAC} \ -DLauncher_BUILD_PLATFORM=FreeBSD +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/launcher/minecraft/LaunchProfile.cpp \ + ${WRKSRC}/launcher/minecraft/MinecraftInstance.cpp + .include diff --git a/games/prismlauncher/files/patch-launcher_minecraft_LaunchProfile.cpp b/games/prismlauncher/files/patch-launcher_minecraft_LaunchProfile.cpp index e44a7c27b8bb..3d00cebbefd3 100644 --- a/games/prismlauncher/files/patch-launcher_minecraft_LaunchProfile.cpp +++ b/games/prismlauncher/files/patch-launcher_minecraft_LaunchProfile.cpp @@ -9,7 +9,7 @@ + // HACKHACK: use system lwjgl3 until mojang will fix it + QString artifact = lib->artifactId(); + if (artifact.startsWith("lwjgl") && lib->version().startsWith("3.")) { -+ jars += "/usr/local/share/java/classes/lwjgl3/" + artifact + ".jar"; ++ jars += "%%LOCALBASE%%/share/java/classes/lwjgl3/" + artifact + ".jar"; + continue; + } +#endif diff --git a/games/prismlauncher/files/patch-launcher_minecraft_MinecraftInstance.cpp b/games/prismlauncher/files/patch-launcher_minecraft_MinecraftInstance.cpp index eb4cc4ed4837..1f8887bc7703 100644 --- a/games/prismlauncher/files/patch-launcher_minecraft_MinecraftInstance.cpp +++ b/games/prismlauncher/files/patch-launcher_minecraft_MinecraftInstance.cpp @@ -9,9 +9,9 @@ + Version instance_ver{ getPackProfile()->getComponentVersion("net.minecraft") }; + QDir natives_dir; + if (instance_ver < Version("1.13.0")) -+ natives_dir = QDir("/usr/local/lib/lwjgl/"); ++ natives_dir = QDir("%%LOCALBASE%%/lib/lwjgl/"); + else -+ natives_dir = QDir("/usr/local/lib/lwjgl3/"); ++ natives_dir = QDir("%%LOCALBASE%%/lib/lwjgl3/"); +#else QDir natives_dir(FS::PathCombine(instanceRoot(), "natives/")); +#endif