[bug#54254] [PATCH] gnu: dunst: Update to 1.8.1.

[Jai Vetrivelan]

On 2022-03-05, 12:22 +0000, Guillaume Le Vaillant <glv@posteo.net> wrote:

> Jai Vetrivelan <jaivetrivelan@gmail.com> skribis:
>
>> [1. text/patch; 0001-gnu-dunst-Update-to-1.8.1.patch]
>> From af0d5b8381f9fec21ac01f88ca5f6384643a19b2 Mon Sep 17 00:00:00 2001
>> From: Jai Vetrivelan <jaivetrivelan@gmail.com>
>> Date: Sat, 5 Mar 2022 11:19:43 +0530
>> Subject: [PATCH] gnu: dunst: Update to 1.8.1.
>>
>> * gnu/packages/dunst.scm (dunst): Update to 1.8.1.
>> * gnu/packages/patches/dunst-1.7.3-fix-crash.patch: Remove patch file.
>> ---
>>  gnu/packages/dunst.scm                        |  6 +++---
>>  .../patches/dunst-1.7.3-fix-crash.patch       | 21 -------------------
>>  2 files changed, 3 insertions(+), 24 deletions(-)
>>  delete mode 100644 gnu/packages/patches/dunst-1.7.3-fix-crash.patch
>>
>> [...]
>
> Hi,
>
> When removing a patch file, you also have to remove it from the list of
> patches in "gnu/local.mk".
> Can you send an updated patch?
>

>From 4758b2ceb7725fddbaa3c4ee0e86c8396657448c Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan@gmail.com>
Date: Sat, 5 Mar 2022 18:52:40 +0530
Subject: [PATCH] gnu: dunst: Update to 1.8.1.

* gnu/packages/dunst.scm (dunst): Update to 1.8.1.
* gnu/packages/patches/dunst-1.7.3-fix-crash.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/dunst.scm                        |  6 +++---
 .../patches/dunst-1.7.3-fix-crash.patch       | 21 -------------------
 3 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 gnu/packages/patches/dunst-1.7.3-fix-crash.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 9bfeede60f..311b864e60 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1008,7 +1008,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
   %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch     \
   %D%/packages/patches/dstat-skip-devices-without-io.patch     \
-  %D%/packages/patches/dunst-1.7.3-fix-crash.patch             \
   %D%/packages/patches/dvd+rw-tools-add-include.patch          \
   %D%/packages/patches/dynaconf-unvendor-deps.patch            \
   %D%/packages/patches/ecl-16-format-directive-limit.patch     \
diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm
index 7446c3689a..35df682d46 100644
--- a/gnu/packages/dunst.scm
+++ b/gnu/packages/dunst.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -40,7 +41,7 @@ (define-module (gnu packages dunst)
 (define-public dunst
   (package
     (name "dunst")
-    (version "1.7.3")
+    (version "1.8.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -49,8 +50,7 @@ (define-public dunst
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ra0ii805w3rrs0qqbjxzl6i79ksz42lnvbglw18h4igkza21kzj"))
-              (patches (search-patches "dunst-1.7.3-fix-crash.patch"))))
+                "19bh5789whlc0n5wbyx3yx8px93hccn42f1p6i1dz96hdkk5mjb8"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no check target
diff --git a/gnu/packages/patches/dunst-1.7.3-fix-crash.patch 
b/gnu/packages/patches/dunst-1.7.3-fix-crash.patch
deleted file mode 100644
index 8b51d820a4..0000000000
--- a/gnu/packages/patches/dunst-1.7.3-fix-crash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Danny Milosavljevic <dannym@scratchpost.org>
-Date: 2022-02-04 21:52:05 CET
-
-Fix crash if notification contains invalid pixbuf data.
-
-diff -ru 
/gnu/store/5885czxhmhkckjqj939b0hd6b6czizwb-dunst-1.7.3-checkout/src/notification.c
 5885czxhmhkckjqj939b0hd6b6czizwb-dunst-1.7.3-checkout/src/notification.c
---- 
/gnu/store/5885czxhmhkckjqj939b0hd6b6czizwb-dunst-1.7.3-checkout/src/notification.c
        1970-01-01 01:00:01.000000000 +0100
-+++ 5885czxhmhkckjqj939b0hd6b6czizwb-dunst-1.7.3-checkout/src/notification.c   
2022-02-04 19:05:57.534906600 +0100
-@@ -359,8 +359,10 @@
-         g_clear_pointer(&n->icon_id, g_free);
- 
-         GdkPixbuf *icon = icon_get_for_data(new_icon, &n->icon_id, 
draw_get_scale());
--        n->icon = gdk_pixbuf_to_cairo_surface(icon);
--        g_object_unref(icon);
-+        if (icon) {
-+              n->icon = gdk_pixbuf_to_cairo_surface(icon);
-+              g_object_unref(icon);
-+        }
- }
- 
- /* see notification.h */

base-commit: b0d023cba5ce62c46521bd11811eea22b0013a58
-- 
2.34.0

-- 
Jai Vetrivelan