From f2e359c456b051f95efc92e21299d55a302e58ed Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Nov 2024 03:03:00 +0000 Subject: gentoo auto-resync : 19:11:2024 - 03:03:00 --- gui-apps/Manifest.gz | Bin 5053 -> 5052 bytes gui-apps/waybar/Manifest | 2 + gui-apps/waybar/files/tray-icons-fix.patch | 99 +++++++++++++++++++++++++++ gui-apps/waybar/waybar-0.11.0-r1.ebuild | 105 +++++++++++++++++++++++++++++ 4 files changed, 206 insertions(+) create mode 100644 gui-apps/waybar/files/tray-icons-fix.patch create mode 100644 gui-apps/waybar/waybar-0.11.0-r1.ebuild (limited to 'gui-apps') diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz index 4265f0b0ee52..53c045535b6a 100644 Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest index c2669e95a6a7..e8efdc68f952 100644 --- a/gui-apps/waybar/Manifest +++ b/gui-apps/waybar/Manifest @@ -1,6 +1,8 @@ +AUX tray-icons-fix.patch 4847 BLAKE2B 94f584236f8b8a47597d81dda5d51c67d6db9daa0421aef86389ad454e55b6aedd5230282d905a70d58b99a42550ceff7aa9d117dcaae67d4b6004656564e49a SHA512 f4b54e1997dd45dc45a2d6689f2d58428ffeb2f9e65afa2f76b4c1fc0af9f0c021527014f68ccf8229b9acebf96befa95a3c15d6afafe27767b6580423ec0dbd DIST waybar-0.10.4.tar.gz 309411 BLAKE2B 907273e6f1371252aad05212b4c59eabe1662167659d22073ee3bf649d8ee43be852b996dd7b86eecd0384b833cd2d7b9eed69b6b3292cb0b9cdbeb88c9e2391 SHA512 e6b25e242c67cae6566c5db9f4cba55ec4fb57cd7345ca3f5d24126ecf5bde150fb8d5cd14f80d3462f81254e1789986c28e3ebdb4227e8c5c8ddcf10fcfd49c DIST waybar-0.11.0.tar.gz 317607 BLAKE2B f2407335e00f02cbf946d95cfcd409dd148917839fd73d52bec1a0c77e041022e81ad7efcde2bd4394356d92686a25b2ca345319fee5ac393202a483db339f93 SHA512 6bd23a469205662e524e53dd8798c4dce6ed371e5106f34644540e2f89804181753814f74b45645185b933c43dc4a0eabb99633936433fdadc25a9cce58b06b0 EBUILD waybar-0.10.4-r1.ebuild 2430 BLAKE2B 183403d7ae5cff41f7a91d7cd3803b2b10b3fd4f968a897575180ed9c81ccdc4e6deed0ad3bcf6ab0dd736108b631e19134faf5c21bad3f659be0df96e820721 SHA512 90f87be0d91ff299b27e2a81457de561a339fd65fdb8f6252f706b7391111604796ca5707fea227c6a3bae53d34e468258e93ae0b555afc2cd8cbaa41f05483b +EBUILD waybar-0.11.0-r1.ebuild 2480 BLAKE2B c4b2c6c887eeeebe7d6386044a5f601c3e86a944866b45a76507b06182dd111999823eae933d0ea761c2fe7c89a043cf177f0c8d3728ce53310f4e20914eab8e SHA512 c0daf40daca97ee890c4457cf602e145bd15782739691d7e87f554f0dabe755823902f2d95d2516bcfb3e9e636c30f80cd7456596a31d89c4f9dad394a0d8b4a EBUILD waybar-0.11.0.ebuild 2431 BLAKE2B 56d9efff56f8d23d1098c24a936d95e42f5fb31fe8ae2dbda6587af8984573fa0f4393fa8c231fd748978eb09852b7ce83d1ac38f81bad11d88e7de54740ab93 SHA512 682076b52d6451d731d8836333110ae9eadb75d64d4f93557a913e6edae5481e2bfef484ace50b028fb2d9d78a61d3563a1f4cc569268c4ed3509fcf8cd51cc5 EBUILD waybar-9999.ebuild 2439 BLAKE2B 211a5b24e74efcbf2a9b1b7859ee8aca051db4e82f4cfbd6e2f0af09e39403f6271304d7ee39b405c9ee5e4810cc3aa683158787993713deed66cd2f9248df53 SHA512 92a7c7451841e516601bc2b3b25cfdabfea439ad5739f81bf7be0ad419c5a3d529b8d7e8487232b5bb56f5e0a7f87d95b3032d81ae1d46e2db457b95d5d080cd MISC metadata.xml 1606 BLAKE2B a364eeb9464f58fcb379a290f774cbd067883134ecf3fc7cf978455cd3d8412c65bc9070ba856c183624e89c15b15f6fb5acaa64a15c3d94e39b047acfac3512 SHA512 5aae9c0808b8fc2be2693852894668aaa4f93939b2f88a3a8f0fe788650579974de860b4af5fb692d775e558876d1521882462ea670b84490811af52029c0056 diff --git a/gui-apps/waybar/files/tray-icons-fix.patch b/gui-apps/waybar/files/tray-icons-fix.patch new file mode 100644 index 000000000000..95bf11ffca16 --- /dev/null +++ b/gui-apps/waybar/files/tray-icons-fix.patch @@ -0,0 +1,99 @@ +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/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 diff --git a/gui-apps/waybar/waybar-0.11.0-r1.ebuild b/gui-apps/waybar/waybar-0.11.0-r1.ebuild new file mode 100644 index 000000000000..b9e3032679d6 --- /dev/null +++ b/gui-apps/waybar/waybar-0.11.0-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors" +HOMEPAGE="https://github.com/Alexays/Waybar" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git" +else + SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" + S="${WORKDIR}/${PN^}-${PV}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="evdev experimental jack +libinput +logind mpd mpris network pipewire pulseaudio sndio systemd test tray +udev upower wifi" +REQUIRED_USE=" + upower? ( logind ) +" + +RESTRICT="!test? ( test )" + +BDEPEND=" + >=app-text/scdoc-1.9.2 + dev-util/gdbus-codegen + dev-util/wayland-scanner + virtual/pkgconfig +" +RDEPEND=" + dev-cpp/cairomm:0 + dev-cpp/glibmm:2 + dev-cpp/gtkmm:3.0 + dev-libs/glib:2 + dev-libs/jsoncpp:= + dev-libs/libsigc++:2 + >=dev-libs/libfmt-8.1.1:= + >=dev-libs/spdlog-1.10.0:= + dev-libs/date:= + dev-libs/wayland + gui-libs/gtk-layer-shell + media-video/pipewire:= + x11-libs/gtk+:3[wayland] + x11-libs/libxkbcommon + evdev? ( dev-libs/libevdev ) + jack? ( virtual/jack ) + libinput? ( dev-libs/libinput:= ) + logind? ( + || ( sys-apps/systemd + sys-auth/elogind ) + ) + mpd? ( media-libs/libmpdclient ) + mpris? ( >=media-sound/playerctl-2 ) + network? ( dev-libs/libnl:3 ) + pipewire? ( media-video/wireplumber:0/0.5 ) + pulseaudio? ( media-libs/libpulse ) + sndio? ( media-sound/sndio:= ) + systemd? ( sys-apps/systemd:= ) + tray? ( + dev-libs/libayatana-appindicator + dev-libs/libdbusmenu[gtk3] + ) + udev? ( virtual/libudev:= ) + upower? ( sys-power/upower:= ) + wifi? ( sys-apps/util-linux ) +" +DEPEND="${RDEPEND} + dev-libs/wayland-protocols + test? ( dev-cpp/catch:0 ) +" + +PATCHES=( + "${FILESDIR}"/tray-icons-fix.patch +) + +src_configure() { + local emesonargs=( + -Dman-pages=enabled + -Dcava=disabled + $(meson_feature evdev libevdev) + $(meson_feature jack) + $(meson_feature libinput) + $(meson_feature logind) + $(meson_feature mpd) + $(meson_feature mpris) + $(meson_feature network libnl) + $(meson_feature pulseaudio) + $(meson_feature pipewire wireplumber) + $(meson_feature pipewire) + $(meson_feature sndio) + $(meson_feature systemd) + $(meson_feature test tests) + $(meson_feature tray dbusmenu-gtk) + $(meson_feature udev libudev) + $(meson_feature upower upower_glib) + $(meson_feature wifi rfkill) + $(meson_use experimental) + ) + meson_src_configure +} -- cgit v1.2.3