From 5daa20f677c408fe1be3510bca0cafafe7c595d8 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Apr 16 2024 01:57:51 +0000 Subject: Update to 1.11.0 --- diff --git a/.gitignore b/.gitignore index dc8317d..268bab3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /dunst-1.9.1.tar.gz /dunst-1.9.2.tar.gz /dunst-1.10.0.tar.gz +/dunst-1.11.0.tar.gz diff --git a/dunst-1.10.0-Wayland-suport-GTK-CSS-cursor-names.patch b/dunst-1.10.0-Wayland-suport-GTK-CSS-cursor-names.patch deleted file mode 100644 index 5701a66..0000000 --- a/dunst-1.10.0-Wayland-suport-GTK-CSS-cursor-names.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ccc8540360256093976f594867767e6eb0d329b2 Mon Sep 17 00:00:00 2001 -From: Aleksei Bavshin -Date: Sun, 4 Feb 2024 14:22:42 -0800 -Subject: [PATCH] Wayland: suport GTK/CSS cursor names - -Adwaita, the default icon theme for many distributions, decided to stop -providing legacy Xcursor icons in favor of the GTK/CSS names[1]. -This requires us to probe for "default" instead of the "left_ptr", as -the latter is no longer available in Adwaita. -Keep the fallback to "left_ptr" for more conservative themes. - -[1]: https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/74e9b79471236320d2af4925d6c5bb7df22380ce ---- - src/wayland/wl.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/wayland/wl.c b/src/wayland/wl.c -index 149a8d9..c962de0 100644 ---- a/src/wayland/wl.c -+++ b/src/wayland/wl.c -@@ -750,9 +750,14 @@ bool wl_init(void) { - LOG_W("couldn't find a cursor theme"); - return true; - } -- struct wl_cursor *cursor = wl_cursor_theme_get_cursor(ctx.cursor_theme, "left_ptr"); -+ // Try cursor spec (CSS) name first -+ struct wl_cursor *cursor = wl_cursor_theme_get_cursor(ctx.cursor_theme, "default"); - if (cursor == NULL) { -- LOG_W("couldn't find cursor icon \"left_ptr\""); -+ // Try legacy Xcursor name -+ cursor = wl_cursor_theme_get_cursor(ctx.cursor_theme, "left_ptr"); -+ } -+ if (cursor == NULL) { -+ LOG_W("couldn't find cursor icons \"default\" or \"left_ptr\""); - wl_cursor_theme_destroy(ctx.cursor_theme); - // Set to NULL so it doesn't get free'd again - ctx.cursor_theme = NULL; --- -2.43.2 - diff --git a/dunst.spec b/dunst.spec index 3df284f..bd144c0 100644 --- a/dunst.spec +++ b/dunst.spec @@ -3,14 +3,12 @@ %global dunst_confdir %{_sysconfdir}/xdg Name: dunst -Version: 1.10.0 +Version: 1.11.0 Release: %autorelease Summary: Lightweight and customizable notification-daemon License: BSD-3-Clause URL: https://dunst-project.org Source: https://github.com/dunst-project/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -# Fix cursor names for Adwaita v46 (#1276) -Patch: dunst-1.10.0-Wayland-suport-GTK-CSS-cursor-names.patch Requires: dbus # Required for dunstctl @@ -75,17 +73,6 @@ love to customize to perfection. %make_install %{make_options} # create directory for config drop-in files install -d -m 0755 -pv %{buildroot}%{dunst_confdir}/%{name}/dunstrc.d -# install completion definitions -for compfile in dunst dunstctl; do - install -D -m 0644 -pv contrib/${compfile}.bashcomp \ - %{buildroot}%{bash_completions_dir}/${compfile} - install -D -m 0644 -pv contrib/_${compfile}.zshcomp \ - %{buildroot}%{zsh_completions_dir}/_${compfile} -done -for compfile in dunst dunstctl dunstify; do - install -D -m 0644 -pv contrib/${compfile}.fishcomp \ - %{buildroot}%{fish_completions_dir}/${compfile} -done %if %{with tests} diff --git a/sources b/sources index 7726ccd..e492f8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dunst-1.10.0.tar.gz) = e7e453c9470a063cdee4602315b22c1c8bcbf1405d3c295bccf01ae4e1b535e11b7323313b63cfc510e38ea8243117d550e6057df15924bbd4efb7e0b7f9a709 +SHA512 (dunst-1.11.0.tar.gz) = 84c9edccddd183fb867233cb5377115d96735f4c1be84007194ac39dd48d913e5bb021d2952057aecdb978564c2471a8974c4ee4eeccfb188e5345527007a5c4