diff --git a/anda/games/prismlauncher-qt5/fix-disable-FLOAT16-in-toml.patch b/anda/games/prismlauncher-qt5/fix-disable-FLOAT16-in-toml.patch deleted file mode 100644 index 610cc1edc0..0000000000 --- a/anda/games/prismlauncher-qt5/fix-disable-FLOAT16-in-toml.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c1763cc4b0871230a86e58aad07aacaf7b19182c Mon Sep 17 00:00:00 2001 -From: Sefa Eyeoglu -Date: Tue, 15 Nov 2022 21:23:20 +0100 -Subject: [PATCH] fix: disable FLOAT16 in toml++ - -Signed-off-by: Sefa Eyeoglu ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0db05f98..8fc0d326 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,6 +70,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y") - - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_DISABLE_DEPRECATED_BEFORE=0x050C00") - -+# Fix aarch64 build for toml++ -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTOML_ENABLE_FLOAT16=0") -+ - # set CXXFLAGS for build targets - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELEASE}") - --- -2.38.1 - diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec index 158ceb65c1..72feee27f0 100644 --- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec +++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec @@ -1,5 +1,4 @@ %define real_name prismlauncher -%global tomlplusplus_commit 0a90913abf9390b9e08ab6d3b40ac11634553f38 %bcond_with qt6 # Change this variables if you want to use custom keys @@ -31,14 +30,12 @@ Name: prismlauncher-qt5 Version: 6.0 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Minecraft launcher with ability to manage multiple instances License: GPL-3.0-only Group: Amusements/Games URL: https://prismlauncher.org/ Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{real_name}-%{version}.tar.gz -Source1: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz -Patch0: fix-disable-FLOAT16-in-toml.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules @@ -87,10 +84,6 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep %autosetup -n PrismLauncher-%{version} -tar -xzf %{SOURCE1} -C libraries -rm -rf libraries/tomlplusplus/* -mv -f libraries/tomlplusplus-%{tomlplusplus_commit}/* libraries/tomlplusplus - # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt @@ -127,6 +120,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.Pri %post /usr/bin/update-desktop-database &> /dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : %postun @@ -134,11 +128,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.Pri if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : fi %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files @@ -149,12 +145,16 @@ fi %{_datadir}/%{real_name}/NewLaunch.jar %{_datadir}/%{real_name}/JavaCheck.jar %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop -%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg +%{_datadir}/mime/packages/modrinth-mrpack-mime.xml %{_mandir}/man?/prismlauncher.* +%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %changelog +* Mon Dec 12 2022 seth - 6.0-1 +- update to 6.0 + * Mon Dec 05 2022 seth - 5.2-3 - revise file to better follow fedora packaging guidelines and add java 8 as a dependency diff --git a/anda/games/prismlauncher/fix-disable-FLOAT16-in-toml.patch b/anda/games/prismlauncher/fix-disable-FLOAT16-in-toml.patch deleted file mode 100644 index 610cc1edc0..0000000000 --- a/anda/games/prismlauncher/fix-disable-FLOAT16-in-toml.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c1763cc4b0871230a86e58aad07aacaf7b19182c Mon Sep 17 00:00:00 2001 -From: Sefa Eyeoglu -Date: Tue, 15 Nov 2022 21:23:20 +0100 -Subject: [PATCH] fix: disable FLOAT16 in toml++ - -Signed-off-by: Sefa Eyeoglu ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0db05f98..8fc0d326 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,6 +70,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y") - - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_DISABLE_DEPRECATED_BEFORE=0x050C00") - -+# Fix aarch64 build for toml++ -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTOML_ENABLE_FLOAT16=0") -+ - # set CXXFLAGS for build targets - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELEASE}") - --- -2.38.1 - diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index e65dfc7f99..2b58621bd0 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -1,4 +1,3 @@ -%global tomlplusplus_commit 0a90913abf9390b9e08ab6d3b40ac11634553f38 %bcond_without qt6 # Change this variables if you want to use custom keys @@ -30,14 +29,12 @@ Name: prismlauncher Version: 6.0 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Minecraft launcher with ability to manage multiple instances License: GPL-3.0-only Group: Amusements/Games URL: https://prismlauncher.org/ Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz -Patch0: fix-disable-FLOAT16-in-toml.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules @@ -84,10 +81,6 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep %autosetup -n PrismLauncher-%{version} -tar -xzf %{SOURCE1} -C libraries -rm -rf libraries/tomlplusplus/* -mv -f libraries/tomlplusplus-%{tomlplusplus_commit}/* libraries/tomlplusplus - # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt @@ -124,6 +117,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.Pri %post /usr/bin/update-desktop-database &> /dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : %postun @@ -131,11 +125,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.Pri if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : fi %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files @@ -146,17 +142,20 @@ fi %{_datadir}/%{name}/NewLaunch.jar %{_datadir}/%{name}/JavaCheck.jar %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop -%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg +%{_datadir}/mime/packages/modrinth-mrpack-mime.xml %{_mandir}/man?/prismlauncher.* +%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %changelog +* Mon Dec 12 2022 seth - 6.0-1 +- update to 6.0 + * Mon Dec 05 2022 seth - 5.2-3 - revise file to better follow fedora packaging guidelines and add java 8 as a dependency - * Tue Nov 15 2022 seth - 5.2-2 - use newer version of toml++ to fix issues on aarch64