From patchwork Sat Mar 5 13:31:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jai Vetrivelan X-Patchwork-Id: 37618 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0EB1F27BBEA; Sat, 5 Mar 2022 13:33:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7BFF827BBE9 for ; Sat, 5 Mar 2022 13:33:27 +0000 (GMT) Received: from localhost ([::1]:34348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQUXG-00034b-N8 for patchwork@mira.cbaines.net; Sat, 05 Mar 2022 08:33:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQUWt-00034D-9C for guix-patches@gnu.org; Sat, 05 Mar 2022 08:33:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQUWt-0004n0-0q for guix-patches@gnu.org; Sat, 05 Mar 2022 08:33:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQUWs-0003ds-G1 for guix-patches@gnu.org; Sat, 05 Mar 2022 08:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54254] [PATCH] gnu: dunst: Update to 1.8.1. Resent-From: Jai Vetrivelan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Mar 2022 13:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Guillaume Le Vaillant Cc: 54254@debbugs.gnu.org Received: via spool by 54254-submit@debbugs.gnu.org id=B54254.164648712713939 (code B ref 54254); Sat, 05 Mar 2022 13:33:02 +0000 Received: (at 54254) by debbugs.gnu.org; 5 Mar 2022 13:32:07 +0000 Received: from localhost ([127.0.0.1]:47487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQUVv-0003cg-32 for submit@debbugs.gnu.org; Sat, 05 Mar 2022 08:32:07 -0500 Received: from mail-pj1-f52.google.com ([209.85.216.52]:55222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQUVt-0003c6-0U for 54254@debbugs.gnu.org; Sat, 05 Mar 2022 08:32:02 -0500 Received: by mail-pj1-f52.google.com with SMTP id b8so9532489pjb.4 for <54254@debbugs.gnu.org>; Sat, 05 Mar 2022 05:32:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=t68rvoInk9mSwi3TpVX5Soj5DrC07vPNsME6ZCMNHUc=; b=OcUsWTpZCbxzoLcE4Xn3w3rO6A3x3clDY0auymscR0FF36OaRDePmy6KpAeku03w24 xQIGNv7ZQd1G7Ox53SFxR+Kxz8o1jVp5q0rf5v7QeRLZfiJT9oYHOWA1qVXcbPneEA8i L4PsoCrfzPyUXSL/9ZzYGxMarBxaWunF9g5pzI81pOzP3OlVn3KBtllRF06kTy6pImTn W6K8bYZerozZmlBZRXag3iYvWI+y3Dqq4qANDLiJyLKdZ8+h9m0OFJq1vgfITfX/VQVR np2Re5INJdH6+Vnl0fuqlSbPlECD8KVkfQzOUINUqlDuIesYqFXSSP5aG838eEpBmtvE +CWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=t68rvoInk9mSwi3TpVX5Soj5DrC07vPNsME6ZCMNHUc=; b=LEXY20zLl+USQV84FDK1oXqvVxNfgWRPbxkrkaa+uFoQKIQoSv3wAE5LuyRc6L8ZWS WXto59dUroyoeaZv3aWC5qMcZ65mDQvlck4MLOAowoNoco8jf0x5vo3GBc0hqau+xREO XibW5pN+rnWhyE8j3KX/qz5RD486FGrqB9dascWGIvEVxpdB+UgtPDpffMNy8DmbnD11 xfsmPkLhVAr4eLKdqXqetkdSOkDuwtW9gXRUjcoIPH5t9TunOVkaH8VE89JNaHpyoc3/ Q/BfDr11rgf24Hv3IpiIxGU5jo4Erl+gnz5Iu8Ac76lEqn+DYxti2gW0S09i5esCkPnD 4Q4g== X-Gm-Message-State: AOAM530vz8N8wAm26L7/S/qJkvjqCX2MqT7mpvhsHu6+gBokOp/3R/t/ ND8+cXte21iHJtmQNQhnLWZxNpAijdiulQ== X-Google-Smtp-Source: ABdhPJwlE4Gb3Zlh0lS9N/lYW9pRPxIs15qawO+W7Tefj/03+OTRmZ6p3EDaT5velSTSDMyyiVd8qQ== X-Received: by 2002:a17:90b:1b12:b0:1bf:1e5d:55ea with SMTP id nu18-20020a17090b1b1200b001bf1e5d55eamr10818702pjb.115.1646487114352; Sat, 05 Mar 2022 05:31:54 -0800 (PST) Received: from guix ([2409:4072:8e08:a987:8ecf:bb0f:1cb:6cf8]) by smtp.gmail.com with ESMTPSA id p10-20020a056a0026ca00b004f38e426e3csm9433985pfw.201.2022.03.05.05.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Mar 2022 05:31:53 -0800 (PST) From: Jai Vetrivelan References: <87ee3h53wz.fsf@gmail.com> <877d9837tc.fsf@kitej> X-Antipastobozoticataclysm: When George Bush projectile vomits antipasto on the Japanese. Date: Sat, 05 Mar 2022 19:01:48 +0530 In-Reply-To: <877d9837tc.fsf@kitej> (Guillaume Le Vaillant's message of "Sat, 05 Mar 2022 12:22:20 +0000") Message-ID: <87o82k34qj.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On 2022-03-05, 12:22 +0000, Guillaume Le Vaillant wrote: > Jai Vetrivelan 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 >> 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 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 ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2022 Jai Vetrivelan ;;; ;;; 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 -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