Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shlibs_append
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ libhyprutils.so.10 hyprutils-0.11.0_1
libsdbus-c++.so.2 sdbus-cpp-2.1.0_1
libspng.so.0 libspng-0.7.4_1
libtomlplusplus.so.3 tomlplusplus-3.4.0_1
libhyprwire.so.2 hyprwire-0.2.1_1
libhyprwire.so.3 hyprwire-0.3.0_1
4 changes: 2 additions & 2 deletions srcpkgs/glaze/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'glaze'
pkgname=glaze
version=6.5.0
version=7.1.0
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=Release \
Expand All @@ -11,7 +11,7 @@ maintainer="Encoded14 <linusken@tuta.io>"
license="MIT"
homepage="https://github.com/stephenberry/glaze"
distfiles="https://github.com/stephenberry/glaze/archive/refs/tags/v${version}.tar.gz"
checksum=2cd86f9cdf5512caf3d66aac9e14a15450a0f1cc308ac2632b0442a5a294570d
checksum=39bbd40f6a81e7b56489cf96f768195563f36cf80bdfe74c3a95a228402af298

post_install() {
vlicense LICENSE
Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/hyprland/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'hyprland'
pkgname=hyprland
version=0.53.1
revision=2
version=0.54.0
revision=1
build_style=cmake
configure_args="--no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_INSTALL_PREFIX:PATH=/usr -DNO_SYSTEMD:BOOL=true"
Expand All @@ -18,7 +18,7 @@ license="BSD-3-Clause"
homepage="https://hyprland.org/"
changelog="https://github.com/hyprwm/Hyprland/releases"
distfiles="https://github.com/hyprwm/Hyprland/releases/download/v${version}/source-v${version}.tar.gz"
checksum=1d9d22cfa34d2a559b2be37735adb1f70eef4fd8bbaf226ebf1d20b09fcb0861
checksum=ddc4f7f1dd2d29ebfeaf462fe361593034f104de85b80e3e81f73e33602a69ae
make_check=no # cant run in sandbox

if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/hyprlang/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'hyprlang'
pkgname=hyprlang
version=0.6.7
revision=3
version=0.6.8
revision=1
build_style=cmake
configure_args="--no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_INSTALL_PREFIX:PATH=/usr"
Expand All @@ -13,4 +13,4 @@ license="LGPL-3.0-only"
homepage="https://hyprland.org/hyprlang/index.html"
changelog="https://github.com/hyprwm/hyprlang/releases"
distfiles="https://github.com/hyprwm/hyprlang/archive/refs/tags/v${version}.tar.gz"
checksum=e8d54af895ec04fe99553c68d1255dceddb43723ada4a134acdd46bfe1dbf924
checksum=d10a0778b646e04d83e8b90cc0f764fb96958c01a15c3c0678d95a40fc647ed5
6 changes: 3 additions & 3 deletions srcpkgs/hyprpaper/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'hyprpaper'
pkgname=hyprpaper
version=0.8.1
revision=3
version=0.8.3
revision=1
build_style=cmake
configure_args="--no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr"
hostmakedepends="cmake pkgconf hyprwayland-scanner hyprwire hyprland-protocols wayland-protocols"
Expand All @@ -12,7 +12,7 @@ maintainer="Encoded14 <linusken@tuta.io>"
license="BSD-3-Clause"
homepage="https://github.com/hyprwm/hyprpaper"
distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
checksum=6fb69e6d23f4547966ad20b8972d0a0c0f93d4de3d56823b8dd74af2678fe405
checksum=bfede471179adca93ed6d10e0132838c16dae364d828bd44f67819afc1a15594

post_install() {
vlicense LICENSE
Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/hyprpicker/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'hyprpicker'
pkgname=hyprpicker
version=0.4.5
revision=5
version=0.4.6
revision=1
build_style=cmake
hostmakedepends="cmake pkg-config hyprwayland-scanner wayland-protocols"
makedepends="wayland-devel cairo-devel pango-devel
Expand All @@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://github.com/hyprwm/hyprpicker"
changelog="https://github.com/hyprwm/hyprpicker/releases"
distfiles="https://github.com/hyprwm/hyprpicker/archive/refs/tags/v${version}.tar.gz"
checksum=fe9611ec78524f9bbea0d39308da3d9c61cb20f6103179a269cad8013bb0c1f3
checksum=3dc3dec1ba3254a9ab3303461a12593f18318961934d24e4b1adc08927ba675d

pre_build() {
make protocols
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/hyprtoolkit/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'hyprtoolkit'
pkgname=hyprtoolkit
version=0.5.1
version=0.5.3
revision=1
build_style=cmake
configure_args="--no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \
Expand All @@ -14,7 +14,7 @@ maintainer="Encoded14 <linusken@tuta.io>"
license="BSD-3-Clause"
homepage="https://github.com/hyprwm/hyprgraphics"
distfiles="https://github.com/hyprwm/hyprtoolkit/archive/refs/tags/v${version}.tar.gz"
checksum=f9f481dc18ec1d293dbd4e508e784c3781d067972b053bf4db0a12cf506ca31d
checksum=7e6671fd4bf6f4b1eda0115aa187aa183db40d59049cca1d7546fb46fdb4cdc0
make_check=no # cant run in sandbox

post_install() {
Expand Down
136 changes: 136 additions & 0 deletions srcpkgs/hyprwire/patches/append-range.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
--- a/src/core/message/messages/BindProtocol.cpp
+++ b/src/core/message/messages/BindProtocol.cpp
@@ -67,10 +67,16 @@

m_data.emplace_back(HW_MESSAGE_MAGIC_TYPE_VARCHAR);

- m_data.append_range(g_messageParser->encodeVarInt(protocol.length()));
- m_data.append_range(protocol);
+ {
+ auto encodedLen = g_messageParser->encodeVarInt(protocol.length());
+ m_data.insert(m_data.end(), encodedLen.begin(), encodedLen.end());
+ }
+ m_data.insert(m_data.end(), protocol.begin(), protocol.end());

- m_data.append_range(std::vector<uint8_t>{HW_MESSAGE_MAGIC_TYPE_UINT, 0, 0, 0, 0});
+ {
+ std::vector<uint8_t> typeTag{HW_MESSAGE_MAGIC_TYPE_UINT, 0, 0, 0, 0};
+ m_data.insert(m_data.end(), typeTag.begin(), typeTag.end());
+ }

std::memcpy(&m_data[m_data.size() - 4], &version, sizeof(version));

--- a/src/core/message/messages/FatalProtocolError.cpp
+++ b/src/core/message/messages/FatalProtocolError.cpp
@@ -61,7 +61,10 @@
std::memcpy(&m_data[2], &obj->m_id, sizeof(obj->m_id));
std::memcpy(&m_data[7], &errorId, sizeof(errorId));

- m_data.append_range(g_messageParser->encodeVarInt(msg.size()));
- m_data.append_range(msg);
+ {
+ auto encodedLen = g_messageParser->encodeVarInt(msg.size());
+ m_data.insert(m_data.end(), encodedLen.begin(), encodedLen.end());
+ }
+ m_data.insert(m_data.end(), msg.begin(), msg.end());
m_data.emplace_back(HW_MESSAGE_MAGIC_END);
}
--- a/src/core/message/messages/HandshakeBegin.cpp
+++ b/src/core/message/messages/HandshakeBegin.cpp
@@ -58,7 +58,10 @@
HW_MESSAGE_MAGIC_TYPE_UINT,
};

- m_data.append_range(g_messageParser->encodeVarInt(versions.size()));
+ {
+ auto encodedCount = g_messageParser->encodeVarInt(versions.size());
+ m_data.insert(m_data.end(), encodedCount.begin(), encodedCount.end());
+ }

const size_t HEAD_SIZE = m_data.size();

--- a/src/core/message/messages/HandshakeProtocols.cpp
+++ b/src/core/message/messages/HandshakeProtocols.cpp
@@ -57,11 +57,17 @@
HW_MESSAGE_MAGIC_TYPE_VARCHAR,
};

- m_data.append_range(g_messageParser->encodeVarInt(protocols.size()));
+ {
+ auto encodedCount = g_messageParser->encodeVarInt(protocols.size());
+ m_data.insert(m_data.end(), encodedCount.begin(), encodedCount.end());
+ }

for (const auto& p : protocols) {
- m_data.append_range(g_messageParser->encodeVarInt(p.size()));
- m_data.append_range(p);
+ {
+ auto encodedLen = g_messageParser->encodeVarInt(p.size());
+ m_data.insert(m_data.end(), encodedLen.begin(), encodedLen.end());
+ }
+ m_data.insert(m_data.end(), p.begin(), p.end());
}

m_data.emplace_back(HW_MESSAGE_MAGIC_END);
--- a/src/core/socket/SocketHelpers.cpp
+++ b/src/core/socket/SocketHelpers.cpp
@@ -42,7 +42,7 @@
if (sizeWritten < 0)
return {.bad = true};

- message.data.append_range(std::span<uint8_t>(buffer, sizeWritten));
+ message.data.insert(message.data.end(), buffer, buffer + sizeWritten);

// check for control
cmsghdr* recvdCmsg = CMSG_FIRSTHDR(&msg);
--- a/src/core/wireObject/IWireObject.cpp
+++ b/src/core/wireObject/IWireObject.cpp
@@ -118,8 +118,11 @@
case HW_MESSAGE_MAGIC_TYPE_VARCHAR: {
data.emplace_back(HW_MESSAGE_MAGIC_TYPE_VARCHAR);
auto str = va_arg(va, const char*);
- data.append_range(g_messageParser->encodeVarInt(std::string_view(str).size()));
- data.append_range(std::string_view(str));
+ {
+ auto encodedLen = g_messageParser->encodeVarInt(std::string_view(str).size());
+ data.insert(data.end(), encodedLen.begin(), encodedLen.end());
+ }
+ data.insert(data.end(), str, str + std::string_view(str).size());
break;
}

@@ -130,7 +133,10 @@

auto arrayData = va_arg(va, void*);
auto arrayLen = va_arg(va, uint32_t);
- data.append_range(g_messageParser->encodeVarInt(arrayLen));
+ {
+ auto encodedLen = g_messageParser->encodeVarInt(arrayLen);
+ data.insert(data.end(), encodedLen.begin(), encodedLen.end());
+ }

switch (arrType) {
case HW_MESSAGE_MAGIC_TYPE_UINT:
@@ -153,8 +159,11 @@
case HW_MESSAGE_MAGIC_TYPE_VARCHAR: {
for (size_t i = 0; i < arrayLen; ++i) {
const char* element = rc<const char**>(arrayData)[i];
- data.append_range(g_messageParser->encodeVarInt(std::string_view(element).size()));
- data.append_range(std::string_view(element));
+ {
+ auto encodedLen = g_messageParser->encodeVarInt(std::string_view(element).size());
+ data.insert(data.end(), encodedLen.begin(), encodedLen.end());
+ }
+ data.insert(data.end(), element, element + std::string_view(element).size());
}
break;
}
@@ -233,7 +242,7 @@
if (!method.returnsType.empty())
params.emplace_back(HW_MESSAGE_MAGIC_TYPE_SEQ);

- params.append_range(method.params);
+ params.insert(params.end(), method.params.begin(), method.params.end());

if (method.since > m_version) {
const auto MSG = std::format("method {} since {} but has {}", id, method.since, m_version);
149 changes: 0 additions & 149 deletions srcpkgs/hyprwire/patches/fix-append-range.patch

This file was deleted.

Loading
Loading