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
7 changes: 4 additions & 3 deletions shlibs_append
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
libaquamarine.so.9 aquamarine-0.10.0_1
libhyprcursor.so.0 hyprcursor-0.1.13_1
libhyprlang.so.2 hyprlang-0.6.4_2
libhyprgraphics.so.3 hyprgraphics-0.4.0_1
libhyprtoolkit.so.4 hyprtoolkit-0.4.0_1
libhyprutils.so.9 hyprutils-0.10.0_1
libhyprgraphics.so.4 hyprgraphics-0.5.0_1
libhyprtoolkit.so.5 hyprtoolkit-0.5.1_1
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
2 changes: 1 addition & 1 deletion shlibs_remove
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libhyprutils.so.6 hyprutils-0.7.1_1
libhyprutils.so.10 hyprutils-0.11.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.1.0
version=6.5.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=4ec01e893363701735d1ef3842fa77a74c4a664edaf08d6a1da0e744900d4125
checksum=2cd86f9cdf5512caf3d66aac9e14a15450a0f1cc308ac2632b0442a5a294570d

post_install() {
vlicense LICENSE
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/hyprgraphics/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'hyprgraphics'
pkgname=hyprgraphics
version=0.4.0
version=0.5.0
revision=1
build_style=cmake
configure_args="--no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr"
Expand All @@ -13,7 +13,7 @@ maintainer="Encoded14 <linusken@tuta.io>"
license="BSD-3-Clause"
homepage="https://github.com/hyprwm/hyprgraphics"
distfiles="https://github.com/hyprwm/hyprgraphics/archive/refs/tags/v${version}.tar.gz"
checksum=1ee818778eafd36919a463481fe0838ea3440d53fbd2305a5bf1449c61148678
checksum=bb37f611c1f50e58dcc0aa97ec1b39c186b78160807f109c5dd8833d58f8bc04
make_check=no # cant run in sandbox

post_install() {
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/hyprland-guiutils/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'hyprland-guiutils'
pkgname=hyprland-guiutils
version=0.2.0
version=0.2.1
revision=2
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/hyprland-guiutils"
distfiles="https://github.com/hyprwm/hyprland-guiutils/archive/refs/tags/v${version}.tar.gz"
checksum=9b24c0662dd0fca18ad171300a09517ee05ab8a2099749792975259db5d2bc21
checksum=8de6ab7295dd120bab6b6b3e884b27b3c6ccc38ae345f3144bf9b5ad79251bcb

post_install() {
vlicense LICENSE
Expand Down
19 changes: 10 additions & 9 deletions srcpkgs/hyprland/patches/01-fix-string-view-conversion.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
--- a/hyprctl/main.cpp
+++ b/hyprctl/main.cpp
@@ -268,7 +268,7 @@ int requestIPC(std::string_view request, std::string_view instanceSignature, st
return 1;
}

--- a/hyprctl/src/main.cpp 2026-01-02 19:02:34.939054405 -0500
+++ b/hyprctl/src/main.cpp 2026-01-02 19:02:45.791849036 -0500
@@ -271,7 +271,7 @@
sockaddr_un serverAddress = {0};
serverAddress.sun_family = AF_UNIX;
- std::string socketPath = getRuntimeDir() + "/" + instanceSignature + "/" + filename;
+ std::string socketPath = getRuntimeDir() + "/" + std::string(instanceSignature) + "/" + std::string(filename);

int SERVERSOCKET = socket(AF_UNIX, SOCK_STREAM, 0);
+ std::string socketPath = getRuntimeDir() + "/" + instanceSignature + "/" + std::string(filename);

strncpy(serverAddress.sun_path, socketPath.c_str(), sizeof(serverAddress.sun_path) - 1);

2 changes: 1 addition & 1 deletion srcpkgs/hyprland/patches/02-fix-monitor-mode-sorting.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/src/helpers/Monitor.cpp
+++ b/src/helpers/Monitor.cpp
@@ -549,7 +549,9 @@
@@ -632,7 +632,9 @@
std::ranges::sort(sortedModes, sortFunc);
if (sortedModes.size() > 3)
sortedModes.erase(sortedModes.begin() + 3, sortedModes.end());
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/hyprland/patches/03-fix-xcb-connection-cast.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/src/xwayland/XWM.hpp
+++ b/src/xwayland/XWM.hpp
@@ -214,7 +214,7 @@ class CXWM {
@@ -214,7 +214,7 @@
std::vector<SP<CX11DataOffer>> m_dndDataOffers;

inline xcb_connection_t* getConnection() {
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/hyprland/patches/05-fix-musl.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
--- a/hyprtester/src/hyprctlCompat.cpp
+++ b/hyprtester/src/hyprctlCompat.cpp
@@ -6,6 +6,7 @@
@@ -7,6 +7,7 @@
#include <sys/types.h>
#include <sys/un.h>
#include <unistd.h>
+#include <cstring>

#include <filesystem>
#include <fstream>
12 changes: 6 additions & 6 deletions srcpkgs/hyprland/template
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Template file for 'hyprland'
pkgname=hyprland
version=0.52.2
revision=4
version=0.53.1
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"
hostmakedepends="cmake cpio glslang hyprwayland-scanner jq pkgconf python3 xxd"
hostmakedepends="cmake cpio glslang hyprwayland-scanner hyprwire jq pkgconf python3 xxd"
makedepends="aquamarine cairo-devel glaze hwids hyprcursor
hyprgraphics hyprlang hyprutils libdisplay-info-devel libdrm-devel
hyprgraphics hyprlang hyprutils hyprwire libdisplay-info-devel libdrm-devel
libgbm-devel libglvnd-devel libinput-devel libliftoff-devel libseat-devel
libxcb-devel libXcursor-devel libxkbcommon-devel pango-devel re2-devel
libxcb-devel libXcursor-devel libxkbcommon-devel muparser-devel pango-devel re2-devel
tomlplusplus wayland-devel wayland-protocols xcb-util-errors-devel
xcb-util-renderutil-devel xcb-util-wm-devel xorg-server-xwayland"
short_desc="Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
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=57b4db99896cad8388482b945b119b206fd7ea94638793b550210be08274d7dd
checksum=1d9d22cfa34d2a559b2be37735adb1f70eef4fd8bbaf226ebf1d20b09fcb0861
make_check=no # cant run in sandbox

if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
Expand Down
10 changes: 10 additions & 0 deletions srcpkgs/hyprpaper/patches/02-fix-musl-cstring.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/src/ipc/HyprlandSocket.cpp
+++ b/src/ipc/HyprlandSocket.cpp
@@ -10,6 +10,7 @@
#include <format>

#include <hyprutils/memory/Casts.hpp>
+#include <cstring>

using namespace Hyprutils::Memory;

11 changes: 11 additions & 0 deletions srcpkgs/hyprpaper/patches/fix-append-range.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/config/WallpaperMatcher.cpp 2026-01-03 10:59:04.563049685 -0500
+++ b/src/config/WallpaperMatcher.cpp 2026-01-03 10:59:17.826651381 -0500
@@ -16,7 +16,7 @@
}

std::erase_if(m_settings, [&s](const auto& e) { return std::ranges::any_of(s, [&e](const auto& el) { return el.monitor == e.monitor; }); });
- m_settings.append_range(std::move(s));
+ m_settings.insert(m_settings.end(), std::make_move_iterator(s.begin()), std::make_move_iterator(s.end()));
recalcStates();
}

8 changes: 4 additions & 4 deletions srcpkgs/hyprpaper/template
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Template file for 'hyprpaper'
pkgname=hyprpaper
version=0.7.6
version=0.8.1
revision=3
build_style=cmake
configure_args="--no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr"
hostmakedepends="cmake pkgconf hyprwayland-scanner hyprland-protocols wayland-protocols"
hostmakedepends="cmake pkgconf hyprwayland-scanner hyprwire hyprland-protocols wayland-protocols"
makedepends="cairo-devel file-devel libjpeg-turbo-devel libwebp-devel
hyprgraphics hyprutils hyprlang pango-devel wlroots-devel"
hyprgraphics hyprutils hyprlang hyprtoolkit hyprwire pango-devel wlroots-devel"
short_desc="Fast wallpaper utility for wlroots compositors with IPC controls"
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=a19f59e21abb8b1e3f4103ffeeac7c4658c1c09433047979836b2210a4edc40e
checksum=6fb69e6d23f4547966ad20b8972d0a0c0f93d4de3d56823b8dd74af2678fe405

post_install() {
vlicense LICENSE
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.4.1
version=0.5.1
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=4728566eaafcfb5cf14022642b5ae0e8dd8a38cba902e4b37857f6e5d86a5b19
checksum=f9f481dc18ec1d293dbd4e508e784c3781d067972b053bf4db0a12cf506ca31d
make_check=no # cant run in sandbox

post_install() {
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/hyprutils/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'hyprutils'
pkgname=hyprutils
version=0.10.4
version=0.11.0
revision=1
build_style=cmake
configure_args="--no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \
Expand All @@ -12,7 +12,7 @@ maintainer="Encoded14 <linusken@tuta.io>"
license="BSD-3-Clause"
homepage="https://github.com/hyprwm/hyprutils"
distfiles="https://github.com/hyprwm/hyprutils/archive/refs/tags/v${version}.tar.gz"
checksum=054464eec86b1da8c91b950dc4db88e69f1364290c8cfa5e40d5a21df3944421
checksum=1f097eb9915081f1b929973701643bcd8581b469c242eae5446275b120a3b229

post_install() {
vlicense LICENSE
Expand Down
20 changes: 20 additions & 0 deletions srcpkgs/hyprwire/patches/02-fix-musl-cstring.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- a/src/core/client/ClientSocket.cpp
+++ b/src/core/client/ClientSocket.cpp
@@ -20,6 +20,7 @@
#include <netinet/in.h>

#include <filesystem>
+#include <cstring>
#include <hyprutils/utils/ScopeGuard.hpp>

using namespace Hyprwire;
--- a/src/core/server/ServerSocket.cpp
+++ b/src/core/server/ServerSocket.cpp
@@ -10,6 +10,7 @@
#include <netinet/in.h>

#include <filesystem>
+#include <cstring>
#include <hyprutils/utils/ScopeGuard.hpp>

using namespace Hyprwire;
149 changes: 149 additions & 0 deletions srcpkgs/hyprwire/patches/fix-append-range.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
diff '--color=auto' -ruN a/src/core/client/ClientSocket.cpp b/src/core/client/ClientSocket.cpp
--- a/src/core/client/ClientSocket.cpp 2026-01-02 18:44:05.566892723 -0500
+++ b/src/core/client/ClientSocket.cpp 2026-01-02 18:44:14.375794767 -0500
@@ -106,14 +106,16 @@
if (sizeWritten <= 0)
return false;

- data.append_range(std::span<uint8_t>(buffer, sizeWritten));
+ auto span1 = std::span<uint8_t>(buffer, sizeWritten);
+ data.insert(data.end(), span1.begin(), span1.end());

while (sizeWritten == BUFFER_SIZE) {
sizeWritten = read(m_fd.get(), buffer, BUFFER_SIZE);
if (sizeWritten < 0)
return false;

- data.append_range(std::span<uint8_t>(buffer, sizeWritten));
+ auto span2 = std::span<uint8_t>(buffer, sizeWritten);
+ data.insert(data.end(), span2.begin(), span2.end());
}

g_messageParser->handleMessage(data, m_self.lock());
diff '--color=auto' -ruN a/src/core/message/messages/BindProtocol.cpp b/src/core/message/messages/BindProtocol.cpp
--- a/src/core/message/messages/BindProtocol.cpp 2026-01-02 18:44:05.566985097 -0500
+++ b/src/core/message/messages/BindProtocol.cpp 2026-01-02 18:44:21.280795104 -0500
@@ -65,10 +65,12 @@

m_data.emplace_back(HW_MESSAGE_MAGIC_TYPE_VARCHAR);

- m_data.append_range(g_messageParser->encodeVarInt(protocol.length()));
- m_data.append_range(protocol);
+ auto varInt1 = g_messageParser->encodeVarInt(protocol.length());
+ m_data.insert(m_data.end(), varInt1.begin(), varInt1.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> uintMagic{HW_MESSAGE_MAGIC_TYPE_UINT, 0, 0, 0, 0};
+ m_data.insert(m_data.end(), uintMagic.begin(), uintMagic.end());

*rc<uint32_t*>(&m_data[m_data.size() - 4]) = version;

diff '--color=auto' -ruN a/src/core/message/messages/FatalProtocolError.cpp b/src/core/message/messages/FatalProtocolError.cpp
--- a/src/core/message/messages/FatalProtocolError.cpp 2026-01-02 18:44:05.567003142 -0500
+++ b/src/core/message/messages/FatalProtocolError.cpp 2026-01-02 18:44:27.292795398 -0500
@@ -58,7 +58,8 @@
*rc<uint32_t*>(&m_data[2]) = obj->m_id;
*rc<uint32_t*>(&m_data[7]) = errorId;

- m_data.append_range(g_messageParser->encodeVarInt(msg.size()));
- m_data.append_range(msg);
+ auto varInt1 = g_messageParser->encodeVarInt(msg.size());
+ m_data.insert(m_data.end(), varInt1.begin(), varInt1.end());
+ m_data.insert(m_data.end(), msg.begin(), msg.end());
m_data.emplace_back(HW_MESSAGE_MAGIC_END);
}
diff '--color=auto' -ruN a/src/core/message/messages/HandshakeBegin.cpp b/src/core/message/messages/HandshakeBegin.cpp
--- a/src/core/message/messages/HandshakeBegin.cpp 2026-01-02 18:44:05.567054171 -0500
+++ b/src/core/message/messages/HandshakeBegin.cpp 2026-01-02 18:44:33.945795723 -0500
@@ -57,7 +57,8 @@
HW_MESSAGE_MAGIC_TYPE_UINT,
};

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

const size_t HEAD_SIZE = m_data.size();

diff '--color=auto' -ruN a/src/core/message/messages/HandshakeProtocols.cpp b/src/core/message/messages/HandshakeProtocols.cpp
--- a/src/core/message/messages/HandshakeProtocols.cpp 2026-01-02 18:44:05.567069024 -0500
+++ b/src/core/message/messages/HandshakeProtocols.cpp 2026-01-02 18:44:40.873796061 -0500
@@ -56,11 +56,13 @@
HW_MESSAGE_MAGIC_TYPE_VARCHAR,
};

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

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

m_data.emplace_back(HW_MESSAGE_MAGIC_END);
diff '--color=auto' -ruN a/src/core/server/ServerSocket.cpp b/src/core/server/ServerSocket.cpp
--- a/src/core/server/ServerSocket.cpp 2026-01-02 18:44:05.567166722 -0500
+++ b/src/core/server/ServerSocket.cpp 2026-01-02 18:44:48.434796430 -0500
@@ -227,14 +227,16 @@
if (sizeWritten <= 0)
return;

- data.append_range(std::span<uint8_t>(buffer, sizeWritten));
+ auto span1 = std::span<uint8_t>(buffer, sizeWritten);
+ data.insert(data.end(), span1.begin(), span1.end());

while (sizeWritten == BUFFER_SIZE) {
sizeWritten = read(client->m_fd.get(), buffer, BUFFER_SIZE);
if (sizeWritten < 0)
return;

- data.append_range(std::span<uint8_t>(buffer, sizeWritten));
+ auto span2 = std::span<uint8_t>(buffer, sizeWritten);
+ data.insert(data.end(), span2.begin(), span2.end());
}

g_messageParser->handleMessage(data, client);
diff '--color=auto' -ruN a/src/core/wireObject/IWireObject.cpp b/src/core/wireObject/IWireObject.cpp
--- a/src/core/wireObject/IWireObject.cpp 2026-01-02 18:44:05.567189114 -0500
+++ b/src/core/wireObject/IWireObject.cpp 2026-01-02 18:45:09.515797460 -0500
@@ -101,8 +101,10 @@
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 varInt1 = g_messageParser->encodeVarInt(std::string_view(str).size());
+ data.insert(data.end(), varInt1.begin(), varInt1.end());
+ auto sv = std::string_view(str);
+ data.insert(data.end(), sv.begin(), sv.end());
break;
}

@@ -113,7 +115,8 @@

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

switch (arrType) {
case HW_MESSAGE_MAGIC_TYPE_UINT:
@@ -129,8 +132,10 @@
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 elemVarInt = g_messageParser->encodeVarInt(std::string_view(element).size());
+ data.insert(data.end(), elemVarInt.begin(), elemVarInt.end());
+ auto elemSv = std::string_view(element);
+ data.insert(data.end(), elemSv.begin(), elemSv.end());
}
break;
}
Loading