From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Waybar: update to 0.9.0
Date: Tue, 21 Jan 2020 15:08:22 +0100 [thread overview]
Message-ID: <20200121140822.pHBL62R8RgvbRKnudPWBFP1yDuCfzrinAyiE16eq148@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18439@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 633 bytes --]
There is an updated pull request by damneq against master on the void-packages repository
https://github.com/damneq/void-packages Waybar
https://github.com/void-linux/void-packages/pull/18439
Waybar: update to 0.9.0
I added new required dependencies: wf-shell and scdoc and also disabled the new meson build option "systemd" as Void Linux runs runit (it was enabled by default and the package couldn't be compiled).
Also I'm really sorry for closing the previous pull request by accident, I'm new to git.
#18428 can be closed now, right?
A patch file from https://github.com/void-linux/void-packages/pull/18439.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Waybar-18439.patch --]
[-- Type: text/x-diff, Size: 2867 bytes --]
From 793126776855e3606489dc93f91c6f84cfa62882 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Tue, 21 Jan 2020 15:07:52 +0100
Subject: [PATCH] Waybar: update to 0.9.0
---
common/shlibs | 1 +
...9.0-fix-building-with-libnl-option-enabled.patch | 8 ++++++++
srcpkgs/Waybar/template | 13 +++++++------
3 files changed, 16 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Waybar/patches/Waybar-0.9.0-fix-building-with-libnl-option-enabled.patch
diff --git a/common/shlibs b/common/shlibs
index 60f082055a3..35fcd4de243 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3705,3 +3705,4 @@ libnvpair.so.1 zfs-0.8.2_1
libjsonnet.so.0 jsonnet-0.14.0_2
libjsonnet++.so.0 jsonnet-0.14.0_2
libigdgmm.so.11 intel-gmmlib-19.4.1_1
+libgtk-layer-shell.so.0 wf-shell-0.3_1
diff --git a/srcpkgs/Waybar/patches/Waybar-0.9.0-fix-building-with-libnl-option-enabled.patch b/srcpkgs/Waybar/patches/Waybar-0.9.0-fix-building-with-libnl-option-enabled.patch
new file mode 100644
index 00000000000..91695c00f9a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/Waybar-0.9.0-fix-building-with-libnl-option-enabled.patch
@@ -0,0 +1,8 @@
+--- src/modules/network.cpp
++++ src/modules/network.cpp
+@@ -2,6 +2,7 @@
+ #include <spdlog/spdlog.h>
+ #include <sys/eventfd.h>
+ #include <fstream>
++#include <cassert>
+ #include "util/format.hpp"
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 9b9242f8824..a41cbe97854 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,13 +1,14 @@
# Template file for 'Waybar'
pkgname=Waybar
-version=0.8.0
-revision=2
+version=0.9.0
+revision=1
build_style=meson
configure_args="-Dlibnl=$(vopt_if libnl enabled disabled)
-Dpulseaudio=$(vopt_if pulseaudio enabled disabled)
- -Ddbusmenu-gtk=$(vopt_if dbusmenugtk enabled disabled)"
-hostmakedepends="pkg-config glib-devel wayland-devel sway"
-makedepends="libinput-devel wayland-devel wlroots-devel gtkmm-devel spdlog
+ -Ddbusmenu-gtk=$(vopt_if dbusmenugtk enabled disabled)
+ -Dsystemd=disabled"
+hostmakedepends="pkg-config glib-devel wayland-devel sway scdoc"
+makedepends="wf-shell libinput-devel wayland-devel wlroots-devel gtkmm-devel spdlog
jsoncpp-devel libglib-devel libsigc++-devel fmt-devel
$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if libnl libnl3-devel)
$(vopt_if dbusmenugtk libdbusmenu-gtk3-devel)
@@ -18,7 +19,7 @@ license="MIT"
homepage="https://github.com/Alexays/Waybar"
changelog="https://github.com/Alexays/Waybar/releases"
distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz"
-checksum=2de2f0cec243da0d9ff2255ceb9dac9d95e8be06d6ea13926fae460d72e4b8aa
+checksum=65e8397d5a8880cbb9172138e361b0d91f649bc99327d36945e38d1e5dbb157d
build_options="libnl pulseaudio dbusmenugtk mpd"
build_options_default="pulseaudio mpd"
next prev parent reply other threads:[~2020-01-21 14:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 23:12 [PR PATCH] " voidlinux-github
2020-01-21 13:27 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-21 13:35 ` voidlinux-github
2020-01-21 14:02 ` voidlinux-github
2020-01-21 14:08 ` voidlinux-github [this message]
2020-01-21 14:09 ` voidlinux-github
2020-01-21 15:13 ` [PR PATCH] [Merged]: " voidlinux-github
-- strict thread matches above, loose matches on Subject: below --
2020-01-20 20:28 [PR PATCH] " voidlinux-github
2020-01-20 22:56 ` [PR PATCH] [Updated] " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200121140822.pHBL62R8RgvbRKnudPWBFP1yDuCfzrinAyiE16eq148@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).