mirror of
https://github.com/terrapkg/packages.git
synced 2026-05-31 09:01:55 +00:00
* fix(prismlauncher/-nightly): add new dependency on vulkan-headers
also removes no longer requireed dependencies
* fix: files
---------
(cherry picked from commit 6ec988e354)
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Owen-sz <owen@fyralabs.com>
Co-authored-by: DioEgizio <dioegizio@protonmail.com>
Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
Co-authored-by: Owen-sz <owen@fyralabs.com>
This commit is contained in:
Raboneko
@@ -1,79 +0,0 @@
|
||||
From 5a38fc2c9a329e88c8337af541dfeccaeff1fefb Mon Sep 17 00:00:00 2001
|
||||
From: seth <getchoo@tuta.io>
|
||||
Date: Sun, 15 Jan 2023 14:47:49 -0500
|
||||
Subject: [PATCH] find cmark with pkgconfig
|
||||
|
||||
Signed-off-by: seth <getchoo@tuta.io>
|
||||
---
|
||||
cmake/Findcmark.cmake | 59 +++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 59 insertions(+)
|
||||
create mode 100755 cmake/Findcmark.cmake
|
||||
|
||||
diff --git a/cmake/Findcmark.cmake b/cmake/Findcmark.cmake
|
||||
new file mode 100755
|
||||
index 00000000..9858e5df
|
||||
--- /dev/null
|
||||
+++ b/cmake/Findcmark.cmake
|
||||
@@ -0,0 +1,59 @@
|
||||
+# SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
|
||||
+# SPDX-License-Identifier: GPL-3.0-only
|
||||
+
|
||||
+#
|
||||
+# CMake module to search for the cmark library
|
||||
+#
|
||||
+
|
||||
+# first try to find cmark-config.cmake
|
||||
+# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
|
||||
+find_package(cmark CONFIG QUIET)
|
||||
+if(cmark_FOUND AND TARGET cmark::cmark)
|
||||
+ # found it!
|
||||
+ return()
|
||||
+endif()
|
||||
+
|
||||
+find_package(PkgConfig QUIET)
|
||||
+if(PKG_CONFIG_FOUND)
|
||||
+ pkg_check_modules(PC_CMARK QUIET cmark)
|
||||
+endif()
|
||||
+
|
||||
+if(NOT CMARK_INCLUDE_DIR)
|
||||
+ find_path(CMARK_INCLUDE_DIR
|
||||
+ NAMES cmark.h
|
||||
+ PATHS
|
||||
+ ${PC_CMARK_INCLUDEDIR}
|
||||
+ ${PC_CMARK_INCLUDE_DIRS}
|
||||
+ /usr/include
|
||||
+ /usr/local/include)
|
||||
+endif()
|
||||
+
|
||||
+if(NOT CMARK_LIBRARY)
|
||||
+ find_library(CMARK_LIBRARY
|
||||
+ NAMES cmark
|
||||
+ HINTS
|
||||
+ ${PC_CMARK_LIBDIR}
|
||||
+ ${PC_CMARK_LIBRARY_DIRS}
|
||||
+ /usr/lib
|
||||
+ /usr/local/lib)
|
||||
+endif()
|
||||
+
|
||||
+if(NOT TARGET cmark::cmark)
|
||||
+ add_library(cmark::cmark UNKNOWN IMPORTED)
|
||||
+ set_target_properties(cmark::cmark
|
||||
+ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
|
||||
+ ${CMARK_INCLUDE_DIR})
|
||||
+ set_property(TARGET cmark::cmark APPEND
|
||||
+ PROPERTY IMPORTED_LOCATION ${CMARK_LIBRARY})
|
||||
+endif()
|
||||
+
|
||||
+include(FindPackageHandleStandardArgs)
|
||||
+find_package_handle_standard_args(cmark
|
||||
+ DEFAULT_MSG
|
||||
+ CMARK_INCLUDE_DIR
|
||||
+ CMARK_LIBRARY)
|
||||
+
|
||||
+mark_as_advanced(CMARK_LIBRARY CMARK_INCLUDE_DIR)
|
||||
+
|
||||
+set(CMARK_LIBRARIES ${CMARK_LIBRARY})
|
||||
+set(CMARK_INCLUDE_DIRS ${CMARK_INCLUDE_DIR})
|
||||
--
|
||||
2.39.0
|
||||
|
||||
@@ -26,7 +26,6 @@ Summary: Minecraft launcher with ability to manage multiple instances
|
||||
License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
|
||||
Group: Amusements/Games
|
||||
URL: https://prismlauncher.org/
|
||||
Patch0: 0001-find-cmark-with-pkgconfig.patch
|
||||
Source2: nightly.xml
|
||||
|
||||
BuildRequires: cmake >= 3.15
|
||||
@@ -47,7 +46,7 @@ BuildRequires: anda-srpm-macros
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: tomlplusplus-devel
|
||||
BuildRequires: cmake(ghc_filesystem)
|
||||
BuildRequires: vulkan-headers
|
||||
BuildRequires: pkgconfig(libqrencode)
|
||||
BuildRequires: pkgconfig(libarchive)
|
||||
BuildRequires: pkgconfig(gamemode)
|
||||
@@ -60,8 +59,6 @@ BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version}
|
||||
|
||||
BuildRequires: cmake(Qt6Core5Compat)
|
||||
|
||||
BuildRequires: pkgconfig(libcmark)
|
||||
BuildRequires: pkgconfig(scdoc)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
@@ -97,8 +94,6 @@ multiple installations of Minecraft at once (Fork of MultiMC)
|
||||
%prep
|
||||
%git_clone https://github.com/%{nice_name}/%{nice_name}.git %{commit}
|
||||
|
||||
rm -rf libraries/{extra-cmake-modules,zlib}/
|
||||
|
||||
# Do not set RPATH
|
||||
sed -i "s|\$ORIGIN/||" CMakeLists.txt
|
||||
|
||||
|
||||
@@ -39,7 +39,6 @@ BuildRequires: java-17-openjdk-devel
|
||||
BuildRequires: anda-srpm-macros
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: cmake(ghc_filesystem)
|
||||
BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version}
|
||||
@@ -49,12 +48,11 @@ BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
|
||||
BuildRequires: cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version}
|
||||
BuildRequires: tomlplusplus-devel
|
||||
BuildRequires: vulkan-headers
|
||||
BuildRequires: pkgconfig(libqrencode)
|
||||
BuildRequires: pkgconfig(libarchive)
|
||||
BuildRequires: pkgconfig(gamemode)
|
||||
|
||||
BuildRequires: cmake(Qt6Core5Compat)
|
||||
|
||||
BuildRequires: pkgconfig(libcmark)
|
||||
BuildRequires: pkgconfig(scdoc)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
@@ -90,8 +88,6 @@ multiple installations of Minecraft at once (Fork of MultiMC)
|
||||
%prep
|
||||
%autosetup -n PrismLauncher-%{version}
|
||||
|
||||
rm -rf libraries/{extra-cmake-modules,filesystem,zlib}
|
||||
|
||||
# Do not set RPATH
|
||||
sed -i "s|\$ORIGIN/||" CMakeLists.txt
|
||||
|
||||
|
||||
Reference in New Issue
Block a user