Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prismlauncher{,-nightly}: use built-in java manager on f42 and above #2532

Closed
wants to merge 1 commit into from
Closed

prismlauncher{,-nightly}: use built-in java manager on f42 and above #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,16 @@ Patch0: 0001-find-cmark-with-pkgconfig.patch
BuildRequires: cmake >= 3.15
BuildRequires: extra-cmake-modules
BuildRequires: gcc-c++
# JDKs less than the most recent release & LTS are no longer in the default
# Fedora repositories
# Make sure you have Adoptium's repositories enabled
# https://fedoraproject.org/wiki/Changes/ThirdPartyLegacyJdks
# https://adoptium.net/installation/linux/#_centosrhelfedora_instructions
%if 0%{?fedora} > 41
BuildRequires: temurin-17-jdk
%else
BuildRequires: java-17-openjdk-devel
%endif
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: tomlplusplus-devel
Expand Down Expand Up @@ -78,8 +87,11 @@ Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
Recommends: java-21-openjdk
# See note above
%if 0%{?fedora} && 0%{?fedora} < 42
Recommends: java-17-openjdk
Suggests: java-1.8.0-openjdk
%endif

# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Recommends: xrandr
Expand Down Expand Up @@ -116,6 +128,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
%cmake \
-DLauncher_QT_VERSION_MAJOR="%{qt_version}" \
-DLauncher_BUILD_PLATFORM="%{build_platform}" \
%if 0%{?fedora} > 41
-DLauncher_ENABLE_JAVA_DOWNLOADER=ON \
%endif
%if "%{msa_id}" != "default"
-DLauncher_MSA_CLIENT_ID="%{msa_id}" \
%endif
Expand Down
15 changes: 15 additions & 0 deletions anda/games/prismlauncher/prismlauncher.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,16 @@ Source0: https://github.com/PrismLauncher/PrismLauncher/releases/downlo
BuildRequires: cmake >= 3.15
BuildRequires: extra-cmake-modules
BuildRequires: gcc-c++
# JDKs less than the most recent release & LTS are no longer in the default
# Fedora repositories
# Make sure you have Adoptium's repositories enabled
# https://fedoraproject.org/wiki/Changes/ThirdPartyLegacyJdks
# https://adoptium.net/installation/linux/#_centosrhelfedora_instructions
%if 0%{?fedora} > 41
BuildRequires: temurin-17-jdk
%else
BuildRequires: java-17-openjdk-devel
%endif
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: cmake(ghc_filesystem)
Expand Down Expand Up @@ -68,8 +77,11 @@ Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
Recommends: java-21-openjdk
# See note above
%if 0%{?fedora} && 0%{?fedora} < 42
Recommends: java-17-openjdk
Suggests: java-1.8.0-openjdk
%endif

# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Recommends: xrandr
Expand Down Expand Up @@ -101,6 +113,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
%cmake \
-DLauncher_QT_VERSION_MAJOR="%{qt_version}" \
-DLauncher_BUILD_PLATFORM="%{build_platform}" \
%if 0%{?fedora} > 41
-DLauncher_ENABLE_JAVA_DOWNLOADER=ON \
%endif
%if "%{msa_id}" != "default"
-DLauncher_MSA_CLIENT_ID="%{msa_id}" \
%endif
Expand Down
Loading