Merge branch 'master' of https://github.com/void-linux/void-packages
This commit is contained in:
commit
b201d99a28
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'Solaar'
|
||||
pkgname=Solaar
|
||||
version=1.1.12
|
||||
version=1.1.13
|
||||
revision=1
|
||||
build_style=python3-pep517
|
||||
hostmakedepends="python3-setuptools python3-wheel"
|
||||
|
|
@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://pwr-solaar.github.io/Solaar/"
|
||||
changelog="https://raw.githubusercontent.com/pwr-Solaar/Solaar/master/CHANGELOG.md"
|
||||
distfiles="https://github.com/pwr-Solaar/Solaar/archive/refs/tags/${version}.tar.gz"
|
||||
checksum=2abe9b994aa8306adc9955544bc5e953c98e20da9df03f559e9d2d3d8e2f1c8c
|
||||
checksum=54cfff1240192e9200400cbe06d2427f1ea41c76f77afafa2dd3fc5d03395adc
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'SweetHome3D'
|
||||
pkgname=SweetHome3D
|
||||
version=7.2
|
||||
version=7.3
|
||||
revision=1
|
||||
archs="i686 x86_64"
|
||||
hostmakedepends="unzip which"
|
||||
|
|
@ -11,7 +11,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
|
|||
license="GPL-2.0-or-later"
|
||||
homepage="https://www.sweethome3d.com"
|
||||
distfiles="${SOURCEFORGE_SITE}/sweethome3d/SweetHome3D-${version}-src.zip"
|
||||
checksum=228dc77eeb2c7d2cba08b1c4d0908093482304095afeefa94b519a9fc071a336
|
||||
checksum=8eaab3f269181077a26768cbd977fead72a04666325d201e1ea79949f6db70c3
|
||||
|
||||
do_build() {
|
||||
ant application textures furniture examples help java3dLibraries
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
only run system_time_conversions() test on 64bit systems.
|
||||
it fails on 32bit systems with
|
||||
|
||||
---- time_store::test::system_time_conversions stdout ----
|
||||
thread 'time_store::test::system_time_conversions' panicked at crates/tor-hsservice/src/time_store.rs:524:38:
|
||||
2038-01-19T03:14:08Z: OutOfRange
|
||||
|
||||
diff --git a/crates/tor-hsservice/src/time_store.rs b/crates/tor-hsservice/src/time_store.rs
|
||||
index d63d6f015..fafe806d0 100644
|
||||
--- a/crates/tor-hsservice/src/time_store.rs
|
||||
+++ b/crates/tor-hsservice/src/time_store.rs
|
||||
@@ -515,6 +515,7 @@ mod test {
|
||||
assert_eq!(e, FutureTimestamp::from_str("T+23kg"));
|
||||
}
|
||||
|
||||
+ #[cfg(target_pointer_width = "64")]
|
||||
#[test]
|
||||
#[allow(clippy::unusual_byte_groupings)] // we want them to line up, dammit!
|
||||
fn system_time_conversions() {
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'arti'
|
||||
pkgname=arti
|
||||
version=1.1.10
|
||||
version=1.2.3
|
||||
revision=1
|
||||
archs="x86_64* i686* aarch64* arm*" # ring
|
||||
build_style=cargo
|
||||
|
|
@ -13,18 +13,9 @@ license="Apache-2.0, MIT"
|
|||
homepage="https://gitlab.torproject.org/tpo/core/arti"
|
||||
changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
|
||||
distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
|
||||
checksum=bb7f18385022b616fb0fb04c61b890441524eaa884def1eef3c581b711814842
|
||||
|
||||
if [ "$XBPS_CHECK_PKGS" ]; then
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
# Disable LTO for i686 because otherwise tests fail with:
|
||||
# ---- src/address.rs - address::TorAddr (line 79) stdout ----
|
||||
# error: ran out of registers during register allocation
|
||||
# LLVM ERROR: Cannot emit physreg copy instruction
|
||||
i686*) export CARGO_PROFILE_RELEASE_LTO=false ;;
|
||||
esac
|
||||
fi
|
||||
checksum=2cfbbc6aa203e0203f773158c4994ee0d55f7213c488281febeef9a15e25aec4
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE-MIT
|
||||
vdoc crates/arti/src/arti-example-config.toml
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'cargo-bootstrap'
|
||||
pkgname=cargo-bootstrap
|
||||
version=1.77.1
|
||||
version=1.78.0
|
||||
revision=1
|
||||
short_desc="Bootstrap binaries of Rust package manager"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
|
|
@ -24,15 +24,15 @@ esac
|
|||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686)
|
||||
distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
|
||||
checksum="3fe49c81296a64c51b69ddbeecbdf12e12e41eb9ca636e75b4bc372ae09858ee"
|
||||
checksum="472230d0a04c6a2db80671549cb970176299817883dafbffb15c993f5aeaa909"
|
||||
;;
|
||||
x86_64)
|
||||
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
|
||||
checksum="87713287303cbb44d89d839ade3de7fe679fcadfe4688a9c6829c276a7946e79"
|
||||
checksum="f8aacf7a101eb10dc000b8bf26de90a9d0ce678d02ccf70430ed20dd31ecec6b"
|
||||
;;
|
||||
x86_64-musl)
|
||||
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
|
||||
checksum="d5ff9700b75c908ba0a1048386d0151414ad161da01d640c850b1955695b175f"
|
||||
checksum="681721c1b07014c346f1114ed800e5f5c5eb64a7a22d808f8c0bbc5616374fa6"
|
||||
;;
|
||||
# placeholders for user-supplied distfiles
|
||||
ppc64le)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Template file for 'cargo'
|
||||
pkgname=cargo
|
||||
version=1.77.1
|
||||
version=1.78.0
|
||||
revision=1
|
||||
_cargo_revision=0.78.1
|
||||
_cargo_revision=0.79.0
|
||||
build_helper=rust
|
||||
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
|
||||
makedepends="rust libcurl-devel openssl-devel"
|
||||
|
|
@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
|
|||
license="MIT, Apache-2.0"
|
||||
homepage="https://crates.io/"
|
||||
distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz"
|
||||
checksum=0283fecebb6d3cbd111688eb0359edaf6676f4b2829201a8afe5a0e3afdb4b48
|
||||
checksum=b9de52bc7452fd74ab344b636f054de3e9a67cf167567cc4ce948e9219e81d98
|
||||
replaces="cargo-tree>=0"
|
||||
|
||||
build_options="static bindist"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'chroma'
|
||||
pkgname=chroma
|
||||
version=2.13.0
|
||||
version=2.14.0
|
||||
revision=1
|
||||
build_wrksrc="cmd/chroma"
|
||||
build_style=go
|
||||
|
|
@ -11,7 +11,7 @@ maintainer="Daniel Lewan <daniel@teddydd.me>"
|
|||
license="MIT"
|
||||
homepage="https://github.com/alecthomas/chroma"
|
||||
distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
|
||||
checksum=f3538d9db5df0d0325f3eaab7e3d465a6ec9ad6067051863ac52241f070824a0
|
||||
checksum=beff1d23ee8343c66f62aa30f1f18da5813018dcdff147f3ac4bdd734a908821
|
||||
|
||||
do_check() {
|
||||
go test -v
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'conky'
|
||||
pkgname=conky
|
||||
version=1.19.6
|
||||
version=1.21.1
|
||||
revision=1
|
||||
build_style=cmake
|
||||
conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
|
||||
|
|
@ -9,7 +9,7 @@ configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
|
|||
-DBUILD_RSS=ON -DBUILD_WLAN=ON -DBUILD_X11=ON -DBUILD_XDBE=ON
|
||||
-DBUILD_IMLIB2=ON -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON
|
||||
-DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=ON"
|
||||
hostmakedepends="libtool pkg-config docbook2x man-db toluapp"
|
||||
hostmakedepends="libtool pkg-config docbook2x man-db toluapp gperf"
|
||||
makedepends="alsa-lib-devel imlib2-devel libXdamage-devel libXft-devel
|
||||
libXinerama-devel libcurl-devel librsvg-devel lua53-devel ncurses-devel
|
||||
toluapp-devel wireless_tools-devel cairo-devel wayland-devel"
|
||||
|
|
@ -19,8 +19,8 @@ license="BSD-3-Clause, GPL-3.0-or-later"
|
|||
homepage="https://github.com/brndnmtthws/conky"
|
||||
distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz
|
||||
https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
|
||||
checksum="1bf5868da44056badd4718a3c8dcc6905f7118a9f86e785b354a8ecdb157a59e
|
||||
b733aa2a7fcf53b32464defa10b0f15561ec6c9a948a4ed21e76874c693ac570"
|
||||
checksum="dccfee01fc208c4fde2bfb7c39c0fdc692d82de0f94e733ddf22e1199969bc5d
|
||||
99d620b1c4e02511f4a34d8cd6f69058fdc111eeb9f71c74fd88752380edc8b1"
|
||||
|
||||
post_extract() {
|
||||
mv conky-*/* .
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'crun'
|
||||
pkgname=crun
|
||||
version=1.14.4
|
||||
version=1.15
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-systemd"
|
||||
|
|
@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
|
|||
homepage="https://github.com/containers/crun"
|
||||
changelog="https://raw.githubusercontent.com/containers/crun/main/NEWS"
|
||||
distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
|
||||
checksum=5527013bfdac4001f242fbc3b544d01837d942f426fdefcc296f0d271594eeb4
|
||||
checksum=a03ba1e58b8823ae77d010024b43bd94c5a99f7d652257b1b23abd2d2cdb087f
|
||||
# most of the tests don't work inside a container
|
||||
make_check=no
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'flannel'
|
||||
pkgname=flannel
|
||||
version=0.25.1
|
||||
version=0.25.2
|
||||
revision=1
|
||||
build_style=go
|
||||
go_mod_mode=off
|
||||
|
|
@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
|||
license="Apache-2.0"
|
||||
homepage="https://github.com/flannel-io/flannel"
|
||||
distfiles="https://github.com/flannel-io/flannel/archive/v${version}.tar.gz"
|
||||
checksum=0249095daa96e638a2b95a3c2706cb53e5f596c33380e82529890d012c51aa2c
|
||||
checksum=bf30d9eaed7aea8dbae8ab56358509ead33fa05ce63ccd4bffc6a6a117112ceb
|
||||
|
||||
post_install() {
|
||||
vsv flannel
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'focuswriter'
|
||||
pkgname=focuswriter
|
||||
version=1.8.7
|
||||
version=1.8.8
|
||||
revision=1
|
||||
build_style=cmake
|
||||
hostmakedepends="pkg-config qt6-tools qt6-base"
|
||||
|
|
@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
|
|||
license="GPL-3.0-or-later"
|
||||
homepage="https://gottcode.org/focuswriter/"
|
||||
distfiles="https://github.com/gottcode/focuswriter/archive/v${version}.tar.gz"
|
||||
checksum=aa14804256ba17a9be7ce3b401855ff83b484e4af670b53233dec6b6a096ef05
|
||||
checksum=1dfa49cd02df8847cd5e785693cefb9e67fd9ad2e44d9b580d46e484b147c60a
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'fribidi'
|
||||
pkgname=fribidi
|
||||
version=1.0.13
|
||||
version=1.0.14
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
|
|
@ -10,7 +10,7 @@ license="LGPL-2.1-or-later"
|
|||
homepage="https://github.com/fribidi/fribidi/"
|
||||
changelog="https://raw.githubusercontent.com/fribidi/fribidi/master/NEWS"
|
||||
distfiles="https://github.com/fribidi/fribidi/releases/download/v${version}/fribidi-${version}.tar.xz"
|
||||
checksum=7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2
|
||||
checksum=76ae204a7027652ac3981b9fa5817c083ba23114340284c58e756b259cd2259a
|
||||
|
||||
pre_build() {
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gitoxide'
|
||||
pkgname=gitoxide
|
||||
version=0.35.0
|
||||
version=0.36.0
|
||||
revision=1
|
||||
build_style=cargo
|
||||
build_helper=qemu
|
||||
|
|
@ -12,7 +12,7 @@ license="MIT, Apache-2.0"
|
|||
homepage="https://github.com/Byron/gitoxide"
|
||||
changelog="https://github.com/Byron/gitoxide/raw/main/CHANGELOG.md"
|
||||
distfiles="https://github.com/Byron/gitoxide/archive/refs/tags/v${version}.tar.gz"
|
||||
checksum=4f074b30830ff37da8ae9de11b0441addea9f1552f0fcac1fa6fb56435d5bbea
|
||||
checksum=36142c7388c68732a953fcfd9dcd609241b1d9a5d2fdb2e796e987b6b6872fa7
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE-APACHE
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'gparted'
|
||||
pkgname=gparted
|
||||
version=1.5.0
|
||||
version=1.6.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-libparted-dmraid"
|
||||
|
|
@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
|||
license="GPL-2.0-or-later"
|
||||
homepage="https://gparted.sourceforge.io"
|
||||
distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
|
||||
checksum=3c95ea26a944083ff1d9b17639b1e2ad9758df225dc751ff407b2a6aa092a8de
|
||||
checksum=9b9f51b3ce494ddcb59a55e1ae6679c09436604e331dbf5a536d60ded6c6ea5b
|
||||
disable_parallel_check=true
|
||||
|
||||
# Some tests are known to fail in CI since 1.1.0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,110 @@
|
|||
diff --git a/libraries/lzma/C/Threads.c b/libraries/lzma/C/Threads.c
|
||||
index cf52bd3..86a5cee 100644
|
||||
--- a/libraries/lzma/C/Threads.c
|
||||
+++ b/libraries/lzma/C/Threads.c
|
||||
@@ -67,12 +67,12 @@ WRes Thread_Create(CThread *p, THREAD_FUNC_TYPE func, LPVOID param)
|
||||
|
||||
DWORD threadId;
|
||||
*p = CreateThread(NULL, 0, func, param, 0, &threadId);
|
||||
-
|
||||
+
|
||||
#else
|
||||
-
|
||||
+
|
||||
unsigned threadId;
|
||||
*p = (HANDLE)(_beginthreadex(NULL, 0, func, param, 0, &threadId));
|
||||
-
|
||||
+
|
||||
#endif
|
||||
|
||||
/* maybe we must use errno here, but probably GetLastError() is also OK. */
|
||||
@@ -86,9 +86,9 @@ WRes Thread_Create_With_Affinity(CThread *p, THREAD_FUNC_TYPE func, LPVOID param
|
||||
|
||||
UNUSED_VAR(affinity)
|
||||
return Thread_Create(p, func, param);
|
||||
-
|
||||
+
|
||||
#else
|
||||
-
|
||||
+
|
||||
/* Windows Me/98/95: threadId parameter may not be NULL in _beginthreadex/CreateThread functions */
|
||||
HANDLE h;
|
||||
WRes wres;
|
||||
@@ -245,7 +245,7 @@ WRes Thread_Create_With_CpuSet(CThread *p, THREAD_FUNC_TYPE func, LPVOID param,
|
||||
if (cpuSet)
|
||||
{
|
||||
#ifdef Z7_AFFINITY_SUPPORTED
|
||||
-
|
||||
+
|
||||
/*
|
||||
printf("\n affinity :");
|
||||
unsigned i;
|
||||
@@ -265,13 +265,13 @@ WRes Thread_Create_With_CpuSet(CThread *p, THREAD_FUNC_TYPE func, LPVOID param,
|
||||
*/
|
||||
|
||||
// ret2 =
|
||||
- pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
|
||||
+ pthread_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
|
||||
// if (ret2) ret = ret2;
|
||||
#endif
|
||||
}
|
||||
-
|
||||
+
|
||||
ret = pthread_create(&p->_tid, &attr, func, param);
|
||||
-
|
||||
+
|
||||
if (!ret)
|
||||
{
|
||||
p->_created = 1;
|
||||
@@ -324,7 +324,7 @@ WRes Thread_Close(CThread *p)
|
||||
int ret;
|
||||
if (!p->_created)
|
||||
return 0;
|
||||
-
|
||||
+
|
||||
ret = pthread_detach(p->_tid);
|
||||
p->_tid = 0;
|
||||
p->_created = 0;
|
||||
@@ -384,7 +384,7 @@ WRes Event_Reset(CEvent *p)
|
||||
p->_state = False;
|
||||
return pthread_mutex_unlock(&p->_mutex);
|
||||
}
|
||||
-
|
||||
+
|
||||
WRes Event_Wait(CEvent *p)
|
||||
{
|
||||
RINOK(pthread_mutex_lock(&p->_mutex))
|
||||
diff --git a/libraries/lzma/C/Threads.h b/libraries/lzma/C/Threads.h
|
||||
index 4028464..86b0687 100644
|
||||
--- a/libraries/lzma/C/Threads.h
|
||||
+++ b/libraries/lzma/C/Threads.h
|
||||
@@ -4,6 +4,10 @@
|
||||
#ifndef ZIP7_INC_THREADS_H
|
||||
#define ZIP7_INC_THREADS_H
|
||||
|
||||
+#ifndef _GNU_SOURCE
|
||||
+#define _GNU_SOURCE /* Required for musl to expose cpu_set_t */
|
||||
+#endif
|
||||
+
|
||||
#ifdef _WIN32
|
||||
#include "7zWindows.h"
|
||||
|
||||
@@ -108,15 +112,15 @@ typedef UInt64 CCpuSet;
|
||||
But only root function main() contains instructions that
|
||||
set 16-byte alignment for stack pointer. And another functions
|
||||
just keep alignment, if it was set in some parent function.
|
||||
-
|
||||
+
|
||||
The problem:
|
||||
if we create new thread in MinGW (GCC) 32-bit x86 via _beginthreadex() or CreateThread(),
|
||||
the root function of thread doesn't set 16-byte alignment.
|
||||
And stack frames in all child functions also will be unaligned in that case.
|
||||
-
|
||||
+
|
||||
Here we set (force_align_arg_pointer) attribute for root function of new thread.
|
||||
Do we need (force_align_arg_pointer) also for another systems? */
|
||||
-
|
||||
+
|
||||
#define THREAD_FUNC_ATTRIB_ALIGN_ARG __attribute__((force_align_arg_pointer))
|
||||
// #define THREAD_FUNC_ATTRIB_ALIGN_ARG // for debug : bad alignment in SSE functions
|
||||
#else
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'gzdoom'
|
||||
pkgname=gzdoom
|
||||
version=4.11.3
|
||||
revision=2
|
||||
version=4.12.2
|
||||
revision=1
|
||||
archs="x86_64* aarch64*"
|
||||
build_style=cmake
|
||||
configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
|
||||
|
|
@ -14,8 +14,8 @@ homepage="https://www.zdoom.org"
|
|||
# WARNING: watch out for new submodules
|
||||
distfiles="https://github.com/ZDoom/gzdoom/archive/g${version}.tar.gz
|
||||
https://github.com/ZDoom/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb"
|
||||
checksum="5943dba50da20ff94f1fcc415132672d42a15917c571b1c2b7ceefe14935f5d5
|
||||
4c544d243dc15fc22000a3b6eabd83fd70f87ea63205a14ff04254c092f74642"
|
||||
checksum="864c5a1ec976dd6068f9cd93f92c5404c662824996101f1411ddb25a54afc732
|
||||
c173bcbf8a3e6a4885b6f5d75173160af3a2344c290bc342a3542dcc0a283475"
|
||||
skip_extraction="${pkgname}_${version}_amd64.deb"
|
||||
nocross=yes
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'hopper'
|
||||
pkgname=hopper
|
||||
version=5.15.4
|
||||
version=5.15.5
|
||||
revision=1
|
||||
_build=1
|
||||
create_wrksrc=yes
|
||||
|
|
@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
|||
license="custom:EULA"
|
||||
homepage="https://www.hopperapp.com"
|
||||
distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux-demo.pkg.tar.xz"
|
||||
checksum=0040a2ba49c88bc4376ec2f8e1d9690e0a69845e08bc0a0f2ee79009a4975f27
|
||||
checksum=3c9cc6fbb72a25d7c9f5c97ed627998041b4c9dfb27f7b8d84788a5dd7b74d18
|
||||
|
||||
archs="x86_64"
|
||||
restricted=yes
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
From 6110e9c82d8ba830c3440f36b990483ceaaea52c Mon Sep 17 00:00:00 2001
|
||||
From: Ed Maste <emaste@freebsd.org>
|
||||
Date: Fri, 29 Mar 2024 18:02:06 -0400
|
||||
Subject: [PATCH] tar: make error reporting more robust and use correct errno
|
||||
(#2101)
|
||||
|
||||
As discussed in #1609.
|
||||
---
|
||||
tar/read.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tar/read.c b/tar/read.c
|
||||
index af3d3f423daff024791465bb9976a9b9a74b91ad..a7f14a07bb35602256b732cf3de96892e4280523 100644
|
||||
--- a/tar/read.c
|
||||
+++ b/tar/read.c
|
||||
@@ -371,8 +371,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer)
|
||||
if (r != ARCHIVE_OK) {
|
||||
if (!bsdtar->verbose)
|
||||
safe_fprintf(stderr, "%s", archive_entry_pathname(entry));
|
||||
- fprintf(stderr, ": %s: ", archive_error_string(a));
|
||||
- fprintf(stderr, "%s", strerror(errno));
|
||||
+ safe_fprintf(stderr, ": %s: %s",
|
||||
+ archive_error_string(a),
|
||||
+ strerror(archive_errno(a)));
|
||||
if (!bsdtar->verbose)
|
||||
fprintf(stderr, "\n");
|
||||
bsdtar->return_value = 1;
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 3bd918d92f8c34ba12de9c6604d96f9e262a59fc Mon Sep 17 00:00:00 2001
|
||||
From: Martin Matuska <martin@matuska.de>
|
||||
Date: Tue, 12 Sep 2023 08:54:47 +0200
|
||||
Subject: [PATCH] tests: fix zstd long option test for 32-bit architectures
|
||||
|
||||
Fixes #1968
|
||||
---
|
||||
Upstream commit: https://github.com/libarchive/libarchive/commit/3bd918d92f8c34ba12de9c6604d96f9e262a59fc
|
||||
|
||||
libarchive/test/test_write_filter_zstd.c | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libarchive/test/test_write_filter_zstd.c b/libarchive/test/test_write_filter_zstd.c
|
||||
index 3cdbd812a..c9731f1b6 100644
|
||||
--- a/libarchive/test/test_write_filter_zstd.c
|
||||
+++ b/libarchive/test/test_write_filter_zstd.c
|
||||
@@ -161,8 +161,12 @@ DEFINE_TEST(test_write_filter_zstd)
|
||||
archive_write_set_filter_option(a, NULL, "max-frame-size", "1048576"));
|
||||
#endif
|
||||
#if ZSTD_VERSION_NUMBER >= MINVER_LONG
|
||||
- assertEqualIntA(a, ARCHIVE_OK,
|
||||
- archive_write_set_filter_option(a, NULL, "long", "27"));
|
||||
+ if ((int)(sizeof(size_t) == 4))
|
||||
+ assertEqualIntA(a, ARCHIVE_OK,
|
||||
+ archive_write_set_filter_option(a, NULL, "long", "26"));
|
||||
+ else
|
||||
+ assertEqualIntA(a, ARCHIVE_OK,
|
||||
+ archive_write_set_filter_option(a, NULL, "long", "27"));
|
||||
assertEqualIntA(a, ARCHIVE_FAILED,
|
||||
archive_write_set_filter_option(a, NULL, "long", "-1")); /* negative */
|
||||
#endif
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'libarchive'
|
||||
pkgname=libarchive
|
||||
version=3.7.2
|
||||
revision=3
|
||||
version=3.7.4
|
||||
revision=1
|
||||
bootstrap=yes
|
||||
build_style=gnu-configure
|
||||
configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
|
||||
|
|
@ -15,10 +15,10 @@ makedepends="zlib-devel bzip2-devel liblzma-devel
|
|||
short_desc="Library to read/write several different streaming archive formats"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="BSD-2-Clause"
|
||||
homepage="http://www.libarchive.org/"
|
||||
homepage="https://www.libarchive.org/"
|
||||
changelog="https://github.com/libarchive/libarchive/releases"
|
||||
distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.xz"
|
||||
checksum=04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb
|
||||
checksum=f887755c434a736a609cbd28d87ddbfbe9d6a3bb5b703c22c02f6af80a802735
|
||||
|
||||
build_options="acl expat lzo lz4 ssl zstd"
|
||||
build_options_default="acl ssl lz4 zstd"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'libblockdev'
|
||||
pkgname=libblockdev
|
||||
version=3.1.0
|
||||
version=3.1.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
make_check_target="test"
|
||||
|
|
@ -16,7 +16,7 @@ homepage="https://github.com/storaged-project/libblockdev"
|
|||
# changelog needs to be adjusted on major version changes
|
||||
changelog="https://raw.githubusercontent.com/storaged-project/libblockdev/master/NEWS.rst"
|
||||
distfiles="https://github.com/storaged-project/libblockdev/releases/download/${version}-1/libblockdev-${version}.tar.gz"
|
||||
checksum=41e4af66c9d78e795302d37825dfd88a4970f82da7b4ebe6487feba2afae44fb
|
||||
checksum=a5cb33a53ff5969067982704f45399d02555fdb2313ed0c56eac9555397dc2db
|
||||
conf_files="/etc/libblockdev/3/conf.d/10-lvm-dbus.cfg
|
||||
/etc/libblockdev/3/conf.d/00-default.cfg"
|
||||
# Requires root.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'libcap'
|
||||
pkgname=libcap
|
||||
version=2.69
|
||||
revision=2
|
||||
version=2.70
|
||||
revision=1
|
||||
bootstrap=yes
|
||||
build_style=gnu-makefile
|
||||
make_build_args="GOLANG=no"
|
||||
|
|
@ -13,7 +13,7 @@ license="GPL-2.0-only, BSD-3-Clause"
|
|||
homepage="https://sites.google.com/site/fullycapable/"
|
||||
changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
|
||||
distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/libcap-${version}.tar.xz"
|
||||
checksum=f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb
|
||||
checksum=23a6ef8aadaf1e3e875f633bb2d116cfef8952dba7bc7c569b13458e1952b30f
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
make_build_args+=" CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'libgcrypt'
|
||||
pkgname=libgcrypt
|
||||
version=1.10.2
|
||||
version=1.10.3
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-static --without-capabilities"
|
||||
|
|
@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
|
|||
license="LGPL-2.1-or-later"
|
||||
homepage="https://www.gnupg.org"
|
||||
distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2"
|
||||
checksum=3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03
|
||||
checksum=8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
configure_args+=" ac_cv_sys_symbol_underscore=no"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'libwacom'
|
||||
pkgname=libwacom
|
||||
version=2.10.0
|
||||
version=2.11.0
|
||||
revision=1
|
||||
build_style=meson
|
||||
configure_args="-Ddocumentation=disabled"
|
||||
|
|
@ -13,7 +13,7 @@ license="MIT"
|
|||
homepage="https://github.com/linuxwacom/libwacom"
|
||||
changelog="https://raw.githubusercontent.com/linuxwacom/libwacom/master/NEWS"
|
||||
distfiles="https://github.com/linuxwacom/libwacom/releases/download/libwacom-${version}/libwacom-${version}.tar.xz"
|
||||
checksum=3f8ef37de78ac3d08af1bdcb5d5828ec8284dcb7154bbec4995238728914aa0e
|
||||
checksum=b03f991ec82c543a42386274e1290c326934e4f25246dc3789ca3037c7181344
|
||||
|
||||
if [ -z "$CROSS_BUILD" ] && [ "${XBPS_CHECK_PKGS}" ]; then
|
||||
configure_args+=" -Dtests=enabled"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'lswt'
|
||||
pkgname=lswt
|
||||
version=1.0.4
|
||||
version=2.0.0
|
||||
revision=1
|
||||
build_style=gnu-makefile
|
||||
hostmakedepends="wayland-devel"
|
||||
|
|
@ -10,4 +10,4 @@ maintainer="icp <pangolin@vivaldi.net>"
|
|||
license="GPL-3.0-only"
|
||||
homepage="https://git.sr.ht/~leon_plickat/lswt"
|
||||
distfiles="https://git.sr.ht/~leon_plickat/lswt/archive/v${version}.tar.gz"
|
||||
checksum=a1a422d996e9dbfa2d07daf5588ede280157ab0d0cc7e918d7c16999f4e14b5f
|
||||
checksum=8e23cc5c00bb715b0a1610938111cb76eb9efe1eea87408123620a8a7155e6ab
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
# Template file for 'lua-language-server'
|
||||
pkgname=lua-language-server
|
||||
version=3.8.3
|
||||
version=3.9.1
|
||||
revision=1
|
||||
hostmakedepends="ninja"
|
||||
short_desc="Lua LSP implementation written in Lua"
|
||||
maintainer="icp <pangolin@vivaldi.net>"
|
||||
license="MIT"
|
||||
homepage="https://github.com/LuaLS/lua-language-server"
|
||||
homepage="https://luals.github.io"
|
||||
changelog="https://raw.githubusercontent.com/LuaLS/lua-language-server/master/changelog.md"
|
||||
distfiles="https://github.com/LuaLS/lua-language-server/releases/download/${version}/lua-language-server-${version}-submodules.zip"
|
||||
checksum=37e4b5c409b26e18870914e0ee728f21f88684b6d30a60290dd8c97febde9747
|
||||
checksum=8d9dbdaa729917ccefe89010b0d873d8eda2dcc7fce7ba1bab90c7e6a2af56aa
|
||||
|
||||
do_build() {
|
||||
ninja -C 3rd/luamake -f compile/ninja/linux.ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'mednafen'
|
||||
pkgname=mednafen
|
||||
version=1.29.0
|
||||
revision=2
|
||||
version=1.32.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-libsndfile --enable-alsa $(vopt_enable altivec)
|
||||
ac_cv_sizeof_off_t=8"
|
||||
|
|
@ -11,8 +11,9 @@ short_desc="Portable, argument(command-line)-driven multi-system emulator"
|
|||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="https://mednafen.github.io/"
|
||||
changelog="https://mednafen.github.io/documentation/ChangeLog.txt"
|
||||
distfiles="https://mednafen.github.io/releases/files/mednafen-${version}.tar.xz"
|
||||
checksum=da3fbcf02877f9be0f028bfa5d1cb59e953a4049b90fe7e39388a3386d9f362e
|
||||
checksum=de7eb94ab66212ae7758376524368a8ab208234b33796625ca630547dbc83832
|
||||
nopie=yes
|
||||
|
||||
build_options="altivec"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'mednaffe'
|
||||
pkgname=mednaffe
|
||||
version=0.9.2
|
||||
version=0.9.3
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
|
|
@ -10,5 +10,6 @@ short_desc="Front-end (GUI) for mednafen emulator"
|
|||
maintainer="VladTheImpaler <vladimir-romanov-ii@yandex.com>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://github.com/AmatCoder/mednaffe"
|
||||
changelog="https://raw.githubusercontent.com/AmatCoder/mednaffe/master/ChangeLog"
|
||||
distfiles="https://github.com/AmatCoder/mednaffe/releases/download/${version}/mednaffe-${version}.tar.gz"
|
||||
checksum=fd9d7ccf6d30cd1123492518bef9df44d67c73fc2817a8575191b24764ce4436
|
||||
checksum=430572c816b502744eb0239773adf83bee6f4d46b0b75c5971dbbe7fac9fd404
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'mpvpaper'
|
||||
pkgname=mpvpaper
|
||||
version=1.5
|
||||
version=1.6
|
||||
revision=1
|
||||
build_style=meson
|
||||
hostmakedepends="pkg-config wayland-devel"
|
||||
|
|
@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
|
|||
homepage="https://github.com/GhostNaN/mpvpaper"
|
||||
changelog="https://github.com/GhostNaN/mpvpaper/releases"
|
||||
distfiles="https://github.com/GhostNaN/mpvpaper/archive/refs/tags/${version}.tar.gz"
|
||||
checksum=73fa3dcfc3a57180ba92d1bc959b9d670eea8ef96a27c5261dff4e2c5e639565
|
||||
checksum=2a66b2dcabc864c544de2344fd4d8ce23984e4540c4b0d4befae2dc83393f090
|
||||
|
||||
do_install() {
|
||||
vman mpvpaper.man mpvpaper.1
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'nghttp2'
|
||||
pkgname=nghttp2
|
||||
version=1.62.0
|
||||
version=1.62.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
# build system errors out if python isn't available
|
||||
|
|
@ -14,7 +14,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
|
|||
license="MIT"
|
||||
homepage="https://nghttp2.org"
|
||||
distfiles="https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
|
||||
checksum=26798308fa0a12dabdb7ba8c77f74383019d3a0f1f36d25958b836af22474958
|
||||
checksum=2345d4dc136fda28ce243e0bb21f2e7e8ef6293d62c799abbf6f633a6887af72
|
||||
python_version=3
|
||||
|
||||
post_install() {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'openttd'
|
||||
pkgname=openttd
|
||||
version=14.0
|
||||
version=14.1
|
||||
revision=1
|
||||
_gfxver=7.1
|
||||
_sfxver=1.0.3
|
||||
|
|
@ -29,7 +29,7 @@ distfiles="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version
|
|||
https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip
|
||||
https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip
|
||||
https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip"
|
||||
checksum="96f76ab858816a5e30038ade0692e6ebf350b9f70bf19c7b48dda845c88418b1
|
||||
checksum="2c14c8f01f44148c4f2c88c169a30abcdb002eb128a92b9adb76baa76b013494
|
||||
928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846
|
||||
e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759
|
||||
5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'osv-scanner'
|
||||
pkgname=osv-scanner
|
||||
version=1.7.2
|
||||
version=1.7.3
|
||||
revision=1
|
||||
build_style=go
|
||||
go_import_path="github.com/google/osv-scanner"
|
||||
|
|
@ -12,4 +12,4 @@ license="Apache-2.0"
|
|||
homepage="https://google.github.io/osv-scanner/"
|
||||
changelog="https://raw.githubusercontent.com/google/osv-scanner/main/CHANGELOG.md"
|
||||
distfiles="https://github.com/google/osv-scanner/archive/refs/tags/v${version}.tar.gz"
|
||||
checksum=b6ff65f82e833e2d8102e3308e620ef30af5f93b3a215f899098be9a3e21ad03
|
||||
checksum=15480c07c7e69b2d54f9c3975e0ce8ae17b85f7f0a291e50d8fc1a0ff9cb2b17
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'pipewire'
|
||||
pkgname=pipewire
|
||||
version=1.0.5
|
||||
version=1.0.6
|
||||
revision=1
|
||||
build_style=meson
|
||||
configure_args="
|
||||
|
|
@ -38,7 +38,7 @@ license="MIT"
|
|||
homepage="https://pipewire.org/"
|
||||
changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
|
||||
distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
|
||||
checksum=c5a5de26d684a1a84060ad7b6131654fb2835e03fccad85059be92f8e3ffe993
|
||||
checksum=aaaaa9825f313f0acc64bd046776da8a2f31e270f20351ecf97438d15aebce79
|
||||
make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
|
||||
system_accounts="_pipewire"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
ignore="1.1.*" # ignore v1.2 release candidates
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'qpwgraph'
|
||||
pkgname=qpwgraph
|
||||
version=0.6.1
|
||||
version=0.7.2
|
||||
revision=1
|
||||
build_style=cmake
|
||||
hostmakedepends="pkg-config qt6-declarative-host-tools"
|
||||
|
|
@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph"
|
||||
changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog"
|
||||
distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz"
|
||||
checksum=0702bf7c256e5fb25513e6e08d846c09cdc419eee8344e6aafaedb8b0b4a6dfc
|
||||
checksum=166f5f6cd87c082b65092fb9d3aa7ab16938acc78c610b36a16adc61ac8295a0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'rio'
|
||||
pkgname=rio
|
||||
version=0.0.37
|
||||
version=0.0.39
|
||||
revision=1
|
||||
build_style=cargo
|
||||
make_install_args="--path rio"
|
||||
|
|
@ -13,7 +13,7 @@ license="MIT"
|
|||
homepage="https://raphamorim.io/rio/"
|
||||
changelog="https://raw.githubusercontent.com/raphamorim/rio/main/CHANGELOG.md"
|
||||
distfiles="https://github.com/raphamorim/rio/archive/refs/tags/v${version}.tar.gz"
|
||||
checksum=e78a4dceb1ba4f1c3b3d1fadd16f73861a3afb419607a04b27dd9a83dc95a238
|
||||
checksum=493b63ba87b97af35c2822e3008c793890e3887c439d30b2d4c556058094041e
|
||||
|
||||
do_install() {
|
||||
# avoid doing a rebuild in install due to complex feature setup
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'rng-tools'
|
||||
pkgname=rng-tools
|
||||
version=6.16
|
||||
revision=2
|
||||
version=6.17
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"
|
||||
hostmakedepends="automake pkg-config"
|
||||
|
|
@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
|||
license="GPL-2.0-or-later"
|
||||
homepage="https://github.com/nhorman/rng-tools"
|
||||
distfiles="https://github.com/nhorman/rng-tools/archive/v${version}.tar.gz"
|
||||
checksum=17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894
|
||||
checksum=4aa50994232da74499b60b3ebf79118e30a1943be375b7d931dcf18df5442fd3
|
||||
CFLAGS=-DJENT_CONF_ENABLE_INTERNAL_TIMER
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'rust-bootstrap'
|
||||
pkgname=rust-bootstrap
|
||||
version=1.77.1
|
||||
version=1.78.0
|
||||
revision=1
|
||||
short_desc="Rust programming language bootstrap toolchain"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
|
|
@ -31,24 +31,24 @@ case "$XBPS_TARGET_MACHINE" in
|
|||
${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
|
||||
${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
|
||||
checksum="
|
||||
204a79ddc33e74a23b817724a57fdaad5e2552d034653915a7508c7d0063045a
|
||||
7bf24ca93bde8cd761128e68cbcabc9d304c5cf19fcdd020bca2d56e43014381"
|
||||
8ba9c213e5daaf08a13c5787a4ea0d7ae8d1e7004126de2b8dc6a6dcd798becd
|
||||
9e5e02311853354c1540e1b4da6c1686616cea9d3a233c033023f36d950977c0"
|
||||
;;
|
||||
x86_64)
|
||||
distfiles="
|
||||
${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
|
||||
${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
|
||||
checksum="
|
||||
c9caaf8c214f6683281fa55e76a4d345004aa2933daca469952b3bead8cc5ca9
|
||||
317e604909360d1bb92f7558aaa5ce449312630d8226767ae9df99bf5bef4fd1"
|
||||
3994971e5923716d54e4b574ce238f04c4e20cda03990670f7cc3f87d36e5499
|
||||
95aece42a336f237c5bac5c5d9aca051b7f0bd3e6a64fb3c5828e6d0d3af2e8c"
|
||||
;;
|
||||
x86_64-musl)
|
||||
distfiles="
|
||||
${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
|
||||
${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
|
||||
checksum="
|
||||
d00be127d978177c0b2f439a1e63e4c25a3ca5f035a7282187555ab540cc18a3
|
||||
899c2668e65ad3557033169e67a6fa3d9c816c62d39ee11d5ebef4eded226d0b"
|
||||
82bbe731cde3d323147b34aaf5ed2251b70ade44b96a69b5d93b8968d7af96ea
|
||||
f2c30e43184b050f56cc2ac98af0752a881f104c08456731a9cd9e21d9f7dfb5"
|
||||
;;
|
||||
# placeholders for user-supplied distfiles
|
||||
ppc64le)
|
||||
|
|
|
|||
|
|
@ -61,10 +61,10 @@ index 53f710b8f..2a4eec15f 100644
|
|||
new(&[
|
||||
(LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
|
||||
diff --git a/config.example.toml b/config.example.toml
|
||||
index a7d4df545..feaa0f861 100644
|
||||
index f94553dd6..65139e167 100644
|
||||
--- a/config.example.toml
|
||||
+++ b/config.example.toml
|
||||
@@ -586,14 +586,6 @@
|
||||
@@ -591,14 +591,6 @@
|
||||
# behavior -- this may lead to miscompilations or other bugs.
|
||||
#description = ""
|
||||
|
||||
|
|
@ -80,7 +80,7 @@ index a7d4df545..feaa0f861 100644
|
|||
# platforms to ensure that the compiler is usable by default from the build
|
||||
# directory (as it links to a number of dynamic libraries). This may not be
|
||||
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
|
||||
index 544a42d9a..8bd3fc755 100755
|
||||
index 818a7daad..5edc363f6 100755
|
||||
--- a/src/bootstrap/configure.py
|
||||
+++ b/src/bootstrap/configure.py
|
||||
@@ -99,34 +99,6 @@ v("llvm-config", None, "set path to llvm-config")
|
||||
|
|
@ -119,10 +119,10 @@ index 544a42d9a..8bd3fc755 100755
|
|||
"riscv32gc-unknown-linux-musl install directory")
|
||||
v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root",
|
||||
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
|
||||
index df4d1a43d..b34309a27 100644
|
||||
index e927b491c..00475eb66 100644
|
||||
--- a/src/bootstrap/src/core/build_steps/compile.rs
|
||||
+++ b/src/bootstrap/src/core/build_steps/compile.rs
|
||||
@@ -307,39 +307,7 @@ fn copy_self_contained_objects(
|
||||
@@ -361,39 +361,7 @@ fn copy_self_contained_objects(
|
||||
let mut target_deps = vec![];
|
||||
|
||||
// Copies the libc and CRT objects.
|
||||
|
|
@ -150,7 +150,7 @@ index df4d1a43d..b34309a27 100644
|
|||
- for &obj in &["crtbegin.o", "crtbeginS.o", "crtend.o", "crtendS.o"] {
|
||||
- let src = crt_path.join(obj);
|
||||
- let target = libdir_self_contained.join(obj);
|
||||
- builder.copy(&src, &target);
|
||||
- builder.copy_link(&src, &target);
|
||||
- target_deps.push((target, DependencyType::TargetSelfContained));
|
||||
- }
|
||||
-
|
||||
|
|
@ -163,7 +163,7 @@ index df4d1a43d..b34309a27 100644
|
|||
let srcdir = builder
|
||||
.wasi_root(target)
|
||||
.unwrap_or_else(|| {
|
||||
@@ -436,15 +404,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
|
||||
@@ -504,15 +472,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
|
||||
.arg("--manifest-path")
|
||||
.arg(builder.src.join("library/sysroot/Cargo.toml"));
|
||||
|
||||
|
|
@ -180,18 +180,18 @@ index df4d1a43d..b34309a27 100644
|
|||
if let Some(p) = builder.wasi_root(target) {
|
||||
let root = format!(
|
||||
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
|
||||
index f1e1b89d9..e706b9d65 100644
|
||||
index 3e1bc9a9a..3eef99651 100644
|
||||
--- a/src/bootstrap/src/core/config/config.rs
|
||||
+++ b/src/bootstrap/src/core/config/config.rs
|
||||
@@ -308,7 +308,6 @@ pub struct Config {
|
||||
pub missing_tools: bool,
|
||||
@@ -310,7 +310,6 @@ pub struct Config {
|
||||
pub missing_tools: bool, // FIXME: Deprecated field. Remove it at 2024.
|
||||
|
||||
// Fallback musl-root for all targets
|
||||
- pub musl_root: Option<PathBuf>,
|
||||
pub prefix: Option<PathBuf>,
|
||||
pub sysconfdir: Option<PathBuf>,
|
||||
pub datadir: Option<PathBuf>,
|
||||
@@ -574,8 +573,6 @@ pub struct Target {
|
||||
@@ -579,8 +578,6 @@ pub struct Target {
|
||||
pub profiler: Option<StringOrBool>,
|
||||
pub rpath: Option<bool>,
|
||||
pub crt_static: Option<bool>,
|
||||
|
|
@ -199,16 +199,16 @@ index f1e1b89d9..e706b9d65 100644
|
|||
- pub musl_libdir: Option<PathBuf>,
|
||||
pub wasi_root: Option<PathBuf>,
|
||||
pub qemu_rootfs: Option<PathBuf>,
|
||||
pub no_std: bool,
|
||||
@@ -1080,7 +1077,6 @@ define_config! {
|
||||
pub runner: Option<String>,
|
||||
@@ -1089,7 +1086,6 @@ define_config! {
|
||||
default_linker: Option<String> = "default-linker",
|
||||
channel: Option<String> = "channel",
|
||||
description: Option<String> = "description",
|
||||
- musl_root: Option<String> = "musl-root",
|
||||
rpath: Option<bool> = "rpath",
|
||||
strip: Option<bool> = "strip",
|
||||
stack_protector: Option<String> = "stack-protector",
|
||||
@@ -1131,8 +1127,6 @@ define_config! {
|
||||
frame_pointers: Option<bool> = "frame-pointers",
|
||||
@@ -1143,8 +1139,6 @@ define_config! {
|
||||
profiler: Option<StringOrBool> = "profiler",
|
||||
rpath: Option<bool> = "rpath",
|
||||
crt_static: Option<bool> = "crt-static",
|
||||
|
|
@ -217,7 +217,7 @@ index f1e1b89d9..e706b9d65 100644
|
|||
wasi_root: Option<String> = "wasi-root",
|
||||
qemu_rootfs: Option<String> = "qemu-rootfs",
|
||||
no_std: Option<bool> = "no-std",
|
||||
@@ -1532,7 +1526,6 @@ impl Config {
|
||||
@@ -1564,7 +1558,6 @@ impl Config {
|
||||
default_linker,
|
||||
channel,
|
||||
description,
|
||||
|
|
@ -225,7 +225,7 @@ index f1e1b89d9..e706b9d65 100644
|
|||
rpath,
|
||||
verbose_tests,
|
||||
optimize_tests,
|
||||
@@ -1634,7 +1627,6 @@ impl Config {
|
||||
@@ -1677,7 +1670,6 @@ impl Config {
|
||||
config.rustc_parallel =
|
||||
parallel_compiler.unwrap_or(config.channel == "dev" || config.channel == "nightly");
|
||||
config.rustc_default_linker = default_linker;
|
||||
|
|
@ -233,7 +233,7 @@ index f1e1b89d9..e706b9d65 100644
|
|||
config.save_toolstates = save_toolstates.map(PathBuf::from);
|
||||
set(
|
||||
&mut config.deny_warnings,
|
||||
@@ -1827,8 +1819,6 @@ impl Config {
|
||||
@@ -1876,8 +1868,6 @@ impl Config {
|
||||
target.ranlib = cfg.ranlib.map(PathBuf::from);
|
||||
target.linker = cfg.linker.map(PathBuf::from);
|
||||
target.crt_static = cfg.crt_static;
|
||||
|
|
@ -241,9 +241,9 @@ index f1e1b89d9..e706b9d65 100644
|
|||
- target.musl_libdir = cfg.musl_libdir.map(PathBuf::from);
|
||||
target.wasi_root = cfg.wasi_root.map(PathBuf::from);
|
||||
target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
|
||||
target.sanitizers = cfg.sanitizers;
|
||||
target.runner = cfg.runner;
|
||||
diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
|
||||
index 9101d94ea..df72d6f9a 100644
|
||||
index e03b1e179..e61335d9b 100644
|
||||
--- a/src/bootstrap/src/core/sanity.rs
|
||||
+++ b/src/bootstrap/src/core/sanity.rs
|
||||
@@ -11,7 +11,6 @@
|
||||
|
|
@ -254,7 +254,7 @@ index 9101d94ea..df72d6f9a 100644
|
|||
use std::path::PathBuf;
|
||||
use std::process::Command;
|
||||
|
||||
@@ -215,28 +214,6 @@ than building it.
|
||||
@@ -220,28 +219,6 @@ than building it.
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -284,10 +284,10 @@ index 9101d94ea..df72d6f9a 100644
|
|||
// There are three builds of cmake on windows: MSVC, MinGW, and
|
||||
// Cygwin. The Cygwin build does not have generators for Visual
|
||||
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
|
||||
index 871318de5..b3f1eff91 100644
|
||||
index 5ed6b357e..9667bb0e0 100644
|
||||
--- a/src/bootstrap/src/lib.rs
|
||||
+++ b/src/bootstrap/src/lib.rs
|
||||
@@ -1290,25 +1290,6 @@ impl Build {
|
||||
@@ -1319,25 +1319,6 @@ impl Build {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -297,7 +297,7 @@ index 871318de5..b3f1eff91 100644
|
|||
- .target_config
|
||||
- .get(&target)
|
||||
- .and_then(|t| t.musl_root.as_ref())
|
||||
- .or_else(|| self.config.musl_root.as_ref())
|
||||
- .or(self.config.musl_root.as_ref())
|
||||
- .map(|p| &**p)
|
||||
- }
|
||||
-
|
||||
|
|
@ -314,10 +314,10 @@ index 871318de5..b3f1eff91 100644
|
|||
fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
|
||||
self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
|
||||
diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
|
||||
index fb5b9d8c8..c6c9368a0 100644
|
||||
index 3ba4e0cb6..31ffacb25 100644
|
||||
--- a/src/bootstrap/src/utils/cc_detect.rs
|
||||
+++ b/src/bootstrap/src/utils/cc_detect.rs
|
||||
@@ -201,30 +201,6 @@ fn default_compiler(
|
||||
@@ -199,30 +199,6 @@ fn default_compiler(
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,41 +7,41 @@ This allows us to get around the linker attempting to use
|
|||
incompatible libs.
|
||||
|
||||
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
|
||||
index e18096443..b48742ae4 100644
|
||||
index 7f93fdc72..f52644b57 100644
|
||||
--- a/src/bootstrap/src/core/builder.rs
|
||||
+++ b/src/bootstrap/src/core/builder.rs
|
||||
@@ -1706,6 +1706,10 @@ impl<'a> Builder<'a> {
|
||||
hostflags.arg(&arg);
|
||||
@@ -2429,6 +2429,10 @@ impl Cargo {
|
||||
self.hostflags.arg(&arg);
|
||||
}
|
||||
|
||||
+ if let Some(sysroot) = self.native_sysroot(target) {
|
||||
+ rustflags.arg(&format!("-Clink-args=--sysroot={}", sysroot.display()));
|
||||
+ if let Some(sysroot) = builder.native_sysroot(target) {
|
||||
+ self.rustflags.arg(&format!("-Clink-args=--sysroot={}", sysroot.display()));
|
||||
+ }
|
||||
+
|
||||
if let Some(target_linker) = self.linker(target) {
|
||||
if let Some(target_linker) = builder.linker(target) {
|
||||
let target = crate::envify(&target.triple);
|
||||
cargo.env(&format!("CARGO_TARGET_{target}_LINKER"), target_linker);
|
||||
self.command.env(&format!("CARGO_TARGET_{target}_LINKER"), target_linker);
|
||||
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
|
||||
index f1e1b89d9..30e61161d 100644
|
||||
index 3e1bc9a9a..e0038b9ac 100644
|
||||
--- a/src/bootstrap/src/core/config/config.rs
|
||||
+++ b/src/bootstrap/src/core/config/config.rs
|
||||
@@ -570,6 +570,7 @@ pub struct Target {
|
||||
pub ranlib: Option<PathBuf>,
|
||||
@@ -575,6 +575,7 @@ pub struct Target {
|
||||
pub default_linker: Option<PathBuf>,
|
||||
pub linker: Option<PathBuf>,
|
||||
pub split_debuginfo: Option<SplitDebuginfo>,
|
||||
+ pub sysroot: Option<PathBuf>,
|
||||
pub sanitizers: Option<bool>,
|
||||
pub profiler: Option<StringOrBool>,
|
||||
pub rpath: Option<bool>,
|
||||
@@ -1123,6 +1124,7 @@ define_config! {
|
||||
ranlib: Option<String> = "ranlib",
|
||||
@@ -1135,6 +1136,7 @@ define_config! {
|
||||
default_linker: Option<PathBuf> = "default-linker",
|
||||
linker: Option<String> = "linker",
|
||||
split_debuginfo: Option<String> = "split-debuginfo",
|
||||
+ sysroot: Option<String> = "sysroot",
|
||||
llvm_config: Option<String> = "llvm-config",
|
||||
llvm_has_rust_patches: Option<bool> = "llvm-has-rust-patches",
|
||||
llvm_filecheck: Option<String> = "llvm-filecheck",
|
||||
@@ -1826,6 +1828,7 @@ impl Config {
|
||||
@@ -1875,6 +1877,7 @@ impl Config {
|
||||
target.ar = cfg.ar.map(PathBuf::from);
|
||||
target.ranlib = cfg.ranlib.map(PathBuf::from);
|
||||
target.linker = cfg.linker.map(PathBuf::from);
|
||||
|
|
@ -50,10 +50,10 @@ index f1e1b89d9..30e61161d 100644
|
|||
target.musl_root = cfg.musl_root.map(PathBuf::from);
|
||||
target.musl_libdir = cfg.musl_libdir.map(PathBuf::from);
|
||||
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
|
||||
index 871318de5..96abbe721 100644
|
||||
index 5ed6b357e..0d4392dd8 100644
|
||||
--- a/src/bootstrap/src/lib.rs
|
||||
+++ b/src/bootstrap/src/lib.rs
|
||||
@@ -1289,6 +1289,10 @@ impl Build {
|
||||
@@ -1318,6 +1318,10 @@ impl Build {
|
||||
self.config.target_config.get(&target).and_then(|t| t.crt_static)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
# uploaded to https://repo-default.voidlinux.org/distfiles/
|
||||
#
|
||||
pkgname=rust
|
||||
version=1.77.1
|
||||
version=1.78.0
|
||||
revision=1
|
||||
hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
|
||||
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm17-devel"
|
||||
|
|
@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
|
|||
license="MIT, Apache-2.0"
|
||||
homepage="https://www.rust-lang.org/"
|
||||
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
|
||||
checksum=ee106e4c569f52dba3b5b282b105820f86bd8f6b3d09c06b8dce82fb1bb3a4a1
|
||||
checksum=ff544823a5cb27f2738128577f1e7e00ee8f4c83f2a348781ae4fc355e91d5a9
|
||||
lib32disabled=yes
|
||||
make_check=no # CBA for now
|
||||
python_version=3 # needed for python files in rust-src
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'schismtracker'
|
||||
pkgname=schismtracker
|
||||
version=20240503
|
||||
version=20240515
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config autoconf-archive automake SDL2-devel python3 git libltdl-devel libflac-devel"
|
||||
|
|
@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
|||
license="GPL-2.0-or-later"
|
||||
homepage="https://schismtracker.org"
|
||||
distfiles="https://github.com/schismtracker/schismtracker/archive/${version}.tar.gz"
|
||||
checksum=9ad5545fb2b824f001f18c18eb051933d44f3cbfd3ed197288d799869b551307
|
||||
checksum=34a016d85af2aff3d9cf250edfe543b06ff9b65b7e87c1d7d326238d6835a6de
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'strace'
|
||||
pkgname=strace
|
||||
version=6.7
|
||||
revision=2
|
||||
version=6.9
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-silent-rules $(vopt_with libunwind)"
|
||||
makedepends="$(vopt_if libunwind libunwind-devel)"
|
||||
|
|
@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
|
|||
homepage="https://strace.io/"
|
||||
changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
|
||||
distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
|
||||
checksum=2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7
|
||||
checksum=da189e990a82e3ca3a5a4631012f7ecfd489dab459854d82d8caf6a865c1356a
|
||||
|
||||
build_options="static libunwind"
|
||||
build_options_default="libunwind"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'websocat'
|
||||
pkgname=websocat
|
||||
version=1.12.0
|
||||
version=1.13.0
|
||||
revision=1
|
||||
build_style=cargo
|
||||
hostmakedepends="pkg-config"
|
||||
|
|
@ -9,8 +9,9 @@ short_desc="Netcat, curl and socat for WebSockets"
|
|||
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
|
||||
license="MIT"
|
||||
homepage="https://github.com/vi/websocat"
|
||||
changelog="https://raw.githubusercontent.com/vi/websocat/master/CHANGELOG.md"
|
||||
distfiles="https://github.com/vi/websocat/archive/refs/tags/v${version}.tar.gz"
|
||||
checksum=ca6ab2bc71a9c641fbda7f15d4956f2e19ca32daba9b284d26587410944a3adb
|
||||
checksum=43800f8df38ede8b5bffe825e633c0db6a3c36cfe26c23e882bcfc028d3119c7
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'wstunnel'
|
||||
pkgname=wstunnel
|
||||
version=9.3.0
|
||||
version=9.5.2
|
||||
revision=1
|
||||
build_style=cargo
|
||||
make_check_args="-- --skip tcp::tests::test_proxy_connection" # test requires docker
|
||||
|
|
@ -10,7 +10,7 @@ license="BSD-3-Clause"
|
|||
homepage="https://github.com/erebe/wstunnel"
|
||||
changelog="https://github.com/erebe/wstunnel/releases"
|
||||
distfiles="https://github.com/erebe/wstunnel/archive/refs/tags/v${version}.tar.gz"
|
||||
checksum=bf812d144949acab53b6aef256c3474577b8b0448db0f2307d2c6c5248fbe1ec
|
||||
checksum=58bb7c82f9a5e13504215a74885c5d41a53bf15fb9c0c8c7c806e9184857ff6f
|
||||
make_check=ci-skip # remaining tests require port binding which can't be done in CI
|
||||
|
||||
post_install() {
|
||||
|
|
|
|||
|
|
@ -1,18 +1,15 @@
|
|||
# Template file for 'zk'
|
||||
pkgname=zk
|
||||
version=0.14.0 # renovate zk-org/zk
|
||||
revision=2
|
||||
version=0.14.0
|
||||
revision=1
|
||||
build_style=go
|
||||
go_import_path=github.com/mickael-menu/zk
|
||||
go_build_tags=fts5
|
||||
go_build_tags="fts5"
|
||||
go_ldflags="-X main.Version=${version}"
|
||||
short_desc="Plain text note-taking assistant"
|
||||
maintainer="luca <luca@bil.ke>"
|
||||
maintainer="cinerea0 <cinerea0@protonmail.com>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://github.com/zk-org/zk/"
|
||||
homepage="https://zk-org.github.io/zk/"
|
||||
changelog="https://raw.githubusercontent.com/zk-org/zk/main/CHANGELOG.md"
|
||||
distfiles="https://github.com/zk-org/zk/archive/refs/tags/v${version}.tar.gz"
|
||||
checksum=bd96f93d50e2e72ce05f36c3dab5b7942ae205756f26d4c68ba2a7ccc783abc8
|
||||
|
||||
do_check() {
|
||||
go test -v
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue