commit: 2a2296006e39fc38d5469181c12cdfffca28fa68
Author: Daichi Yamamoto <dev <AT> dyama <DOT> net>
AuthorDate: Sun Aug 4 09:09:00 2024 +0000
Commit: Daichi Yamamoto <dev <AT> dyama <DOT> net>
CommitDate: Sun Aug 4 09:09:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2a229600
gui-apps/yambar: add 1.11.0, drop 1.9.0, 1.10.0
Signed-off-by: Daichi Yamamoto <dev <AT> dyama.net>
gui-apps/yambar/Manifest | 3 +-
gui-apps/yambar/files/round.patch | 68 -------------
.../{yambar-1.10.0.ebuild => yambar-1.11.0.ebuild} | 0
gui-apps/yambar/yambar-1.9.0.ebuild | 108 ---------------------
gui-apps/yambar/yambar-9999.ebuild | 6 +-
5 files changed, 4 insertions(+), 181 deletions(-)
diff --git a/gui-apps/yambar/Manifest b/gui-apps/yambar/Manifest
index d69999591..b2a48bf1e 100644
--- a/gui-apps/yambar/Manifest
+++ b/gui-apps/yambar/Manifest
@@ -1,2 +1 @@
-DIST yambar-1.10.0.tar.gz 190288 BLAKE2B
35bfd50b27241724fa29f0ea6b1031dad793d1ff2c8342f5ed40bdc1fb390a32813d17b6c3063184109769a54fb5c5bce876a83974cdbb17679fd80a88d9d797
SHA512
c8d1e807017f62886cba65dab9933913f473eeeae8cbf8d44ddd4953754a55c81def9a02506b28a7ea7264325748db0a0ca4cdff39ba74a06f531e6e55878b35
-DIST yambar-1.9.0.tar.gz 186338 BLAKE2B
9fd043aab241c75e84bcdffcfed51bd24d3a687ff80f4b44517168fc46a33934467fd8bf7a315076e15fc74e157f3bccf703ae2fd32ed969082c383570b0f3bd
SHA512
de1acf1e738b33e2e0ee1dba497b5b84137028551827c38eee67fdc5bfb688f2037a52ccac7f5fb56ffeed7382e4cd670fd0b564c7f532f21a85724640c8004b
+DIST yambar-1.11.0.tar.gz 191737 BLAKE2B
b6980a67db88c11641db3fcbf8ba7c76d53c9c14da3c45dad2ff58bd39284dc4023f4157ca27a31cbcec778efeb75dc1cb0aa2fe4c94188db412e6540ab01e42
SHA512
af932799916316b152767be2ba57b53d4eba38ab295731a96a29ca20d70e3df30163ebe55981a98b540cef43412ac635d55d477fdf2d9b5a47f7dc5c34985272
diff --git a/gui-apps/yambar/files/round.patch
b/gui-apps/yambar/files/round.patch
deleted file mode 100644
index a934c0e83..000000000
--- a/gui-apps/yambar/files/round.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From ede6a541e1c6a861461c189513187a69e3e5ce91 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <[email protected]>
-Date: Sat, 17 Dec 2022 18:15:14 +0100
-Subject: [PATCH] =?UTF-8?q?modules:=20meson:=20add=20missing=20=E2=80=98m?=
- =?UTF-8?q?=E2=80=99=20(math)=20dependency?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The following modules used functions from the ‘m’ (math)
-library (e.g. round()), but didn’t explicitly link against it. This
-caused build failures when no other plugin that _did_ link against ‘m’
-was enabled.
-
-* cpu
-* mem
-* pulse
-* pipewire
-* foreign-toplevel
-
-Closes #239
----
-
-diff --git a/modules/meson.build b/modules/meson.build
-index 49aba6d..f8d1e80 100644
---- a/modules/meson.build
-+++ b/modules/meson.build
-@@ -70,7 +70,7 @@ if plugin_clock_enabled
- endif
-
- if plugin_cpu_enabled
-- mod_data += {'cpu': [[], [dynlist]]}
-+ mod_data += {'cpu': [[], [m, dynlist]]}
- endif
-
- if plugin_disk_io_enabled
-@@ -82,7 +82,7 @@ if plugin_dwl_enabled
- endif
-
- if plugin_mem_enabled
-- mod_data += {'mem': [[], []]}
-+ mod_data += {'mem': [[], [m]]}
- endif
-
- if plugin_mpd_enabled
-@@ -102,11 +102,11 @@ if plugin_network_enabled
- endif
-
- if plugin_pipewire_enabled
-- mod_data += {'pipewire': [[], [pipewire, dynlist, json_pipewire]]}
-+ mod_data += {'pipewire': [[], [m, pipewire, dynlist, json_pipewire]]}
- endif
-
- if plugin_pulse_enabled
-- mod_data += {'pulse': [[], [pulse]]}
-+ mod_data += {'pulse': [[], [m, pulse]]}
- endif
-
- if plugin_removables_enabled
-@@ -170,7 +170,7 @@ if plugin_foreign_toplevel_enabled
- command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@'])
- endforeach
-
-- mod_data += {'foreign-toplevel': [[wl_proto_src + wl_proto_headers +
ftop_proto_headers + ftop_proto_src], [dynlist, wayland_client]]}
-+ mod_data += {'foreign-toplevel': [[wl_proto_src + wl_proto_headers +
ftop_proto_headers + ftop_proto_src], [m, dynlist, wayland_client]]}
- endif
-
- foreach mod, data : mod_data
diff --git a/gui-apps/yambar/yambar-1.10.0.ebuild
b/gui-apps/yambar/yambar-1.11.0.ebuild
similarity index 100%
rename from gui-apps/yambar/yambar-1.10.0.ebuild
rename to gui-apps/yambar/yambar-1.11.0.ebuild
diff --git a/gui-apps/yambar/yambar-1.9.0.ebuild
b/gui-apps/yambar/yambar-1.9.0.ebuild
deleted file mode 100644
index 904fe490f..000000000
--- a/gui-apps/yambar/yambar-1.9.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://codeberg.org/dnkl/${PN}.git";
-else
- SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${PN}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
-HOMEPAGE="https://codeberg.org/dnkl/yambar";
-LICENSE="MIT"
-SLOT="0"
-IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl
+foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio
+removables +river +script sway-xkb wayland +X xkb xwindow"
-REQUIRED_USE="
- || ( wayland X )
- sway-xkb? ( wayland )
- xkb? ( X )
- xwindow? ( X )
-"
-
-RDEPEND="
- >=media-libs/fcft-2.4.0
- dev-libs/libyaml
- alsa? ( media-libs/alsa-lib )
- backlight? ( virtual/libudev:= )
- battery? ( virtual/libudev:= )
- mpd? ( media-libs/libmpdclient )
- pipewire? (
- dev-libs/json-c
- media-video/pipewire
- )
- pulseaudio? ( media-libs/libpulse )
- removables? ( virtual/libudev:= )
- sway-xkb? ( dev-libs/json-c )
- x11-libs/pixman
- X? (
- x11-libs/libxcb:0=[xkb]
- x11-libs/xcb-util
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-wm
- )
- wayland? ( dev-libs/wayland )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-text/scdoc
- >=dev-libs/tllist-1.0.1
- >=dev-build/meson-0.53.0
- virtual/pkgconfig
- wayland? (
- dev-libs/wayland-protocols
- dev-util/wayland-scanner
- )
-"
-
-PATCHES="
- ${FILESDIR}/round.patch
-"
-
-src_configure() {
- local emesonargs=(
- $(meson_feature wayland backend-wayland)
- $(meson_feature X backend-x11)
- $(meson_use core core-plugins-as-shared-libraries)
- $(meson_feature alsa plugin-alsa)
- $(meson_feature backlight plugin-backlight)
- $(meson_feature battery plugin-battery)
- $(meson_feature clock plugin-clock)
- $(meson_feature cpu plugin-cpu)
- $(meson_feature disk-io plugin-disk-io)
- $(meson_feature dwl plugin-dwl)
- $(meson_feature foreign-toplevel plugin-foreign-toplevel)
- $(meson_feature memory plugin-mem)
- $(meson_feature mpd plugin-mpd)
- $(meson_feature i3 plugin-i3)
- $(meson_feature label plugin-label)
- $(meson_feature network plugin-network)
- $(meson_feature pipewire plugin-pipewire)
- $(meson_feature pulseaudio plugin-pulse)
- $(meson_feature removables plugin-removables)
- $(meson_feature river plugin-river)
- $(meson_feature script plugin-script)
- $(meson_feature sway-xkb plugin-sway-xkb)
- $(meson_feature xkb plugin-xkb)
- $(meson_feature xwindow plugin-xwindow)
- -Dwerror=false
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- rm -rf "${D}/usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
- ewarn "Warning: if you are upgrading from 1.8.0, please note that there
are breaking changes that might affect your config.yml file."
- ewarn "See the changelog for more information"
- ewarn "https://codeberg.org/dnkl/yambar/releases/tag/1.9.0";
-}
diff --git a/gui-apps/yambar/yambar-9999.ebuild
b/gui-apps/yambar/yambar-9999.ebuild
index 76a11c9fb..32e6c7a2e 100644
--- a/gui-apps/yambar/yambar-9999.ebuild
+++ b/gui-apps/yambar/yambar-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,14 +11,14 @@ if [[ ${PV} == *9999* ]]; then
else
SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
S="${WORKDIR}/${PN}"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64 ~ppc64"
fi
DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
HOMEPAGE="https://codeberg.org/dnkl/yambar";
LICENSE="MIT"
SLOT="0"
-IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl
+foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio
+removables +river +script sway-xkb wayland X xkb xwindow"
+IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl
+foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio
+removables +river +script sway-xkb wayland +X xkb xwindow"
REQUIRED_USE="
|| ( wayland X )
sway-xkb? ( wayland )
