diff --git a/anda/prismlauncher/change-jars-path.patch b/anda/prismlauncher/change-jars-path.patch new file mode 100755 index 0000000000..5ee37c58ad --- /dev/null +++ b/anda/prismlauncher/change-jars-path.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48411175..5bd7e0dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -250,7 +250,7 @@ if(UNIX AND APPLE) + elseif(UNIX) + set(BINARY_DEST_DIR "bin") + set(LIBRARY_DEST_DIR "lib${LIB_SUFFIX}") +- set(JARS_DEST_DIR "share/jars") ++ set(JARS_DEST_DIR "share/prismlauncher") + set(LAUNCHER_DESKTOP_DEST_DIR "share/applications" CACHE STRING "Path to the desktop file directory") + set(LAUNCHER_METAINFO_DEST_DIR "share/metainfo" CACHE STRING "Path to the metainfo directory") + set(LAUNCHER_ICON_DEST_DIR "share/icons/hicolor/scalable/apps" CACHE STRING "Path to the scalable icon directory") +diff --git a/launcher/Application.cpp b/launcher/Application.cpp +index 2bd91fd7..9597977c 100644 +--- a/launcher/Application.cpp ++++ b/launcher/Application.cpp +@@ -1578,7 +1578,7 @@ QString Application::getJarPath(QString jarFile) + { + QStringList potentialPaths = { + #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) +- FS::PathCombine(m_rootPath, "share/jars"), ++ FS::PathCombine(m_rootPath, "share/prismlauncher"), + #endif + FS::PathCombine(m_rootPath, "jars"), + FS::PathCombine(applicationDirPath(), "jars") diff --git a/anda/prismlauncher/prismlauncher.spec b/anda/prismlauncher/prismlauncher.spec index 1feed91a65..4a950e8384 100644 --- a/anda/prismlauncher/prismlauncher.spec +++ b/anda/prismlauncher/prismlauncher.spec @@ -27,7 +27,7 @@ Name: prismlauncher Version: 5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Minecraft launcher with ability to manage multiple instances License: GPL-3.0-only URL: https://prismlauncher.org/ @@ -60,8 +60,8 @@ BuildRequires: zlib-devel BuildRequires: cmake(QuaZip-Qt%{qt_version}) %endif %if 0%{?suse_version} -Requires: qt%{qt_version}-imageformats -Requires: qt%{qt_version}-svg +Requires: %{!?with qt6:lib}qt%{qt_version}-%{!?with qt6:qt}imageformats +Requires: libQt%{qt_version}Svg%{qt_version} %else Requires: qt%{qt_version}-qtimageformats Requires: qt%{qt_version}-qtsvg @@ -120,6 +120,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.Pri %changelog +* Wed Oct 19 2022 seth - 5.0-4 +- fix opensuse deps + * Wed Oct 19 2022 seth - 5.0-3 - add missing deps and build with qt6 by default