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

fix: prismlauncher-nightly #2467

Merged
merged 5 commits into from
Dec 10, 2024
Merged

fix: prismlauncher-nightly #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e800bbd
fix: prismlauncher-nightly
madonuko Nov 6, 2024
2352bc2
Merge branch 'frawhide' into mado/fix/prismlauncher-nightly
madonuko Nov 22, 2024
9548cf8
update libnbtplusplus
madonuko Nov 22, 2024
98db7c3
fix nightly and non-nightly prismlauncher
madonuko Dec 10, 2024
11c80d4
Delete 2532.patch
madonuko Dec 10, 2024
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
1 change: 1 addition & 0 deletions anda/games/prismlauncher-nightly/anda.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
project pkg {
rpm {
spec = "prismlauncher-nightly.spec"
extra_repos = ["https://packages.adoptium.net/artifactory/rpm/fedora/\\$releasever/\\$basearch"]
}
labels {
nightly = "1"
Expand Down
18 changes: 16 additions & 2 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 @@ -3,7 +3,7 @@

%global commit 79dd912126a3eb498b6cc19575f4d4cfc935978b
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
%global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad

%global commit_date 20241121
%global snapshot_info %{commit_date}.%{shortcommit}
Expand Down 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 @@ -77,9 +86,11 @@ Requires(postun): desktop-file-utils
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 +127,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
1 change: 1 addition & 0 deletions anda/games/prismlauncher/anda.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
project pkg {
rpm {
spec = "prismlauncher.spec"
extra_repos = ["https://packages.adoptium.net/artifactory/rpm/fedora/\\$releasever/\\$basearch"]
}
}
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