From owner-dev-commits-ports-all@freebsd.org Mon Aug 16 15:30:20 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4BF816769A7; Mon, 16 Aug 2021 15:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GpJ580JlYz4hQp; Mon, 16 Aug 2021 15:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5D4C3DB5; Mon, 16 Aug 2021 15:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17GFUJqW088095; Mon, 16 Aug 2021 15:30:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17GFUJq6088092; Mon, 16 Aug 2021 15:30:19 GMT (envelope-from git) Date: Mon, 16 Aug 2021 15:30:19 GMT Message-Id: <202108161530.17GFUJq6088092@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: aebf1537099a - main - x11/waybar: update to 0.9.8 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aebf1537099aaf0fdd63c92a3559a0838e487c58 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2021 15:30:20 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=aebf1537099aaf0fdd63c92a3559a0838e487c58 commit aebf1537099aaf0fdd63c92a3559a0838e487c58 Author: Jan Beich AuthorDate: 2021-08-16 13:47:34 +0000 Commit: Jan Beich CommitDate: 2021-08-16 15:25:56 +0000 x11/waybar: update to 0.9.8 Changes: https://github.com/Alexays/Waybar/releases/tag/0.9.8 Reported by: GitHub (watch releases) --- x11/waybar/Makefile | 16 +++++++++++----- x11/waybar/distinfo | 6 +++--- x11/waybar/files/date.pc.in | 2 +- x11/waybar/files/patch-libfmt | 28 ---------------------------- 4 files changed, 15 insertions(+), 37 deletions(-) diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 19c82d068d14..f0e82c970359 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -1,6 +1,5 @@ PORTNAME= waybar -DISTVERSION= 0.9.7 -PORTREVISION= 1 +DISTVERSION= 0.9.8 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -14,7 +13,8 @@ LIB_DEPENDS= libdate-tz.so:devel/date \ libjsoncpp.so:devel/jsoncpp \ libfmt.so:devel/libfmt \ libspdlog.so:devel/spdlog \ - libwayland-client.so:graphics/wayland + libwayland-client.so:graphics/wayland \ + libxkbregistry.so:x11/libxkbcommon USES= compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes @@ -32,12 +32,17 @@ CONFIGURE_ENV+= PKG_CONFIG_PATH="${WRKDIR}" SUB_FILES+= date.pc .endif -OPTIONS_DEFINE= DBUS GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV -OPTIONS_DEFAULT=DBUS GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV +OPTIONS_DEFINE= DBUS EVDEV GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV +OPTIONS_DEFAULT=DBUS EVDEV GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV DBUS_LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu DBUS_MESON_ENABLED= dbusmenu-gtk +EVDEV_DESC= Keyboard state via libevdev +EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto +EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev +EVDEV_MESON_ENABLED= libevdev + GLS_DESC= Use gtk-layer-shell library for popups support GLS_LIB_DEPENDS= libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell GLS_MESON_ENABLED= gtk-layer-shell @@ -55,6 +60,7 @@ MANPAGES_PLIST_FILES= man/man5/${PORTNAME}-backlight.5.gz \ man/man5/${PORTNAME}-custom.5.gz \ man/man5/${PORTNAME}-disk.5.gz \ man/man5/${PORTNAME}-idle-inhibitor.5.gz \ + man/man5/${PORTNAME}-keyboard-state.5.gz \ man/man5/${PORTNAME}-memory.5.gz \ man/man5/${PORTNAME}-mpd.5.gz \ man/man5/${PORTNAME}-network.5.gz \ diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo index 94f5269468a5..13c7b1ea3a86 100644 --- a/x11/waybar/distinfo +++ b/x11/waybar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618514274 -SHA256 (Alexays-Waybar-0.9.7_GH0.tar.gz) = 0d23573e0f6ce6e3f3eb4d1d7313848b924429268f3becd81649a391ae7703e7 -SIZE (Alexays-Waybar-0.9.7_GH0.tar.gz) = 150768 +TIMESTAMP = 1629121654 +SHA256 (Alexays-Waybar-0.9.8_GH0.tar.gz) = 3f067c484aaee3e7d8ded382e72c280a92913b0c4e8a20d0ac9afdf8baf19405 +SIZE (Alexays-Waybar-0.9.8_GH0.tar.gz) = 158869 diff --git a/x11/waybar/files/date.pc.in b/x11/waybar/files/date.pc.in index a0bd9279cb1d..49d9db58bc26 100644 --- a/x11/waybar/files/date.pc.in +++ b/x11/waybar/files/date.pc.in @@ -5,6 +5,6 @@ includedir=${prefix}/include Name: date Description: Date and time library based on the C++11/14/17 header -Version: 3.0.0 +Version: 3.0.1 Cflags: -I${includedir} Libs: -L${libdir} -ldate-tz diff --git a/x11/waybar/files/patch-libfmt b/x11/waybar/files/patch-libfmt deleted file mode 100644 index f80a7cd6cf9a..000000000000 --- a/x11/waybar/files/patch-libfmt +++ /dev/null @@ -1,28 +0,0 @@ -Obtained from: https://github.com/Alexays/Waybar/commit/1c2e0083ba5a80d0f22a14d2baa8df52024a7394 - ---- include/util/format.hpp.orig 2021-04-15 19:17:54 UTC -+++ include/util/format.hpp -@@ -35,7 +35,11 @@ namespace fmt { - // The rationale for ignoring it is that the only reason to specify - // an alignment and a with is to get a fixed width bar, and ">" is - // sufficient in this implementation. -+#if FMT_VERSION < 80000 - width = parse_nonnegative_int(it, end, ctx); -+#else -+ width = detail::parse_nonnegative_int(it, end, -1); -+#endif - } - return it; - } ---- src/modules/clock.cpp.orig 2021-04-15 19:17:54 UTC -+++ src/modules/clock.cpp -@@ -196,6 +196,9 @@ template <> - struct fmt::formatter : fmt::formatter { - template - auto format(const waybar_time& t, FormatContext& ctx) { -+#if FMT_VERSION >= 80000 -+ auto& tm_format = specs; -+#endif - return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime)); - } - };