* [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1.
@ 2022-03-05 6:06 Jai Vetrivelan
2022-03-05 12:22 ` Guillaume Le Vaillant
2022-03-05 12:33 ` [bug#54254] " Maxime Devos
0 siblings, 2 replies; 5+ messages in thread
From: Jai Vetrivelan @ 2022-03-05 6:06 UTC (permalink / raw)
To: 54254
[-- Attachment #1: 0001-gnu-dunst-Update-to-1.8.1.patch --]
[-- Type: text/patch, Size: 3460 bytes --]
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
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: 97065f9fe3da74adab54b70e28bd2cd59c06ee07
prerequisite-patch-id: 112e00ce191deb18c3866dc5f17e4c761a3b19af
prerequisite-patch-id: f347aa2bfdef7aeb7ff3fb8e157e4acb2e1f78ae
prerequisite-patch-id: 17ecf5c03e82c4231c8ae277ffd577b59b107c43
prerequisite-patch-id: 0a31c859a5e157569a3b36aa652d8117dca76955
prerequisite-patch-id: 3ff13ef200b011ffedd1020f371b715b5c3120ec
--
2.34.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1.
2022-03-05 6:06 [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1 Jai Vetrivelan
@ 2022-03-05 12:22 ` Guillaume Le Vaillant
2022-03-05 13:31 ` Jai Vetrivelan
2022-03-05 12:33 ` [bug#54254] " Maxime Devos
1 sibling, 1 reply; 5+ messages in thread
From: Guillaume Le Vaillant @ 2022-03-05 12:22 UTC (permalink / raw)
To: Jai Vetrivelan; +Cc: 54254
[-- Attachment #1: Type: text/plain, Size: 856 bytes --]
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?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1.
2022-03-05 6:06 [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1 Jai Vetrivelan
2022-03-05 12:22 ` Guillaume Le Vaillant
@ 2022-03-05 12:33 ` Maxime Devos
1 sibling, 0 replies; 5+ messages in thread
From: Maxime Devos @ 2022-03-05 12:33 UTC (permalink / raw)
To: Jai Vetrivelan, 54254
[-- Attachment #1: Type: text/plain, Size: 765 bytes --]
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.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1.
2022-03-05 12:22 ` Guillaume Le Vaillant
@ 2022-03-05 13:31 ` Jai Vetrivelan
2022-03-16 14:14 ` bug#54254: " Ludovic Courtès
0 siblings, 1 reply; 5+ messages in thread
From: Jai Vetrivelan @ 2022-03-05 13:31 UTC (permalink / raw)
To: Guillaume Le Vaillant; +Cc: 54254
[-- Attachment #1: Type: text/plain, Size: 960 bytes --]
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?
>
[-- Attachment #2: 0001-gnu-dunst-Update-to-1.8.1.patch --]
[-- Type: text/x-patch, Size: 3828 bytes --]
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
[-- Attachment #3: Type: text/plain, Size: 20 bytes --]
--
Jai Vetrivelan
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#54254: [PATCH] gnu: dunst: Update to 1.8.1.
2022-03-05 13:31 ` Jai Vetrivelan
@ 2022-03-16 14:14 ` Ludovic Courtès
0 siblings, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2022-03-16 14:14 UTC (permalink / raw)
To: Jai Vetrivelan; +Cc: Guillaume Le Vaillant, 54254-done
Hi Jai,
Jai Vetrivelan <jaivetrivelan@gmail.com> skribis:
>>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.
Thanks for providing the patch and for addressing Guillaume’s comment.
I’ve now applied it.
Ludo’.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-16 14:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-05 6:06 [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1 Jai Vetrivelan
2022-03-05 12:22 ` Guillaume Le Vaillant
2022-03-05 13:31 ` Jai Vetrivelan
2022-03-16 14:14 ` bug#54254: " Ludovic Courtès
2022-03-05 12:33 ` [bug#54254] " Maxime Devos
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).