GNU bug report logs - #54254
[PATCH] gnu: dunst: Update to 1.8.1.

Previous Next

Package: guix-patches;

Reported by: Jai Vetrivelan <jaivetrivelan <at> gmail.com>

Date: Sat, 5 Mar 2022 06:07:03 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 54254 in the body.
You can then email your comments to 54254 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#54254; Package guix-patches. (Sat, 05 Mar 2022 06:07:03 GMT) Full text and rfc822 format available.
Acknowledgement sent to Jai Vetrivelan <jaivetrivelan <at> gmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sat, 05 Mar 2022 06:07:03 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jai Vetrivelan <jaivetrivelan <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: dunst: Update to 1.8.1.
Date: Sat, 05 Mar 2022 11:36:36 +0530

[0001-gnu-dunst-Update-to-1.8.1.patch (text/patch, inline)]
From af0d5b8381f9fec21ac01f88ca5f6384643a19b2 Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan <at> 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

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 <at> waegenei.re>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407 <at> posteo.ro>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv <at> posteo.net>
+;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan <at> 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 <at> 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: 97065f9fe3da74adab54b70e28bd2cd59c06ee07
prerequisite-patch-id: 112e00ce191deb18c3866dc5f17e4c761a3b19af
prerequisite-patch-id: f347aa2bfdef7aeb7ff3fb8e157e4acb2e1f78ae
prerequisite-patch-id: 17ecf5c03e82c4231c8ae277ffd577b59b107c43
prerequisite-patch-id: 0a31c859a5e157569a3b36aa652d8117dca76955
prerequisite-patch-id: 3ff13ef200b011ffedd1020f371b715b5c3120ec
-- 
2.34.0
Information forwarded to guix-patches <at> gnu.org:
bug#54254; Package guix-patches. (Sat, 05 Mar 2022 12:26:02 GMT) Full text and rfc822 format available.

Message #8 received at 54254 <at> debbugs.gnu.org (full text, mbox):

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: Jai Vetrivelan <jaivetrivelan <at> gmail.com>
Cc: 54254 <at> debbugs.gnu.org
Subject: Re: [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1.
Date: Sat, 05 Mar 2022 12:22:20 +0000

[Message part 1 (text/plain, inline)]
Jai Vetrivelan <jaivetrivelan <at> 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 <at> 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?

[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#54254; Package guix-patches. (Sat, 05 Mar 2022 12:34:01 GMT) Full text and rfc822 format available.

Message #11 received at 54254 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: Jai Vetrivelan <jaivetrivelan <at> gmail.com>, 54254 <at> debbugs.gnu.org
Subject: Re: [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1.
Date: Sat, 05 Mar 2022 13:33:11 +0100

[Message part 1 (text/plain, inline)]
Jai Vetrivelan schreef op za 05-03-2022 om 11:36 [+0530]:
>      (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"))

It looks like the src/wayland/protocols directory contains binaries.
At least, the some header files start with /* Generated by wayland-
scanner 1.19.0 */.  Could they be built from source?

Greetings,
Maxime.

[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#54254; Package guix-patches. (Sat, 05 Mar 2022 13:33:02 GMT) Full text and rfc822 format available.

Message #14 received at 54254 <at> debbugs.gnu.org (full text, mbox):

From: Jai Vetrivelan <jaivetrivelan <at> gmail.com>
To: Guillaume Le Vaillant <glv <at> posteo.net>
Cc: 54254 <at> debbugs.gnu.org
Subject: Re: [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1.
Date: Sat, 05 Mar 2022 19:01:48 +0530

[Message part 1 (text/plain, inline)]
On 2022-03-05, 12:22 +0000, Guillaume Le Vaillant <glv <at> posteo.net> wrote:

> Jai Vetrivelan <jaivetrivelan <at> 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 <at> 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?
>

[0001-gnu-dunst-Update-to-1.8.1.patch (text/x-patch, inline)]
From 4758b2ceb7725fddbaa3c4ee0e86c8396657448c Mon Sep 17 00:00:00 2001
From: Jai Vetrivelan <jaivetrivelan <at> 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 <at> waegenei.re>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407 <at> posteo.ro>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv <at> posteo.net>
+;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan <at> 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 <at> 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


[Message part 3 (text/plain, inline)]
-- 
Jai Vetrivelan
Reply sent to Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility. (Wed, 16 Mar 2022 14:15:02 GMT) Full text and rfc822 format available.
Notification sent to Jai Vetrivelan <jaivetrivelan <at> gmail.com>:
bug acknowledged by developer. (Wed, 16 Mar 2022 14:15:02 GMT) Full text and rfc822 format available.

Message #19 received at 54254-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Jai Vetrivelan <jaivetrivelan <at> gmail.com>
Cc: Guillaume Le Vaillant <glv <at> posteo.net>, 54254-done <at> debbugs.gnu.org
Subject: Re: bug#54254: [PATCH] gnu: dunst: Update to 1.8.1.
Date: Wed, 16 Mar 2022 15:14:48 +0100

Hi Jai,

Jai Vetrivelan <jaivetrivelan <at> gmail.com> skribis:

>>From 4758b2ceb7725fddbaa3c4ee0e86c8396657448c Mon Sep 17 00:00:00 2001
> From: Jai Vetrivelan <jaivetrivelan <at> 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.

Thanks for providing the patch and for addressing Guillaume’s comment.
I’ve now applied it.

Ludo’.
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Thu, 14 Apr 2022 11:24:08 GMT) Full text and rfc822 format available.
This bug report was last modified 3 years and 129 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.