funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-05-31 09:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prismlauncher-nightly (#2467) (#2595)

Browse Source 
* fix: prismlauncher-nightly

Signed-off-by: madomado <madonuko@outlook.com>

* update libnbtplusplus

thanks to #2511!

Signed-off-by: madomado <madonuko@outlook.com>

* fix nightly and non-nightly prismlauncher

* Delete 2532.patch

Signed-off-by: madomado <madonuko@outlook.com>

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 81a0cd8da0)

Co-authored-by: madomado <madonuko@outlook.com>
This commit is contained in:
Raboneko
2024-12-10 09:43:26 -08:00
committed by GitHub
parent 7de2c50ad7
commit e30717802c
4 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anda/games/prismlauncher-nightly/anda.hcl
+1
View File
@@ -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"
anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
+16 -2
View File
@@ -3,7 +3,7 @@
%global commit 01015a7345cf6c23aed417068dec43a341d87d0e
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
%global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad
%global commit_date 20240909
%global snapshot_info %{commit_date}.%{shortcommit}
@@ -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
@@ -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
@@ -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
anda/games/prismlauncher/anda.hcl
+1
View File
@@ -1,5 +1,6 @@
project pkg {
rpm {
spec = "prismlauncher.spec"
extra_repos = ["https://packages.adoptium.net/artifactory/rpm/fedora/\\$releasever/\\$basearch"]
}
}
anda/games/prismlauncher/prismlauncher.spec
+15
View File
@@ -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)
@@ -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
@@ -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