[PR PATCH] Waybar

[PR PATCH] Waybar

[ifreund]

[-- Attachment #1: Type: text/plain, Size: 1772 bytes --]

There is a new pull request by ifreund against master on the void-packages repository

https://github.com/ifreund/void-packages Waybar
https://github.com/void-linux/void-packages/pull/32584

Waybar
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


cc @ericonr. I needed libxkbregistry in order to build master waybar so I thought I'd go ahead and bump the void package as well. Looks like the patch for fmt 8.0.0 has been upstreamed which is nice :)

A patch file from https://github.com/void-linux/void-packages/pull/32584.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Waybar-32584.patch --]
[-- Type: text/x-diff, Size: 5056 bytes --]

From 7ac975f48eb8125ddc2407e3679ec1ede4a7d9ff Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Thu, 19 Aug 2021 11:34:48 +0200
Subject: [PATCH 1/2] libxkbcommon: enable xkbregistry

This is now needed by Waybar
---
 common/shlibs                 | 1 +
 srcpkgs/libxkbcommon/template | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 63dea0e2ea0b..ac7e101d8e1d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1155,6 +1155,7 @@ libtomcrypt.so.1 libtomcrypt-1.18.0_1
 libHX.so.28 libHX-3.14_1
 libxkbcommon.so.0 libxkbcommon-0.2.0_1
 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
+libxkbregistry.so.0 libxkbcommon-1.3.0_3
 libgee-0.8.so.2 libgee08-0.8.2_1
 libnettle.so.8 nettle-3.6_1
 libhogweed.so.6 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 5cdadd1db7db..bfaf31572ea6 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,13 +1,16 @@
 # Template file for 'libxkbcommon'
 pkgname=libxkbcommon
 version=1.3.0
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname#lib}-${version}"
 build_style=meson
+# b_ndebug=false is needed to pass the test suite, as it relies on side effects
+# in the arguments of assert calls.
 configure_args="-Denable-x11=true -Denable-docs=false
- -Denable-wayland=true -Denable-xkbregistry=false"
+ -Denable-wayland=true -Denable-xkbregistry=true -Db_ndebug=false"
 hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols xorgproto"
+makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols
+ xorgproto libxml2-devel"
 depends="xkeyboard-config"
 short_desc="Library to handle keyboard descriptions"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"

From 167d93152b7c840e1555134a145ecc03b87544c3 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Thu, 19 Aug 2021 11:50:19 +0200
Subject: [PATCH 2/2] Waybar: update to 0.9.8.

---
 .../patches/libfmt8-compatibility.patch       | 40 -------------------
 srcpkgs/Waybar/template                       |  6 +--
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch

diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..ac01043daa5f 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.7
-revision=2
+version=0.9.8
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
@@ -31,7 +31,7 @@ changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
  https://github.com/HowardHinnant/date/archive/v${_date_version}.tar.gz
  https://github.com/mesonbuild/hinnant-date/releases/download/${_date_version}-1/hinnant-date.zip"
-checksum="0d23573e0f6ce6e3f3eb4d1d7313848b924429268f3becd81649a391ae7703e7
+checksum="3f067c484aaee3e7d8ded382e72c280a92913b0c4e8a20d0ac9afdf8baf19405
  87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
  6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
 

Re: Waybar: update to 0.9.8.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32584#issuecomment-902144989

Comment:
Neat

#32572 was doing a split for a sub package, what do you think?

Re: Waybar: update to 0.9.8.

[ifreund]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

New comment by ifreund on void-packages repository

https://github.com/void-linux/void-packages/pull/32584#issuecomment-902171746

Comment:
> #32572 was doing a split for a sub package, what do you think?

Oh, I totally missed that PR. Since waybar seems to be the only think that needs `libxkbregistry`, splitting into a subpackage makes sense to me, just a minute.

Re: [PR PATCH] [Updated] Waybar: update to 0.9.8.

[ifreund]

[-- Attachment #1: Type: text/plain, Size: 1795 bytes --]

There is an updated pull request by ifreund against master on the void-packages repository

https://github.com/ifreund/void-packages Waybar
https://github.com/void-linux/void-packages/pull/32584

Waybar: update to 0.9.8.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


cc @ericonr. I needed libxkbregistry in order to build master waybar so I thought I'd go ahead and bump the void package as well. Looks like the patch for fmt 8.0.0 has been upstreamed which is nice :)

A patch file from https://github.com/void-linux/void-packages/pull/32584.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Waybar-32584.patch --]
[-- Type: text/x-diff, Size: 5837 bytes --]

From 882e2df86a0446d3a90b2ea208ceebf60758e118 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Thu, 19 Aug 2021 11:34:48 +0200
Subject: [PATCH 1/2] libxkbcommon: enable xkbregistry

This is now needed by Waybar
---
 common/shlibs                 |  1 +
 srcpkgs/libxkbcommon/template | 17 ++++++++++++++---
 srcpkgs/libxkbregistry        |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/libxkbregistry

diff --git a/common/shlibs b/common/shlibs
index 63dea0e2ea0b..39136a41cfe3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1155,6 +1155,7 @@ libtomcrypt.so.1 libtomcrypt-1.18.0_1
 libHX.so.28 libHX-3.14_1
 libxkbcommon.so.0 libxkbcommon-0.2.0_1
 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
+libxkbregistry.so.0 libxkbregistry-1.3.0_3
 libgee-0.8.so.2 libgee08-0.8.2_1
 libnettle.so.8 nettle-3.6_1
 libhogweed.so.6 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 5cdadd1db7db..ed016aae5ee9 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,13 +1,16 @@
 # Template file for 'libxkbcommon'
 pkgname=libxkbcommon
 version=1.3.0
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname#lib}-${version}"
 build_style=meson
+# b_ndebug=false is needed to pass the test suite, as it relies on side effects
+# in the arguments of assert calls.
 configure_args="-Denable-x11=true -Denable-docs=false
- -Denable-wayland=true -Denable-xkbregistry=false"
+ -Denable-wayland=true -Denable-xkbregistry=true -Db_ndebug=false"
 hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols xorgproto"
+makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols
+ xorgproto libxml2-devel"
 depends="xkeyboard-config"
 short_desc="Library to handle keyboard descriptions"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
@@ -27,8 +30,16 @@ libxkbcommon-x11_package() {
 	}
 }
 
+libxkbregistry_package() {
+	short_desc="XKB API to query available rules, models, layouts, variants and options"
+	pkg_install() {
+		vmove "usr/lib/libxkbregistry.so.*"
+	}
+}
+
 libxkbcommon-devel_package() {
 	depends="${sourcepkg}-x11>=${version}_${revision}
+	 libxkbregistry>=${version}_${revision}
 	 ${sourcepkg}>=${version}_${revision} libxcb-devel"
 	short_desc+=" - development files"
 	pkg_install() {
diff --git a/srcpkgs/libxkbregistry b/srcpkgs/libxkbregistry
new file mode 120000
index 000000000000..51911d5197ae
--- /dev/null
+++ b/srcpkgs/libxkbregistry
@@ -0,0 +1 @@
+libxkbcommon
\ No newline at end of file

From 985f4a57cc81ebc336efa212733d806c23096cac Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Thu, 19 Aug 2021 11:50:19 +0200
Subject: [PATCH 2/2] Waybar: update to 0.9.8.

---
 .../patches/libfmt8-compatibility.patch       | 40 -------------------
 srcpkgs/Waybar/template                       |  6 +--
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch

diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..ac01043daa5f 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.7
-revision=2
+version=0.9.8
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
@@ -31,7 +31,7 @@ changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
  https://github.com/HowardHinnant/date/archive/v${_date_version}.tar.gz
  https://github.com/mesonbuild/hinnant-date/releases/download/${_date_version}-1/hinnant-date.zip"
-checksum="0d23573e0f6ce6e3f3eb4d1d7313848b924429268f3becd81649a391ae7703e7
+checksum="3f067c484aaee3e7d8ded382e72c280a92913b0c4e8a20d0ac9afdf8baf19405
  87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
  6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
 

Re: [PR PATCH] [Merged]: Waybar: update to 0.9.8.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]

There's a merged pull request on the void-packages repository

Waybar: update to 0.9.8.
https://github.com/void-linux/void-packages/pull/32584

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


cc @ericonr. I needed libxkbregistry in order to build master waybar so I thought I'd go ahead and bump the void package as well. Looks like the patch for fmt 8.0.0 has been upstreamed which is nice :)