1 |
commit: 5890ab330b1fe490a6c938fa974391993da52c8c |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 29 22:07:22 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 29 22:07:22 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5890ab33 |
7 |
|
8 |
gui-apps/waybar: fix build w/ libc++ |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
.../waybar/files/waybar-0.9.13-libcxx-build.patch | 36 ++++++++++++++++++++++ |
13 |
gui-apps/waybar/waybar-0.9.13.ebuild | 4 +++ |
14 |
2 files changed, 40 insertions(+) |
15 |
|
16 |
diff --git a/gui-apps/waybar/files/waybar-0.9.13-libcxx-build.patch b/gui-apps/waybar/files/waybar-0.9.13-libcxx-build.patch |
17 |
new file mode 100644 |
18 |
index 000000000000..ad24e22fc437 |
19 |
--- /dev/null |
20 |
+++ b/gui-apps/waybar/files/waybar-0.9.13-libcxx-build.patch |
21 |
@@ -0,0 +1,36 @@ |
22 |
+https://github.com/Alexays/Waybar/commit/d25278f710a4932798c98141bcf5b482de0e9166 |
23 |
+ |
24 |
+From: Jan Beich <jbeich@×××××××.org> |
25 |
+Date: Mon, 23 May 2022 16:23:00 +0000 |
26 |
+Subject: [PATCH] fix(upower): add missing include for libc++ |
27 |
+ |
28 |
+In file included from src/modules/upower/upower.cpp:1: |
29 |
+include/modules/upower/upower.hpp:25:16: error: no template named 'unordered_map' in namespace 'std' |
30 |
+ typedef std::unordered_map<std::string, UpDevice *> Devices; |
31 |
+ ~~~~~^ |
32 |
+In file included from src/modules/upower/upower_tooltip.cpp:1: |
33 |
+include/modules/upower/upower_tooltip.hpp:13:16: error: no template named 'unordered_map' in namespace 'std' |
34 |
+ typedef std::unordered_map<std::string, UpDevice*> Devices; |
35 |
+ ~~~~~^ |
36 |
+--- a/include/modules/upower/upower.hpp |
37 |
++++ b/include/modules/upower/upower.hpp |
38 |
+@@ -5,6 +5,7 @@ |
39 |
+ #include <iostream> |
40 |
+ #include <map> |
41 |
+ #include <string> |
42 |
++#include <unordered_map> |
43 |
+ |
44 |
+ #include "ALabel.hpp" |
45 |
+ #include "glibconfig.h" |
46 |
+--- a/include/modules/upower/upower_tooltip.hpp |
47 |
++++ b/include/modules/upower/upower_tooltip.hpp |
48 |
+@@ -2,6 +2,8 @@ |
49 |
+ |
50 |
+ #include <libupower-glib/upower.h> |
51 |
+ |
52 |
++#include <unordered_map> |
53 |
++ |
54 |
+ #include "gtkmm/box.h" |
55 |
+ #include "gtkmm/label.h" |
56 |
+ #include "gtkmm/window.h" |
57 |
+ |
58 |
|
59 |
diff --git a/gui-apps/waybar/waybar-0.9.13.ebuild b/gui-apps/waybar/waybar-0.9.13.ebuild |
60 |
index 6fbac657f700..c4886a844841 100644 |
61 |
--- a/gui-apps/waybar/waybar-0.9.13.ebuild |
62 |
+++ b/gui-apps/waybar/waybar-0.9.13.ebuild |
63 |
@@ -57,6 +57,10 @@ DEPEND=" |
64 |
" |
65 |
RDEPEND="${DEPEND}" |
66 |
|
67 |
+PATCHES=( |
68 |
+ "${FILESDIR}"/${P}-libcxx-build.patch |
69 |
+) |
70 |
+ |
71 |
src_configure() { |
72 |
local emesonargs=( |
73 |
$(meson_feature mpd) |