From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp2 ([2001:41d0:2:4a6f::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms0.migadu.com with LMTPS
	id CAasHaNlbWH7JAEAgWs5BA
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Mon, 18 Oct 2021 14:16:35 +0200
Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2 with LMTPS
	id cEByGaNlbWGzIgAAB5/wlQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Mon, 18 Oct 2021 12:16:35 +0000
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id E0EBD2D2C6
	for <larch@yhetil.org>; Mon, 18 Oct 2021 14:16:34 +0200 (CEST)
Received: from localhost ([::1]:60846 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	id 1mcRZB-0003SK-UJ
	for larch@yhetil.org; Mon, 18 Oct 2021 08:16:33 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:56820)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1mcRYh-0003Ox-4e
 for guix-patches@gnu.org; Mon, 18 Oct 2021 08:16:03 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:34586)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1mcRYg-0003q9-RD
 for guix-patches@gnu.org; Mon, 18 Oct 2021 08:16:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1mcRYg-00052O-HK
 for guix-patches@gnu.org; Mon, 18 Oct 2021 08:16:02 -0400
X-Loop: help-debbugs@gnu.org
Subject: [bug#51232] [PATCH] gnu: Update udiskie to 2.3.3
References: <CALP7HJv-ynHeet6s=S9M0y0uNjskqT64QnBU-OwTa8hOz5RsQg@mail.gmail.com>
In-Reply-To: <CALP7HJv-ynHeet6s=S9M0y0uNjskqT64QnBU-OwTa8hOz5RsQg@mail.gmail.com>
Resent-From: Artem Chernyak <artemchernyak@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Mon, 18 Oct 2021 12:16:02 +0000
Resent-Message-ID: <handler.51232.B51232.163455932819313@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 51232
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 51232@debbugs.gnu.org
Received: via spool by 51232-submit@debbugs.gnu.org id=B51232.163455932819313
 (code B ref 51232); Mon, 18 Oct 2021 12:16:02 +0000
Received: (at 51232) by debbugs.gnu.org; 18 Oct 2021 12:15:28 +0000
Received: from localhost ([127.0.0.1]:46132 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1mcRXz-00051H-77
 for submit@debbugs.gnu.org; Mon, 18 Oct 2021 08:15:28 -0400
Received: from mail-wr1-f52.google.com ([209.85.221.52]:40471)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <artemchernyak@gmail.com>) id 1mcRXv-000511-TE
 for 51232@debbugs.gnu.org; Mon, 18 Oct 2021 08:15:17 -0400
Received: by mail-wr1-f52.google.com with SMTP id i12so40899792wrb.7
 for <51232@debbugs.gnu.org>; Mon, 18 Oct 2021 05:15:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 
 h=mime-version:from:date:message-id:subject:to
 :content-transfer-encoding;
 bh=sMRm1FF09v/Qo/g2Tg5dvW8EKntbgSIvvGQnNHtGHLk=;
 b=AepohGMPXfVCVKnPuIoVFWa4Bwg1Lhwv5Q+zew5IJ7IEXZaFbp55/4Vbq7l6jLvM15
 yiWBDAlpZ/pWCC+tZzEpsguJhhncapOUxnu6QOlfQsygI+HgLzwDK+4ea/OYjtkTpirr
 OgOXCIEfomqVmHyVTLLVEJpMBMcNHJoHW3S3gSNl3hsqzNpY2ch7rD+km3/n5cUkMooE
 9iQXghJixTsXS3jQ8zoQtoN1wpsxuU0pLtpA3IY4z0vj5w7QTJPCTsv8HPuPYSb9pHse
 kch8ShwLyv6lFdR95uUAG5Do+Coii4//ta4Xc0S8KxEmSPxBGNSCYgU01BG4xas3XCzJ
 3Mog==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112;
 h=x-gm-message-state:mime-version:from:date:message-id:subject:to
 :content-transfer-encoding;
 bh=sMRm1FF09v/Qo/g2Tg5dvW8EKntbgSIvvGQnNHtGHLk=;
 b=xYOY7WkIBfFcTbWohJ1GOjBTWyFcW9wGBOz8LqcbMOlRFZgxNBCV1AO7lJvDi2UyuS
 +eo+QovepoLiUhDfeolWAW7lA/h/xG6jYZbwbG3byTmsUjlNc/kTa36gZsP3MX8cdbUT
 IVaW0QmEhyyetlmz/JRt0c+QOeKTeuBka6piuKtEb+6GXQwl8ggAGkPpYct43Z3/W33g
 7AaitCI6gL1DlRvZX/TAX29rgeoRAHNXKMqzCtJoC/GdKoFBtSWYB8Phzvy4U97kbodo
 /RvM9gIX9CgpVji/lI37u7P+V/37MTGPWW92MirYeL5/+foLxFr9Y+PhPs8UWvXp/Ijc
 vRow==
X-Gm-Message-State: AOAM533NsKt1x/n1pzYNToHnHqOc0iYPijAhsfSbevFWY/BH7h5Vna5H
 6pOgCx9UkF3Lt2kiGH4Z6f5BMYk2T/knrrUGDXpHCCfmsQ0=
X-Google-Smtp-Source: ABdhPJy1EwbGdokoSTg19oXF9tRIr7ZWRH/u+xiBdaCG5CAQFHq7PrrLEpsvMfRMkmYMrFis7ElNrfBJaeiJFZpLu4s=
X-Received: by 2002:a05:6000:1563:: with SMTP id
 3mr34878888wrz.20.1634559309454; 
 Mon, 18 Oct 2021 05:15:09 -0700 (PDT)
MIME-Version: 1.0
From: Artem Chernyak <artemchernyak@gmail.com>
Date: Mon, 18 Oct 2021 07:14:57 -0500
Message-ID: <CALP7HJspOjYEy0GFDvCmb5LPS78Zx5r7BDiEwQ6mpiH928e8LQ@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+larch=yhetil.org@gnu.org>
X-Migadu-Flow: FLOW_IN
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1634559395;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=sMRm1FF09v/Qo/g2Tg5dvW8EKntbgSIvvGQnNHtGHLk=;
	b=ccXUNJK4+UzqB3w8JK20+S44pH4iWhq766lXdJFefrRc3kVnP46Jvx8DCMs2lXlZ/3nXrl
	e/Q619u/9C+b8OQMgIAkLklNA5N1QCTH6neqqnoSSveYL/JxRBn3zF9ZboQSyKEmCqvX3j
	zaPF4R0unIrc0h7TaBYWqe23gGiBvjbmCoUKpJ+es4iAx6DiK7sv2h3UWILbHvZ8uvkNPc
	0asUXwL5DDskblGokG3UdbNBw+ZDzWrQG0LWlFEKMgMc9EAGSwTys65Pv7Si/kCx2MQU9a
	kw0ujPpGCQ+XmF5emYR1GzqtJo1YI/lg0hix8a4B0j/agk7IL5+PscmR6cj1Jw==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1634559395; a=rsa-sha256; cv=none;
	b=kDj8I7s/M8Ba1aezPV/ki7k5W5lF5pFS9SgqkKKbfs0L8agysz906nqYwD8uKjbWVQ40id
	ZZ6LkrZf04KTWQntzo0+iS0M/f/D+lJdqj1dTYxqGMSgsLCY1pzq/WKS1MG8+1TchPmvqi
	AZ21a2vnkcYsus/9GWMRnGfKLQrLVe3itlOaY8TcbpHT8y6xRw2yoDDW3x3Fhj/E4EsH4g
	WEt0J5759KOpNEx+ccnXzXfG3TWjgnNuuUCBc4j2MnAQhmhZNpj31I1v6wl0RcOKTMYIqw
	zk2/ZzmIkJslPyitrcxrrvs65kCfExck662bUt0zayUozLBYanbZOPxI7hgd7A==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=AepohGMP;
	dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none);
	spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org
X-Migadu-Spam-Score: -1.72
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=AepohGMP;
	dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none);
	spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org
X-Migadu-Queue-Id: E0EBD2D2C6
X-Spam-Score: -1.72
X-Migadu-Scanner: scn1.migadu.com
X-TUID: DCCdLgf/6uP4

Hi Guillaume,

Thanks for the feedback on this. I did not realize the patches were
also tracked in the "gnu/local.mk" file. Updated and squashed into a
single patch.

* gnu/packages/freedesktop.scm (udiskie): Update to 2.3.3
[source]: Remove udiskie-no-appindicator.patch
[inputs]: Add LIBINDICATOR
* gnu/packages/pateches/udiskie-no-appindicator.patch: Remove file
* gnu/local.mk: Remove udiskie-no-appindicator.patch
---
 gnu/local.mk                                  |   1 -
 gnu/packages/freedesktop.scm                  |   8 +-
 .../patches/udiskie-no-appindicator.patch     | 155 ------------------
 3 files changed, 3 insertions(+), 161 deletions(-)
 delete mode 100644 gnu/packages/patches/udiskie-no-appindicator.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 8c30eaafba..06ee39e18e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1828,7 +1828,6 @@ dist_patch_DATA =3D \
   %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \
   %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \
   %D%/packages/patches/ucx-tcp-iface-ioctl.patch \
-  %D%/packages/patches/udiskie-no-appindicator.patch \
   %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
   %D%/packages/patches/ungoogled-chromium-ffmpeg-compat.patch \
   %D%/packages/patches/ungoogled-chromium-system-nspr.patch \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 514125977b..a002e3e807 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1998,17 +1998,14 @@ (define-public python-cchardet
 (define-public udiskie
   (package
     (name "udiskie")
-    (version "2.1.0")
+    (version "2.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "udiskie" version))
        (sha256
         (base32
-         "0smib8vbs9q37n7ynhzyw97q16fgdkcdw7fw69lci0xvyq00v1dz"))
-       ;; Remove support for the libappindicator library of the
-       ;; Unity desktop environment which is not in Guix.
-       (patches (search-patches "udiskie-no-appindicator.patch"))))
+         "0sagdmsc5km32h3jvgj843p8bicrrgfz26qhl04ibxmas6725zr0"))))
     (build-system python-build-system)
     (native-inputs
      `(("asciidoc" ,asciidoc)
@@ -2017,6 +2014,7 @@ (define-public udiskie
     (inputs
      `(("gobject-introspection" ,gobject-introspection)
        ("gtk+" ,gtk+)
+       ("libappindicator" ,libappindicator)
        ("libnotify" ,libnotify)
        ("udisks" ,udisks)))
     (propagated-inputs
diff --git a/gnu/packages/patches/udiskie-no-appindicator.patch
b/gnu/packages/patches/udiskie-no-appindicator.patch
deleted file mode 100644
index df3efe104b..0000000000
--- a/gnu/packages/patches/udiskie-no-appindicator.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-Remove the support for Unity's appindicator.
-
-diff -Naur udiskie-2.0.4/completions/zsh/_udiskie
udiskie-2.0.4-new/completions/zsh/_udiskie
---- udiskie-2.0.4/completions/zsh/_udiskie 2020-01-21 01:12:40.000000000 +=
0100
-+++ udiskie-2.0.4-new/completions/zsh/_udiskie 2020-01-23
10:15:46.956141667 +0100
-@@ -18,8 +18,6 @@
-     '(-a)'{-A,--no-automount}"[disable automounting]"
-     '(-N)'{-n,--notify}"[show popup notifications]"
-     '(-n)'{-N,--no-notify}"[disable notifications]"
--    '(--no-appindicator)'--appindicator"[use appindicator for status icon=
]"
--    '(--appindicator)'--no-appindicator"[don't use appindicator]"
-     '(-T -s)'{-t,--tray}"[show tray icon]"
-     '(-T -t)'{-s,--smart-tray}"[auto hide tray icon]"
-     '(-t -s)'{-T,--no-tray}"[disable tray icon]"
-diff -Naur udiskie-2.0.4/doc/udiskie.8.txt udiskie-2.0.4-new/doc/udiskie.8=
.txt
---- udiskie-2.0.4/doc/udiskie.8.txt 2020-01-21 01:12:40.000000000 +0100
-+++ udiskie-2.0.4-new/doc/udiskie.8.txt 2020-01-23 10:16:12.636290647 +010=
0
-@@ -92,12 +92,6 @@
- *--no-terminal*::
- Disable terminal action.
-
--*--appindicator*::
-- Use AppIndicator3 for the status icon. Use this on Ubuntu/Unity if
no icon is shown.
--
--*--no-appindicator*::
-- Use Gtk.StatusIcon for the status icon (default).
--
- *--password-cache MINUTES*::
- Cache passwords for LUKS partitions and set the timeout.
-
-diff -Naur udiskie-2.0.4/udiskie/appindicator.py
udiskie-2.0.4-new/udiskie/appindicator.py
---- udiskie-2.0.4/udiskie/appindicator.py 2020-01-21 01:12:40.000000000 +0=
100
-+++ udiskie-2.0.4-new/udiskie/appindicator.py 1970-01-01
01:00:00.000000000 +0100
-@@ -1,61 +0,0 @@
--"""
--Status icon using AppIndicator3.
--"""
--
--from gi.repository import Gtk
--from gi.repository import AppIndicator3
--
--from .async_ import Future
--
--
--class AppIndicatorIcon:
--
--    """
--    Show status icon using AppIndicator as backend. Replaces
--    `udiskie.tray.StatusIcon` on ubuntu/unity.
--    """
--
--    def __init__(self, menumaker, _icons):
--        self._maker =3D menumaker
--        self._menu =3D Gtk.Menu()
--        self._indicator =3D AppIndicator3.Indicator.new(
--            'udiskie',
--            _icons.get_icon_name('media'),
--            AppIndicator3.IndicatorCategory.HARDWARE)
--        self._indicator.set_status(AppIndicator3.IndicatorStatus.PASSIVE)
--        self._indicator.set_menu(self._menu)
--        # Get notified before menu is shown, see:
--        # https://bugs.launchpad.net/screenlets/+bug/522152/comments/15
--        dbusmenuserver =3D self._indicator.get_property('dbus-menu-server=
')
--        self._dbusmenuitem =3D dbusmenuserver.get_property('root-node')
--        self._conn =3D self._dbusmenuitem.connect('about-to-show',
self._on_show)
--        self.task =3D Future()
--        menumaker._quit_action =3D self.destroy
--        # Populate menu initially, so libdbusmenu does not ignore the
--        # 'about-to-show':
--        self._maker(self._menu)
--
--    def destroy(self):
--        self.show(False)
--        self._dbusmenuitem.disconnect(self._conn)
--        self.task.set_result(True)
--
--    @property
--    def visible(self):
--        status =3D self._indicator.get_status()
--        return status =3D=3D AppIndicator3.IndicatorStatus.ACTIVE
--
--    def show(self, show=3DTrue):
--        if show =3D=3D self.visible:
--            return
--        status =3D (AppIndicator3.IndicatorStatus.ACTIVE if show else
--                  AppIndicator3.IndicatorStatus.PASSIVE)
--        self._indicator.set_status(status)
--
--    def _on_show(self, menu):
--        # clear menu:
--        for item in self._menu.get_children():
--            self._menu.remove(item)
--        # repopulate:
--        self._maker(self._menu)
--        self._menu.show_all()
-diff -Naur udiskie-2.0.4/udiskie/cli.py udiskie-2.0.4-new/udiskie/cli.py
---- udiskie-2.0.4/udiskie/cli.py 2020-01-21 01:12:40.000000000 +0100
-+++ udiskie-2.0.4-new/udiskie/cli.py 2020-01-23 10:17:13.064810617 +0100
-@@ -287,9 +287,6 @@
-         -T, --no-tray                           Disable tray icon
-         -m MENU, --menu MENU                    Tray menu [flat/nested]
-
--        --appindicator                          Use appindicator for
status icon
--        --no-appindicator                       Don't use appindicator
--
-         --password-cache MINUTES                Set password cache timeou=
t
-         --no-password-cache                     Disable password cache
-
-@@ -312,7 +309,6 @@
-         'notify': True,
-         'tray': False,
-         'menu': 'flat',
--        'appindicator': False,
-         'file_manager': 'xdg-open',
-         'terminal': '',
-         'password_prompt': 'builtin:gui',
-@@ -328,7 +324,6 @@
-             '--no-tray': False,
-             '--smart-tray': 'auto'}),
-         'menu': Value('--menu'),
--        'appindicator': Switch('appindicator'),
-         'file_manager': OptionalValue('--file-manager'),
-         'password_prompt': OptionalValue('--password-prompt'),
-         'password_cache': OptionalValue('--password-cache'),
-@@ -459,11 +454,7 @@
-
-         menu_maker =3D udiskie.tray.UdiskieMenu(self, icons, actions, fla=
t,
-                                               config.quickmenu_actions)
--        if options['appindicator']:
--            import udiskie.appindicator
--            TrayIcon =3D udiskie.appindicator.AppIndicatorIcon
--        else:
--            TrayIcon =3D udiskie.tray.TrayIcon
-+        TrayIcon =3D udiskie.tray.TrayIcon
-         trayicon =3D TrayIcon(menu_maker, icons)
-         return udiskie.tray.UdiskieStatusIcon(trayicon, menu_maker, smart=
)
-
-diff -Naur udiskie-2.0.4/udiskie.egg-info/SOURCES.txt
udiskie-2.0.4-new/udiskie.egg-info/SOURCES.txt
---- udiskie-2.0.4/udiskie.egg-info/SOURCES.txt 2020-01-21
01:12:41.000000000 +0100
-+++ udiskie-2.0.4-new/udiskie.egg-info/SOURCES.txt 2020-01-23
10:17:50.657205798 +0100
-@@ -25,7 +25,6 @@
- test/test_cache.py
- test/test_match.py
- udiskie/__init__.py
--udiskie/appindicator.py
- udiskie/async_.py
- udiskie/automount.py
- udiskie/cache.py
-@@ -47,4 +46,4 @@
- udiskie.egg-info/entry_points.txt
- udiskie.egg-info/requires.txt
- udiskie.egg-info/top_level.txt
--udiskie.egg-info/zip-safe
-\ Pas de fin de ligne =C3=A0 la fin du fichier
-+udiskie.egg-info/zip-safe
--=20
2.33.0