From nobody Sat Sep 14 14:52:20 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 4X5Z04411pz5WXx5; Sat, 14 Sep 2024 14:52:20 +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 4X5Z043WtQz4cl1; Sat, 14 Sep 2024 14:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726325540; 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=6x58h0VUYuTCUt+sQ0afEJBMSs9GVQmOg1321eVO9dI=; b=rZab3QlfLnDzlYocCiUISzQaglzYHwhW9Fu0LYaj2j+ceZd2mi9jKbgQiNU6FAKr/oGbm7 WU1ugqtwOFIdfN4RBuXBy3c5rCE2GgPsnGJosQZxBhFjWSKqxn4wFpYCPNDhuzezw35jMP py+FqlJxI5ltgshjLuLkKwH1sbgCJfBhk3uD2rBWMamf8EuCikeK1c7ecfkrzcUPLnlbJd 28LVJ+cRTJ84MGWLPQC3TQkpLCKNSmG4n6QyGY0yACgIzeO38PdbyI6mW01sHkC3vwZy4u eouCRV9qRLZaT9x5SSZS7xNC+Uqb7Ww/7kRfxFrwT8hxAIJGO8vS3SuF3nLUew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726325540; a=rsa-sha256; cv=none; b=MQ1APZyUkIIQA/ybB4lsvOZcnZUbIjXTHx3m6sMotk6zKl8scfhmxwnv3D3zke9w2whSW8 WR9j0xfN5rj5ud59zepeF/YqXQYNESLUVzou0FbrNN3f55RSv0YU05gK2cxncXVy8jp+/9 zt1HvoLFjmPDtSEvuT8EQkN8fGrfFOpFQuRJ4+yeYEgj68I9Ie0Fpgdea6lNolTfIRhYh6 N0u2Esi/aMxv2TEqyA14cLoUTeBF464Nv/qaumnpGQYJW/hxdWbFfgXphK8fZe5yulXJD/ a33cuKcOP6EYDTK4S/2MhcVoNcaT2KCkdVPM/XvEs2YlG5YGYLaaoXXjDrTCAQ== 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=1726325540; 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=6x58h0VUYuTCUt+sQ0afEJBMSs9GVQmOg1321eVO9dI=; b=bciG9krtuxmecIckdXgkhi5t6sRJt+cbA+uvF9pvPjDku7hTn8K3pYBFRkwN8n0ok7x6A3 Vyi5cA/RvIRXDDm0IYVSFbJjSiVbUDxMdnT8WcNlhBIQWhCJTGIzGlyvb7SA0WuZfiiG6S fGBD6CpNKH0bFKaDnsYeyjvKKNWeO+A1GDuatKLFCg0WeKEySa7deIKygMcUj0JS7x/iRQ DSWJ3/szyfV8SJ1uFa3sQyX5pUv/YZ3M4FixNEH5+z8RYbYS3ltn3Y5ZduhSQFHnmVPY+S s1oXYEQjCKhsK0L4RZbZi/mG8yWv52sEAzx+23YGEQYWjlFJqGPPzi1s9HLSJw== 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 4X5Z0437kqzX6c; Sat, 14 Sep 2024 14:52:20 +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 48EEqKrD077067; Sat, 14 Sep 2024 14:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48EEqKXC077064; Sat, 14 Sep 2024 14:52:20 GMT (envelope-from git) Date: Sat, 14 Sep 2024 14:52:20 GMT Message-Id: <202409141452.48EEqKXC077064@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: d091ccbfd381 - main - games/prismlauncher: Build with java 7 compatibility if build with jdk < 20 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d091ccbfd3813878c7fb4c39741f10d1f9f1e20f Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d091ccbfd3813878c7fb4c39741f10d1f9f1e20f commit d091ccbfd3813878c7fb4c39741f10d1f9f1e20f Author: Vladimir Druzenko AuthorDate: 2024-09-14 14:41:05 +0000 Commit: Vladimir Druzenko CommitDate: 2024-09-14 14:41:05 +0000 games/prismlauncher: Build with java 7 compatibility if build with jdk < 20 Java 20 and above has dropped binary compatibility with Java 7. When the Prism Launcher is compiled with Java 20+, the sources are patched to be binary compatible with Java 8 instead of Java 7. This may cause issues with very old Minecraft versions and/or older Forge versions: https://github.com/PolyMC/PolyMC/issues/515. If you have problems, install an older Java compiler and recompile games/Prismlauncher. Approved by: Alexander88207@protonmail.com (maintainer, via Discord) --- games/prismlauncher/Makefile | 7 +++++++ ...akeLists.txt => extra-patch-libraries_javacheck_CMakeLists.txt} | 0 ...MakeLists.txt => extra-patch-libraries_launcher_CMakeLists.txt} | 0 3 files changed, 7 insertions(+) diff --git a/games/prismlauncher/Makefile b/games/prismlauncher/Makefile index 7bc29be57b6c..e0f3bd611c28 100644 --- a/games/prismlauncher/Makefile +++ b/games/prismlauncher/Makefile @@ -32,6 +32,13 @@ USE_QT= 5compat base CMAKE_ARGS= -DJAVA_HOME=${JAVA_HOME} -DJava_JAVAC_EXECUTABLE=${JAVAC} \ -DLauncher_BUILD_PLATFORM=FreeBSD +.include + +.if ${JAVA_PORT_VERSION} >= 20 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-libraries_javacheck_CMakeLists.txt \ + ${PATCHDIR}/extra-patch-libraries_launcher_CMakeLists.txt +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/launcher/minecraft/LaunchProfile.cpp \ diff --git a/games/prismlauncher/files/patch-libraries_javacheck_CMakeLists.txt b/games/prismlauncher/files/extra-patch-libraries_javacheck_CMakeLists.txt similarity index 100% rename from games/prismlauncher/files/patch-libraries_javacheck_CMakeLists.txt rename to games/prismlauncher/files/extra-patch-libraries_javacheck_CMakeLists.txt diff --git a/games/prismlauncher/files/patch-libraries_launcher_CMakeLists.txt b/games/prismlauncher/files/extra-patch-libraries_launcher_CMakeLists.txt similarity index 100% rename from games/prismlauncher/files/patch-libraries_launcher_CMakeLists.txt rename to games/prismlauncher/files/extra-patch-libraries_launcher_CMakeLists.txt