-
Notifications
You must be signed in to change notification settings - Fork 2.5k
PrismLauncher: update to 10.0.1; New package tomlplusplus #58431
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
srcpkgs/tomlplusplus/template
Outdated
| version=3.4.0 | ||
| revision=1 | ||
| build_style=meson | ||
| hostmakedepends="cmake" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does this actually need cmake? if so, it can probably use cmake-bootstrap
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like yes, and i was able to get it to work with cmake-bootstrap:
diff --git a/srcpkgs/tomlplusplus/template b/srcpkgs/tomlplusplus/template
index c57e564ec06..71c695cc55e 100644
--- a/srcpkgs/tomlplusplus/template
+++ b/srcpkgs/tomlplusplus/template
@@ -3,7 +3,7 @@ pkgname=tomlplusplus
version=3.4.0
revision=1
build_style=meson
-hostmakedepends="cmake"
+hostmakedepends="cmake-bootstrap"
short_desc="Header-only TOML config file parser and serializer for C++17"
maintainer="Cass Spencer <casscardboard@gmail.com>"
license="MIT"
@@ -11,6 +11,8 @@ homepage="https://marzer.github.io/tomlplusplus/"
distfiles="https://github.com/marzer/tomlplusplus/archive/refs/tags/v${version}.tar.gz"
checksum=8517f65938a4faae9ccf8ebb36631a38c1cadfb5efa85d9a72e15b9e97d25155
+PATH="$PATH:/usr/libexec/xbps-src/bin"
+
post_install() {
vlicense LICENSE
}There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, my power has been out for most of today so I haven’t been able to try that
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we need the CMake configuration (PrismLauncher should fall back to pkg-config if it can't find the CMake configuration), so another option is to just disable the generate_cmake_config meson option.
srcpkgs/tomlplusplus/template
Outdated
| revision=1 | ||
| build_style=meson | ||
| hostmakedepends="cmake" | ||
| short_desc="Header-only TOML config file parser and serializer for C++17" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| short_desc="Header-only TOML config file parser and serializer for C++17" | |
| short_desc="TOML config parser and serializer for C++" |
Cf. the masthead in the project README and the home page.
srcpkgs/tomlplusplus/template
Outdated
| version=3.4.0 | ||
| revision=1 | ||
| build_style=meson | ||
| hostmakedepends="cmake" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we need the CMake configuration (PrismLauncher should fall back to pkg-config if it can't find the CMake configuration), so another option is to just disable the generate_cmake_config meson option.
63aec15 to
aaf9d3c
Compare
srcpkgs/PrismLauncher/template
Outdated
| configure_args="-DLauncher_BUILD_PLATFORM=Void" | ||
| hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt6-tools qt6-base scdoc" | ||
| makedepends="qt6-base-devel qt6-qt5compat-devel zlib-devel quazip-qt6-devel qt6-networkauth-devel" | ||
| makedepends="qt6-base-devel qt6-qt5compat-devel zlib-devel quazip-qt6-devel qt6-networkauth-devel cmark-devel libgamemode-devel qrencode-devel libarchive-devel tomlplusplus-devel" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be wrapped at 80 characters.
srcpkgs/tomlplusplus/template
Outdated
| distfiles="https://github.com/marzer/tomlplusplus/archive/refs/tags/v${version}.tar.gz" | ||
| checksum=8517f65938a4faae9ccf8ebb36631a38c1cadfb5efa85d9a72e15b9e97d25155 | ||
|
|
||
| PATH="$PATH:/usr/libexec/xbps-src/bin" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should probably be inside pre_configure, or it will get appended several times. This will also suppress the lint complaints. You can even take advantage of bash to avoid repeating PATH.
| PATH="$PATH:/usr/libexec/xbps-src/bin" | |
| pre_configure() { | |
| PATH+=":/usr/libexec/xbps-src/bin" | |
| } |
aaf9d3c to
8b460cf
Compare
Testing the changes