* [PR PATCH] Waybar: update to 0.9.2
@ 2020-05-15 21:03 ericonr
2020-05-15 21:10 ` DirectorX
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: ericonr @ 2020-05-15 21:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 467 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages waybar
https://github.com/void-linux/void-packages/pull/21996
Waybar: update to 0.9.2
Added dbusmenugtk option as default for all situations. libnl now works
for musl.
@DirectorX are you still using Void? Otherwise I can maintain the package.
A patch file from https://github.com/void-linux/void-packages/pull/21996.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waybar-21996.patch --]
[-- Type: text/x-diff, Size: 3957 bytes --]
From 8f7e356a4616f90ee508097c63407d411927b58b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 15 May 2020 17:57:32 -0300
Subject: [PATCH] Waybar: update to 0.9.2
Added dbusmenugtk option as default for all situations. libnl now works
for musl.
---
...x-building-with-libnl-option-enabled.patch | 8 ----
srcpkgs/Waybar/template | 39 ++++++++++---------
2 files changed, 20 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/Waybar/patches/Waybar-0.9.0-fix-building-with-libnl-option-enabled.patch
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
deleted file mode 100644
index 91695c00f9a..00000000000
--- a/srcpkgs/Waybar/patches/Waybar-0.9.0-fix-building-with-libnl-option-enabled.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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 0e914a24f4e..009ea48333a 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,16 +1,20 @@
# Template file for 'Waybar'
pkgname=Waybar
-version=0.9.0
+version=0.9.2
revision=1
build_style=meson
-configure_args="-Dlibnl=$(vopt_if libnl enabled disabled)
+configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
+ -Dsystemd=disabled
+ -Dlibnl=$(vopt_if libnl enabled disabled)
-Dpulseaudio=$(vopt_if pulseaudio enabled disabled)
-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
+ -Dmpd=$(vopt_if mpd enabled disabled)"
+hostmakedepends="cmake pkg-config glib-devel wayland-devel scdoc
+ $(vopt_if dbusmenugtk gobject-introspection)"
+makedepends="libinput-devel wayland-devel gtkmm-devel spdlog eudev-libudev-devel
gtk-layer-shell-devel jsoncpp-devel libglib-devel libsigc++-devel fmt-devel
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if libnl libnl3-devel)
+ $(vopt_if libnl libnl3-devel)
+ $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if dbusmenugtk libdbusmenu-gtk3-devel)
$(vopt_if mpd libmpdclient-devel)"
short_desc="Polybar-like Wayland Bar for Sway and Wlroots based compositors"
@@ -18,26 +22,23 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
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=65e8397d5a8880cbb9172138e361b0d91f649bc99327d36945e38d1e5dbb157d
+distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
+ https://github.com/HowardHinnant/date/archive/v2.4.1.tar.gz
+ https://github.com/mesonbuild/hinnant-date/releases/download/2.4.1-1/hinnant-date.zip"
+checksum="9740662de19dd6126c23efb69c9dc7f9d918443543af12aee770de39d415bdf8
+ 98907d243397483bd7ad889bf6c66746db0d7d2a39cc9aacc041834c40b65b98
+ 2061673a6f8e6d63c3a40df4da58fa2b3de2835fd9b3e74649e8279599f3a8f6"
build_options="libnl pulseaudio dbusmenugtk mpd"
-build_options_default="pulseaudio mpd"
+build_options_default="libnl pulseaudio dbusmenugtk mpd"
desc_option_libnl="Enable libnl support for network related features"
desc_option_dbusmenugtk="Enable support for tray"
desc_option_mpd="Enable support for MPD"
-
-if [ -z "$CROSS_BUILD" ]; then
- # Requires gobject introspection
- build_options_default+=" dbusmenugtk"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) ;; # Has broken network headers on musl
- *) build_options_default+=" libnl"
-esac
+pre_configure() {
+ cp -rv ../date-2.4.1 subprojects/
+}
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Waybar: update to 0.9.2
2020-05-15 21:03 [PR PATCH] Waybar: update to 0.9.2 ericonr
@ 2020-05-15 21:10 ` DirectorX
2020-05-15 21:16 ` [PR PATCH] [Updated] " ericonr
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: DirectorX @ 2020-05-15 21:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by DirectorX on void-packages repository
https://github.com/void-linux/void-packages/pull/21996#issuecomment-629486580
Comment:
@ericonr feel free to take ownership
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] Waybar: update to 0.9.2
2020-05-15 21:03 [PR PATCH] Waybar: update to 0.9.2 ericonr
2020-05-15 21:10 ` DirectorX
@ 2020-05-15 21:16 ` ericonr
2020-05-15 21:18 ` ericonr
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-05-15 21:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages waybar
https://github.com/void-linux/void-packages/pull/21996
Waybar: update to 0.9.2
Added dbusmenugtk option as default for all situations. libnl now works
for musl.
@DirectorX are you still using Void/having time to maintain this? I can maintain the package, if you'd like.
A patch file from https://github.com/void-linux/void-packages/pull/21996.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waybar-21996.patch --]
[-- Type: text/x-diff, Size: 4019 bytes --]
From 3eaf7c13ced99f62dd314fe7fb2b98c756e58696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 15 May 2020 17:57:32 -0300
Subject: [PATCH] Waybar: update to 0.9.2, claim maintainer
Added dbusmenugtk option as default for all situations. libnl now works
for musl.
[ci skip]
---
...x-building-with-libnl-option-enabled.patch | 8 ----
srcpkgs/Waybar/template | 41 ++++++++++---------
2 files changed, 21 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/Waybar/patches/Waybar-0.9.0-fix-building-with-libnl-option-enabled.patch
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
deleted file mode 100644
index 91695c00f9a..00000000000
--- a/srcpkgs/Waybar/patches/Waybar-0.9.0-fix-building-with-libnl-option-enabled.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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 0e914a24f4e..582528d86fe 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,43 +1,44 @@
# Template file for 'Waybar'
pkgname=Waybar
-version=0.9.0
+version=0.9.2
revision=1
build_style=meson
-configure_args="-Dlibnl=$(vopt_if libnl enabled disabled)
+configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
+ -Dsystemd=disabled
+ -Dlibnl=$(vopt_if libnl enabled disabled)
-Dpulseaudio=$(vopt_if pulseaudio enabled disabled)
-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
+ -Dmpd=$(vopt_if mpd enabled disabled)"
+hostmakedepends="cmake pkg-config glib-devel wayland-devel scdoc
+ $(vopt_if dbusmenugtk gobject-introspection)"
+makedepends="libinput-devel wayland-devel gtkmm-devel spdlog eudev-libudev-devel
gtk-layer-shell-devel jsoncpp-devel libglib-devel libsigc++-devel fmt-devel
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if libnl libnl3-devel)
+ $(vopt_if libnl libnl3-devel)
+ $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if dbusmenugtk libdbusmenu-gtk3-devel)
$(vopt_if mpd libmpdclient-devel)"
short_desc="Polybar-like Wayland Bar for Sway and Wlroots based compositors"
-maintainer="DirectorX <void.directorx@protonmail.com>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
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=65e8397d5a8880cbb9172138e361b0d91f649bc99327d36945e38d1e5dbb157d
+distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
+ https://github.com/HowardHinnant/date/archive/v2.4.1.tar.gz
+ https://github.com/mesonbuild/hinnant-date/releases/download/2.4.1-1/hinnant-date.zip"
+checksum="9740662de19dd6126c23efb69c9dc7f9d918443543af12aee770de39d415bdf8
+ 98907d243397483bd7ad889bf6c66746db0d7d2a39cc9aacc041834c40b65b98
+ 2061673a6f8e6d63c3a40df4da58fa2b3de2835fd9b3e74649e8279599f3a8f6"
build_options="libnl pulseaudio dbusmenugtk mpd"
-build_options_default="pulseaudio mpd"
+build_options_default="libnl pulseaudio dbusmenugtk mpd"
desc_option_libnl="Enable libnl support for network related features"
desc_option_dbusmenugtk="Enable support for tray"
desc_option_mpd="Enable support for MPD"
-
-if [ -z "$CROSS_BUILD" ]; then
- # Requires gobject introspection
- build_options_default+=" dbusmenugtk"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) ;; # Has broken network headers on musl
- *) build_options_default+=" libnl"
-esac
+pre_configure() {
+ cp -rv ../date-2.4.1 subprojects/
+}
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Waybar: update to 0.9.2
2020-05-15 21:03 [PR PATCH] Waybar: update to 0.9.2 ericonr
2020-05-15 21:10 ` DirectorX
2020-05-15 21:16 ` [PR PATCH] [Updated] " ericonr
@ 2020-05-15 21:18 ` ericonr
2020-05-15 21:31 ` [PR PATCH] [Updated] " ericonr
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-05-15 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/21996#issuecomment-629491531
Comment:
CI results: https://travis-ci.org/github/void-linux/void-packages/builds/687604360, I skipped rebuilding just for the maintainer change.
@DirectorX ok, thanks!
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] Waybar: update to 0.9.2
2020-05-15 21:03 [PR PATCH] Waybar: update to 0.9.2 ericonr
` (2 preceding siblings ...)
2020-05-15 21:18 ` ericonr
@ 2020-05-15 21:31 ` ericonr
2020-05-18 0:14 ` ericonr
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-05-15 21:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages waybar
https://github.com/void-linux/void-packages/pull/21996
Waybar: update to 0.9.2
Added dbusmenugtk option as default for all situations. libnl now works
for musl.
@DirectorX are you still using Void/having time to maintain this? I can maintain the package, if you'd like.
A patch file from https://github.com/void-linux/void-packages/pull/21996.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waybar-21996.patch --]
[-- Type: text/x-diff, Size: 4087 bytes --]
From aff3bcc84a4bd58032188c186004957ff33cf860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 15 May 2020 17:57:32 -0300
Subject: [PATCH] Waybar: update to 0.9.2, claim maintainer
Added dbusmenugtk option as default for all situations. libnl now works
for musl.
[ci skip]
---
...x-building-with-libnl-option-enabled.patch | 8 ----
srcpkgs/Waybar/template | 42 ++++++++++---------
2 files changed, 22 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/Waybar/patches/Waybar-0.9.0-fix-building-with-libnl-option-enabled.patch
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
deleted file mode 100644
index 91695c00f9a..00000000000
--- a/srcpkgs/Waybar/patches/Waybar-0.9.0-fix-building-with-libnl-option-enabled.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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 0e914a24f4e..42b922ca0d0 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,43 +1,45 @@
# Template file for 'Waybar'
pkgname=Waybar
-version=0.9.0
+version=0.9.2
revision=1
build_style=meson
-configure_args="-Dlibnl=$(vopt_if libnl enabled disabled)
+configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
+ -Dsystemd=disabled
+ -Dlibnl=$(vopt_if libnl enabled disabled)
-Dpulseaudio=$(vopt_if pulseaudio enabled disabled)
-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
+ -Dmpd=$(vopt_if mpd enabled disabled)"
+hostmakedepends="cmake pkg-config glib-devel wayland-devel scdoc
+ $(vopt_if dbusmenugtk gobject-introspection)"
+makedepends="libinput-devel wayland-devel gtkmm-devel spdlog eudev-libudev-devel
gtk-layer-shell-devel jsoncpp-devel libglib-devel libsigc++-devel fmt-devel
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if libnl libnl3-devel)
+ $(vopt_if libnl libnl3-devel)
+ $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if dbusmenugtk libdbusmenu-gtk3-devel)
$(vopt_if mpd libmpdclient-devel)"
short_desc="Polybar-like Wayland Bar for Sway and Wlroots based compositors"
-maintainer="DirectorX <void.directorx@protonmail.com>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
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=65e8397d5a8880cbb9172138e361b0d91f649bc99327d36945e38d1e5dbb157d
+# date library URLs and checksums taken from subprojects/date.wrap
+distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
+ https://github.com/HowardHinnant/date/archive/v2.4.1.tar.gz
+ https://github.com/mesonbuild/hinnant-date/releases/download/2.4.1-1/hinnant-date.zip"
+checksum="9740662de19dd6126c23efb69c9dc7f9d918443543af12aee770de39d415bdf8
+ 98907d243397483bd7ad889bf6c66746db0d7d2a39cc9aacc041834c40b65b98
+ 2061673a6f8e6d63c3a40df4da58fa2b3de2835fd9b3e74649e8279599f3a8f6"
build_options="libnl pulseaudio dbusmenugtk mpd"
-build_options_default="pulseaudio mpd"
+build_options_default="libnl pulseaudio dbusmenugtk mpd"
desc_option_libnl="Enable libnl support for network related features"
desc_option_dbusmenugtk="Enable support for tray"
desc_option_mpd="Enable support for MPD"
-
-if [ -z "$CROSS_BUILD" ]; then
- # Requires gobject introspection
- build_options_default+=" dbusmenugtk"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) ;; # Has broken network headers on musl
- *) build_options_default+=" libnl"
-esac
+pre_configure() {
+ cp -rv ../date-2.4.1 subprojects/
+}
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Waybar: update to 0.9.2
2020-05-15 21:03 [PR PATCH] Waybar: update to 0.9.2 ericonr
` (3 preceding siblings ...)
2020-05-15 21:31 ` [PR PATCH] [Updated] " ericonr
@ 2020-05-18 0:14 ` ericonr
2020-05-18 7:59 ` Johnnynator
2020-05-18 7:59 ` [PR PATCH] [Merged]: " Johnnynator
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-05-18 0:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 539 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/21996#issuecomment-629884296
Comment:
@Johnnynator per https://github.com/HowardHinnant/date/pull/538, it's not possible to use a distro wide package for date yet. I could add a patch with that PR's contents, that way we can use it. Seems to be what Arch is doing https://git.archlinux.org/svntogit/community.git/tree/trunk/538-output-date-pc-for-pkg-config.patch?h=packages/chrono-date . Otherwise, it has to be built at the same time.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Waybar: update to 0.9.2
2020-05-15 21:03 [PR PATCH] Waybar: update to 0.9.2 ericonr
` (4 preceding siblings ...)
2020-05-18 0:14 ` ericonr
@ 2020-05-18 7:59 ` Johnnynator
2020-05-18 7:59 ` [PR PATCH] [Merged]: " Johnnynator
6 siblings, 0 replies; 8+ messages in thread
From: Johnnynator @ 2020-05-18 7:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/21996#issuecomment-630013403
Comment:
Ok, than just leave it as is for now.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: Waybar: update to 0.9.2
2020-05-15 21:03 [PR PATCH] Waybar: update to 0.9.2 ericonr
` (5 preceding siblings ...)
2020-05-18 7:59 ` Johnnynator
@ 2020-05-18 7:59 ` Johnnynator
6 siblings, 0 replies; 8+ messages in thread
From: Johnnynator @ 2020-05-18 7:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
There's a merged pull request on the void-packages repository
Waybar: update to 0.9.2
https://github.com/void-linux/void-packages/pull/21996
Description:
Added dbusmenugtk option as default for all situations. libnl now works
for musl.
@DirectorX are you still using Void/having time to maintain this? I can maintain the package, if you'd like.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-05-18 7:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-15 21:03 [PR PATCH] Waybar: update to 0.9.2 ericonr
2020-05-15 21:10 ` DirectorX
2020-05-15 21:16 ` [PR PATCH] [Updated] " ericonr
2020-05-15 21:18 ` ericonr
2020-05-15 21:31 ` [PR PATCH] [Updated] " ericonr
2020-05-18 0:14 ` ericonr
2020-05-18 7:59 ` Johnnynator
2020-05-18 7:59 ` [PR PATCH] [Merged]: " Johnnynator
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).