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}): use %conf, fix build, remove outdated if statements (#12023) (#12029)

Browse Source
This commit is contained in:
Raboneko
2026-05-06 23:20:59 -05:00
committed by GitHub
parent 542cd1469a
commit 74b1e952be
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
+5 -12
View File
@@ -37,11 +37,7 @@ BuildRequires: terra-appstream-helper
# 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: anda-srpm-macros
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -69,11 +65,6 @@ Requires(postun): desktop-file-utils
Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
# 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
@@ -98,7 +89,7 @@ multiple installations of Minecraft at once (Fork of MultiMC)
sed -i "s|\$ORIGIN/||" CMakeLists.txt
%build
%conf
%cmake \
-DLauncher_QT_VERSION_MAJOR="%{qt_version}" \
-DLauncher_BUILD_PLATFORM="%{build_platform}" \
@@ -111,8 +102,10 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
%if "%{curseforge_key}" != "default"
-DLauncher_CURSEFORGE_API_KEY="%{curseforge_key}" \
%endif
-DBUILD_TESTING=OFF
-DBUILD_TESTING=OFF \
-DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=sfinae-incomplete"
%build
%cmake_build
anda/games/prismlauncher/prismlauncher.spec
-9
View File
@@ -31,11 +31,7 @@ BuildRequires: gcc-c++
# 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: anda-srpm-macros
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -64,11 +60,6 @@ Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
Recommends: java-25-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