[arch-commits] Commit in waybar/repos (3 files)

Maxime Gauduin alucryd at archlinux.org
Tue Aug 27 19:45:04 UTC 2019


    Date: Tuesday, August 27, 2019 @ 19:45:03
  Author: alucryd
Revision: 503319

archrelease: copy trunk to community-staging-x86_64

Added:
  waybar/repos/community-staging-x86_64/
  waybar/repos/community-staging-x86_64/PKGBUILD
    (from rev 503318, waybar/trunk/PKGBUILD)
  waybar/repos/community-staging-x86_64/waybar-fmt6.patch
    (from rev 503318, waybar/trunk/waybar-fmt6.patch)

-------------------+
 PKGBUILD          |   49 +++++++++++++++++++++++++++++++
 waybar-fmt6.patch |   82 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+)

Copied: waybar/repos/community-staging-x86_64/PKGBUILD (from rev 503318, waybar/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2019-08-27 19:45:03 UTC (rev 503319)
@@ -0,0 +1,49 @@
+# Maintainer: Brett Cornwall <ainola at archlinux.org>
+
+pkgname=waybar
+pkgver=0.7.2
+pkgrel=2
+pkgdesc='Highly customizable Wayland bar for Sway and Wlroots based compositors'
+arch=('x86_64')
+url="https://github.com/Alexays/Waybar/"
+license=('MIT')
+depends=(
+    'fmt'
+    'gtkmm3'
+    'jsoncpp'
+    'libdbusmenu-gtk3'
+    'libpulse'
+    'libmpdclient'
+)
+# Sway is needed for building support for workspace and window title modules
+makedepends=(
+    'meson'
+    'spdlog'
+    'sway'
+)
+optdepends=(
+    'otf-font-awesome: Icons in the default configuration'
+)
+source=(
+    "$pkgname-$pkgver.tar.gz::https://github.com/Alexays/Waybar/archive/$pkgver.tar.gz"
+    waybar-fmt6.patch
+)
+sha256sums=('6996a7d6fbf5457ec42ba9ebc76bf1417618ed9103074490a0730d58161ffdb0'
+            '3412fb8c7260a09a5ae61051dba38196bb4bc9f223ba05bb3ed3f4a139e84514')
+
+prepare() {
+    cd "Waybar-$pkgver"
+    patch -Np1 -i ../waybar-fmt6.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-staging-x86_64/waybar-fmt6.patch (from rev 503318, waybar/trunk/waybar-fmt6.patch)
===================================================================
--- community-staging-x86_64/waybar-fmt6.patch	                        (rev 0)
+++ community-staging-x86_64/waybar-fmt6.patch	2019-08-27 19:45:03 UTC (rev 503319)
@@ -0,0 +1,82 @@
+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