[arch-commits] Commit in waybar/repos/community-x86_64 (4 files)
Brett Cornwall
ainola at archlinux.org
Wed Dec 11 03:30:51 UTC 2019
Date: Wednesday, December 11, 2019 @ 03:30:51
Author: ainola
Revision: 536604
archrelease: copy trunk to community-x86_64
Added:
waybar/repos/community-x86_64/PKGBUILD
(from rev 536603, waybar/trunk/PKGBUILD)
waybar/repos/community-x86_64/include_cassert.patch
(from rev 536603, waybar/trunk/include_cassert.patch)
Deleted:
waybar/repos/community-x86_64/PKGBUILD
waybar/repos/community-x86_64/waybar-fmt6.patch
-----------------------+
PKGBUILD | 93 +++++++++++++++++++++++++-----------------------
include_cassert.patch | 10 +++++
waybar-fmt6.patch | 82 ------------------------------------------
3 files changed, 60 insertions(+), 125 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-12-11 03:30:37 UTC (rev 536603)
+++ PKGBUILD 2019-12-11 03:30:51 UTC (rev 536604)
@@ -1,43 +0,0 @@
-# Maintainer: Brett Cornwall <ainola at archlinux.org>
-
-pkgname=waybar
-pkgver=0.8.0
-pkgrel=4
-pkgdesc='Highly customizable Wayland bar for Sway and Wlroots based compositors'
-arch=('x86_64')
-url="https://github.com/Alexays/Waybar/"
-license=('MIT')
-depends=(
- 'gtkmm3'
- 'jsoncpp'
- 'libjsoncpp.so'
- 'libdbusmenu-gtk3'
- 'libpulse'
- 'libmpdclient'
- 'spdlog'
-)
-# Sway is needed for building support for workspace and window title modules
-makedepends=(
- 'meson'
- 'scdoc' # For generating manpages
- 'sway'
-)
-optdepends=(
- 'otf-font-awesome: Icons in the default configuration'
-)
-source=(
- "$pkgname-$pkgver.tar.gz::https://github.com/Alexays/Waybar/archive/$pkgver.tar.gz"
-)
-sha256sums=('2de2f0cec243da0d9ff2255ceb9dac9d95e8be06d6ea13926fae460d72e4b8aa')
-
-build() {
- cd "Waybar-$pkgver"
- meson --prefix=/usr build
- ninja -C build
-}
-
-package() {
- cd "Waybar-$pkgver"
- DESTDIR="$pkgdir" ninja -C build install
- install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
-}
Copied: waybar/repos/community-x86_64/PKGBUILD (from rev 536603, waybar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-12-11 03:30:51 UTC (rev 536604)
@@ -0,0 +1,50 @@
+# Maintainer: Brett Cornwall <ainola at archlinux.org>
+
+pkgname=waybar
+pkgver=0.8.0
+pkgrel=5
+pkgdesc='Highly customizable Wayland bar for Sway and Wlroots based compositors'
+arch=('x86_64')
+url="https://github.com/Alexays/Waybar/"
+license=('MIT')
+depends=(
+ 'gtkmm3'
+ 'jsoncpp'
+ 'libjsoncpp.so'
+ 'libdbusmenu-gtk3'
+ 'libpulse'
+ 'libmpdclient'
+ 'spdlog'
+)
+# Sway is needed for building support for workspace and window title modules
+makedepends=(
+ 'meson'
+ 'scdoc' # For generating manpages
+ 'sway'
+)
+optdepends=(
+ 'otf-font-awesome: Icons in the default configuration'
+)
+source=(
+ "$pkgname-$pkgver.tar.gz::https://github.com/Alexays/Waybar/archive/$pkgver.tar.gz"
+ "include_cassert.patch"
+)
+sha256sums=('2de2f0cec243da0d9ff2255ceb9dac9d95e8be06d6ea13926fae460d72e4b8aa'
+ 'ca77d1ba64d0852bbf0aaa0b8c648e88f8712ed51fb39862b636eb0b33c6e7e1')
+
+prepare() {
+ cd "Waybar-$pkgver"
+ patch -p1 < ../include_cassert.patch
+}
+
+build() {
+ cd "Waybar-$pkgver"
+ meson --prefix=/usr build
+ ninja -C build
+}
+
+package() {
+ cd "Waybar-$pkgver"
+ DESTDIR="$pkgdir" ninja -C build install
+ install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+}
Copied: waybar/repos/community-x86_64/include_cassert.patch (from rev 536603, waybar/trunk/include_cassert.patch)
===================================================================
--- include_cassert.patch (rev 0)
+++ include_cassert.patch 2019-12-11 03:30:51 UTC (rev 536604)
@@ -0,0 +1,10 @@
+--- a/src/modules/network.cpp 2019-08-29 02:56:57.000000000 -0700
++++ b/src/modules/network.cpp 2019-12-10 18:48:47.795028451 -0800
+@@ -2,6 +2,7 @@
+ #include <spdlog/spdlog.h>
+ #include <sys/eventfd.h>
+ #include <fstream>
++#include <cassert>
+
+ namespace {
+
Deleted: waybar-fmt6.patch
===================================================================
--- waybar-fmt6.patch 2019-12-11 03:30:37 UTC (rev 536603)
+++ waybar-fmt6.patch 2019-12-11 03:30:51 UTC (rev 536604)
@@ -1,82 +0,0 @@
-From 4c18a0b6238f88e8f6deda6259e1d17968bcf755 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich at FreeBSD.org>
-Date: Tue, 27 Aug 2019 13:19:07 +0000
-Subject: [PATCH] Unbreak build with fmtlib 6.0.0
-
-In file included from ../src/factory.cpp:1:
-In file included from ../include/factory.hpp:4:
-../include/modules/clock.hpp:5:10: fatal error: 'fmt/time.h' file not found
- #include "fmt/time.h"
- ^~~~~~~~~~~~
-In file included from ../src/bar.cpp:4:
-In file included from ../include/factory.hpp:4:
-In file included from ../include/modules/clock.hpp:3:
-In file included from /usr/include/fmt/chrono.h:12:
-/usr/include/fmt/locale.h:19:35: error: parameter type 'fmt::v5::internal::buffer' (aka 'basic_buffer<char>') is an abstract class
- const std::locale& loc, buffer<Char>& buf,
- ^
-/usr/include/spdlog/fmt/bundled/core.h:238:16: note: unimplemented pure virtual method 'grow' in 'basic_buffer'
- virtual void grow(std::size_t capacity) = 0;
- ^
-In file included from ../src/modules/sni/host.cpp:3:
-/usr/include/fmt/ostream.h:22:9: error: expected member name or ';' after declaration specifiers
- buffer<Char>& buffer_;
- ~~~~~~^
-/usr/include/fmt/ostream.h:25:19: error: expected ')'
- formatbuf(buffer<Char>& buf) : buffer_(buf) {}
- ^
-/usr/include/fmt/ostream.h:25:12: note: to match this '('
- formatbuf(buffer<Char>& buf) : buffer_(buf) {}
- ^
-/usr/include/fmt/ostream.h:25:42: error: use of undeclared identifier 'buf'; did you mean 'prettify_handler::buf'?
- formatbuf(buffer<Char>& buf) : buffer_(buf) {}
- ^~~
- prettify_handler::buf
-/usr/include/spdlog/fmt/bundled/format-inl.h:551:11: note: 'prettify_handler::buf' declared here
- buffer &buf;
- ^
----
- include/modules/clock.hpp | 2 +-
- src/bar.cpp | 2 +-
- src/modules/sni/host.cpp | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
-index b812b70..4a0c1e5 100644
---- a/include/modules/clock.hpp
-+++ b/include/modules/clock.hpp
-@@ -1,8 +1,8 @@
- #pragma once
-
-+#include <fmt/chrono.h>
- #include <fmt/format.h>
- #include "ALabel.hpp"
--#include "fmt/time.h"
- #include "util/sleeper_thread.hpp"
-
- namespace waybar::modules {
-diff --git a/src/bar.cpp b/src/bar.cpp
-index 8a45869..8e64349 100644
---- a/src/bar.cpp
-+++ b/src/bar.cpp
-@@ -1,7 +1,7 @@
- #include "bar.hpp"
--#include <spdlog/spdlog.h>
- #include "client.hpp"
- #include "factory.hpp"
-+#include <spdlog/spdlog.h>
-
- waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
- : output(w_output),
-diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp
-index 015f756..c815c65 100644
---- a/src/modules/sni/host.cpp
-+++ b/src/modules/sni/host.cpp
-@@ -1,6 +1,6 @@
- #include "modules/sni/host.hpp"
--#include <spdlog/spdlog.h>
- #include <fmt/ostream.h>
-+#include <spdlog/spdlog.h>
-
- namespace waybar::modules::SNI {
-
More information about the arch-commits
mailing list