From 7279c89a8207982d1b43ea21d22de93506ab1f99 Mon Sep 17 00:00:00 2001 From: sulincix Date: Sun, 18 May 2025 10:44:13 +0000 Subject: [PATCH] wayland update --- dev/libs/wayland-protocols/ympbuild | 6 +- dev/libs/wayland/ympbuild | 6 +- dev/libs/weston/ympbuild | 6 +- gui/apps/waybar/fix-systray.patch | 119 ---------------------------- gui/apps/waybar/ympbuild | 48 ----------- gui/libs/wlroots/ympbuild | 1 + gui/wm/labwc/ympbuild | 6 +- gui/wm/sway/ympbuild | 8 +- 8 files changed, 17 insertions(+), 183 deletions(-) delete mode 100644 gui/apps/waybar/fix-systray.patch delete mode 100644 gui/apps/waybar/ympbuild diff --git a/dev/libs/wayland-protocols/ympbuild b/dev/libs/wayland-protocols/ympbuild index ffffc679..b12f59e4 100644 --- a/dev/libs/wayland-protocols/ympbuild +++ b/dev/libs/wayland-protocols/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='wayland-protocols' -release='6' -version='1.39' +release='7' +version='1.44' url='https://gitlab.freedesktop.org/wayland/wayland-protocols' description='Wayland protocol files' email='aliriza.keskin@pardus.org.tr' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$version/downloads/wayland-protocols-$version.tar.xz") depends=(wayland) makedepends=() -sha256sums=('e1dcdcbbf08e2e0a8a02ee5d9a0be3a6aafc39a4b51fa7e0d2f1a16411cb72fa') +sha256sums=('3df1107ecf8bfd6ee878aeca5d3b7afd81248a48031e14caf6ae01f14eebb50e') group=(dev.libs) uses=() arch=('x86_64') diff --git a/dev/libs/wayland/ympbuild b/dev/libs/wayland/ympbuild index d94a6267..66c6878c 100755 --- a/dev/libs/wayland/ympbuild +++ b/dev/libs/wayland/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='wayland' -release='3' -version='1.23.0' +release='4' +version='1.23.1' url='https://gitlab.freedesktop.org/wayland' description='Core Wayland window system code and protocol' email='aliriza.keskin@pardus.org.tr' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://gitlab.freedesktop.org/wayland/wayland/-/archive/$version/wayland-$version.tar.gz") depends=(zlib expat libffi xz-utils libxml2 mesa) makedepends=() -sha256sums=('7c5c28fa73f22d1c5021e17e1148f29ab17bf8b776a406f1c4489d3e2992ec3a') +sha256sums=('158ec49af498f2558c7fbf7e8b070d010d4e270cc6076003a18a6c813f87e244') group=(dev.libs) uses=() uses_extra=(doc) diff --git a/dev/libs/weston/ympbuild b/dev/libs/weston/ympbuild index f5fe691e..84899cda 100644 --- a/dev/libs/weston/ympbuild +++ b/dev/libs/weston/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='weston' -release='3' -version='13.0.0' +release='4' +version='14.0.2' url='https://gitlab.freedesktop.org/wayland/weston' description='A lightweight and functional Wayland compositor' email='aliriza.keskin@pardus.org.tr' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://gitlab.freedesktop.org/wayland/weston/-/archive/$version/weston-$version.tar.gz") depends=(pixman libdrm libxkbcommon libinput pango libjpeg-turbo lcms2 seatd pipewire xorg-xwayland xcb-util-cursor) makedepends=() -md5sums=('f5d8614664a26211621910d310b42890') +sha256sums=('633f4e0f232ad150300c95ffcbc646fedf1349487bf389dbd2045fa69013d6e2') group=(dev.libs) uses=() arch=('x86_64') diff --git a/gui/apps/waybar/fix-systray.patch b/gui/apps/waybar/fix-systray.patch deleted file mode 100644 index 978fb9b8..00000000 --- a/gui/apps/waybar/fix-systray.patch +++ /dev/null @@ -1,119 +0,0 @@ -From f60c291b82181b6e871b4807625fbcc7818d3c36 Mon Sep 17 00:00:00 2001 -From: Aleksei Bavshin -Date: Sat, 14 Sep 2024 07:36:23 -0700 -Subject: [PATCH 1/2] chore: update fmt wrap to 11.0.2 - ---- - subprojects/fmt.wrap | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap -index 42b615963..fd508477f 100644 ---- a/subprojects/fmt.wrap -+++ b/subprojects/fmt.wrap -@@ -1,13 +1,13 @@ - [wrap-file] --directory = fmt-11.0.1 --source_url = https://github.com/fmtlib/fmt/archive/11.0.1.tar.gz --source_filename = fmt-11.0.1.tar.gz --source_hash = 7d009f7f89ac84c0a83f79ed602463d092fbf66763766a907c97fd02b100f5e9 --patch_filename = fmt_11.0.1-1_patch.zip --patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.0.1-1/get_patch --patch_hash = 0a8b93d1ee6d84a82d3872a9bfb4c3977d8a53f7f484d42d1f7ed63ed496d549 --source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.1-1/fmt-11.0.1.tar.gz --wrapdb_version = 11.0.1-1 -+directory = fmt-11.0.2 -+source_url = https://github.com/fmtlib/fmt/archive/11.0.2.tar.gz -+source_filename = fmt-11.0.2.tar.gz -+source_hash = 6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f -+patch_filename = fmt_11.0.2-1_patch.zip -+patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.0.2-1/get_patch -+patch_hash = 90c9e3b8e8f29713d40ca949f6f93ad115d78d7fb921064112bc6179e6427c5e -+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.2-1/fmt-11.0.2.tar.gz -+wrapdb_version = 11.0.2-1 - - [provide] - fmt = fmt_dep - -From 0006e4713ae19776528038b3242ded05db884ba5 Mon Sep 17 00:00:00 2001 -From: Aleksei Bavshin -Date: Sat, 14 Sep 2024 07:37:37 -0700 -Subject: [PATCH 2/2] fix(tray): revert ustring formatting changes - -This reverts commit a4d31ab10d1630cb9104c695d7b777ca12468904. ---- - src/modules/sni/item.cpp | 23 +++++++++-------------- - 1 file changed, 9 insertions(+), 14 deletions(-) - -diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp -index 8afb39fb3..6c4ec8c06 100644 ---- a/src/modules/sni/item.cpp -+++ b/src/modules/sni/item.cpp -@@ -104,11 +104,9 @@ void Item::proxyReady(Glib::RefPtr& result) { - this->updateImage(); - - } catch (const Glib::Error& err) { -- spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, -- std::string(err.what())); -+ spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what()); - } catch (const std::exception& err) { -- spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, -- std::string(err.what())); -+ spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what()); - } - } - -@@ -126,15 +124,14 @@ ToolTip get_variant(const Glib::VariantBase& value) { - result.text = get_variant(container.get_child(2)); - auto description = get_variant(container.get_child(3)); - if (!description.empty()) { -- result.text = fmt::format("{}\n{}", std::string(result.text), std::string(description)); -+ result.text = fmt::format("{}\n{}", result.text, description); - } - return result; - } - - void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { - try { -- spdlog::trace("Set tray item property: {}.{} = {}", id.empty() ? bus_name : id, -- std::string(name), get_variant(value)); -+ spdlog::trace("Set tray item property: {}.{} = {}", id.empty() ? bus_name : id, name, value); - - if (name == "Category") { - category = get_variant(value); -@@ -179,12 +176,10 @@ void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) { - } - } catch (const Glib::Error& err) { - spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}", -- id.empty() ? bus_name : id, std::string(name), get_variant(value), -- std::string(err.what())); -+ id.empty() ? bus_name : id, name, value, err.what()); - } catch (const std::exception& err) { - spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}", -- id.empty() ? bus_name : id, std::string(name), get_variant(value), -- std::string(err.what())); -+ id.empty() ? bus_name : id, name, value, err.what()); - } - } - -@@ -226,9 +221,9 @@ void Item::processUpdatedProperties(Glib::RefPtr& _result) { - - this->updateImage(); - } catch (const Glib::Error& err) { -- spdlog::warn("Failed to update properties: {}", std::string(err.what())); -+ spdlog::warn("Failed to update properties: {}", err.what()); - } catch (const std::exception& err) { -- spdlog::warn("Failed to update properties: {}", std::string(err.what())); -+ spdlog::warn("Failed to update properties: {}", err.what()); - } - update_pending_.clear(); - } -@@ -250,7 +245,7 @@ static const std::map> signal2props - - void Item::onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name, - const Glib::VariantContainerBase& arguments) { -- spdlog::trace("Tray item '{}' got signal {}", id, std::string(signal_name)); -+ spdlog::trace("Tray item '{}' got signal {}", id, signal_name); - auto changed = signal2props.find(signal_name.raw()); - if (changed != signal2props.end()) { - if (update_pending_.empty()) { diff --git a/gui/apps/waybar/ympbuild b/gui/apps/waybar/ympbuild deleted file mode 100644 index b38cd42f..00000000 --- a/gui/apps/waybar/ympbuild +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash -name='waybar' -release='1' -version='0.11.0' -url='https:///github.com/Alexays/Waybar' -description='Highly customizable Wayland bar for Sway and Wlroots based compositors.' -email='aliriza.keskin@pardus.org.tr' -maintainer='aliriza' -license=('GPLv3') -source=("https://github.com/Alexays/Waybar/archive/refs/tags/0.11.0.tar.gz" - "fix-systray.patch" -) -depends=(fmt gtk-layer-shell gtkmm3 jack2 jsoncpp libdbusmenu libinput - libnl libxkbcommon pipewire spdlog upower wireplumber) -makedepends=() -sha256sums=('6a0e9f0f7f2eff503951958cbb16dc39041c0b67e86c35154e8507677c61be9d' - 'SKIP') -group=(gui.apps) -uses=() -arch=('x86_64') - -cd Waybar-$version - -prepare(){ - patch -Np1 -i ../fix-systray.patch -} - -setup () { - meson setup build \ - --prefix=/usr \ - -Dcpp_std=c++20 \ - -Dexperimental=true \ - -Dcava=disabled \ - -Dpulseaudio=disabled \ - -Dsndio=disabled - - - -} - -build () { - ninja -C build $jobs -} - -package () { - ninja -C build install $jobs -} - diff --git a/gui/libs/wlroots/ympbuild b/gui/libs/wlroots/ympbuild index a3f1fb0b..d13f4854 100644 --- a/gui/libs/wlroots/ympbuild +++ b/gui/libs/wlroots/ympbuild @@ -11,6 +11,7 @@ source=("https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/$version/wlroo depends=(seatd hwdata eudev libxkbcommon wayland xcb-util-wm libglvnd libglvnd libinput libxcb libxcb mesa pixman vulkan-loader xcb-util-errors xcb-util-renderutil + libdisplay-info xorg-xwayland lcms2 ) makedepends=() sha256sums=('703c515917d9eb258e44296795f8626190e119b0ee8bfb32fe9f834dab1a1462') diff --git a/gui/wm/labwc/ympbuild b/gui/wm/labwc/ympbuild index 7768d5da..7c1e45ab 100644 --- a/gui/wm/labwc/ympbuild +++ b/gui/wm/labwc/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='labwc' -release='1' -version='0.8.2' +release='2' +version='0.8.4' url='https://github.com/labwc/labwc' description=='A Wayland window-stacking compositor' email='aliriza.keskin@pardus.org.tr' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://github.com/labwc/labwc/archive/$version.tar.gz") depends=(libpng libsfdo librsvg pango seatd wlroots wayland xorg-xwayland) makedepends=() -sha256sums=('1adba1c87ec26f2f00409b47a0b79ccfd68bd160e1abc41822fb01f0a76ee947') +sha256sums=('2d3ded90f78efb5060f7057ea802c78a79dc9b2e82ae7a2ad902af957b8b9797') group=(gui.wm) uses=() arch=('x86_64') diff --git a/gui/wm/sway/ympbuild b/gui/wm/sway/ympbuild index 3e0c183e..1cc7d042 100644 --- a/gui/wm/sway/ympbuild +++ b/gui/wm/sway/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='sway' -release='4' -version='1.10' +release='5' +version='1.11-rc2' bg_version='1.2.1' url='https://github.com/swaywm/sway' description=='i3-compatible Wayland window manager' @@ -11,9 +11,9 @@ license=('GPLv3') source=("https://github.com/swaywm/sway/archive/refs/tags/$version.zip" "https://github.com/swaywm/swaybg/archive/refs/tags/v${bg_version}.tar.gz" "sway.desktop") -depends=(wlroots json-c xorg-xwayland gdk-pixbuf cairo libevdev libinput pango vulkan-loader libdisplay-info xcb-util-renderutil) +depends=(wlroots json-c gdk-pixbuf cairo libevdev libinput pango vulkan-loader xcb-util-renderutil) makedepends=() -sha256sums=('94abef8c011ca7d9ebe794bdb8375a49b4067417532098c183b88a2a0beeb64f' +sha256sums=('12c46ec78eaa02d6b43d52009096e02009c4bf8313dd4e078cd8daf5d1913a89' '45c4a1a3b83c86ddc321a6136402b708f195a022d0ccee4641b23d14c3a3c25e' 'SKIP') group=(gui.wm)