From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id COmiB6tIamF2xwAAgWs5BA (envelope-from ) for ; Sat, 16 Oct 2021 05:36:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id ACY7A6tIamFJAwAAbx9fmQ (envelope-from ) for ; Sat, 16 Oct 2021 03:36:11 +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 64460DBC1 for ; Sat, 16 Oct 2021 05:36:10 +0200 (CEST) Received: from localhost ([::1]:57528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbaUT-00005H-Ci for larch@yhetil.org; Fri, 15 Oct 2021 23:36:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbaUM-00004q-Bu for guix-patches@gnu.org; Fri, 15 Oct 2021 23:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57398) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbaUM-000747-2w for guix-patches@gnu.org; Fri, 15 Oct 2021 23:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mbaUM-0006fG-0u for guix-patches@gnu.org; Fri, 15 Oct 2021 23:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51232] [PATCH 2/2] gnu: Remove udiskie-no-appindicator.patch References: In-Reply-To: Resent-From: Artem Chernyak Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Oct 2021 03:36:01 +0000 Resent-Message-ID: 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.163435532125563 (code B ref 51232); Sat, 16 Oct 2021 03:36:01 +0000 Received: (at 51232) by debbugs.gnu.org; 16 Oct 2021 03:35:21 +0000 Received: from localhost ([127.0.0.1]:40711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbaTY-0006e3-Pv for submit@debbugs.gnu.org; Fri, 15 Oct 2021 23:35:21 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:43922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbaTU-0006dQ-CI for 51232@debbugs.gnu.org; Fri, 15 Oct 2021 23:35:10 -0400 Received: by mail-wm1-f44.google.com with SMTP id 67-20020a1c1946000000b0030d4c90fa87so3670628wmz.2 for <51232@debbugs.gnu.org>; Fri, 15 Oct 2021 20:35:08 -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=1TOwHkcsCJTfnbdEU7kCRfB2A2Wlsc3titjJLtNcJ7I=; b=lA+gPyhRWvlWQaulxb0ER5ZM7v5ELbwuZhdyXXRDe6bHGdYE2YmOGW2H6b4zYbbPoW JBe70pzPM1gPlbQFeRp/U2rip1Yg4qUuyOgSU+xwoLT9atC94e9aJyXUDXDOFdn7BX7E HLoJnPvW2JMGl80Q1P7F31lFhHwQs48rYfVC5dAvlXk+qRkD/F4mw0VHhepOwz2w/NNp zqH7C4rO70rXGODYFCH/Tq2hEHMk6eeLbHyBl1l8U3SZm+ogsYpiuHYjREx+cRm7ZlsO +s78zaH2gTgYhtTeIVzZkwe/M1Z3WNgWY1684cCWdFAYoPc2wIwE0wziZlqCrkYPLtTY 70Xw== 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=1TOwHkcsCJTfnbdEU7kCRfB2A2Wlsc3titjJLtNcJ7I=; b=QLNjc2SSD0anYNfj+WKX6XN1NFB25n4A6betgi9+EW5wZv45qwqIM2Z/8ivU5cPhec k7n79xv1hjWOk8hZymaDv2YEcDhBnlUdZz8ss8HI0RCw3Fi3dLGx1jTDRZbdHRWF3cW7 gtU1ZRq0PA/HWmmRUeoMAroZ957w2L7QbF/4a4MEvfyXk9GoWgywjCxvcIQTsIxbUY5e cTfDMLusjcJFPFK4LsDFMqlqunySpgN0RESZ1Z1CtYjwE29hPRzJ2G9vsV0Z2GRFbx/M Tb3r76huqGygC7JjAzXIH5XByUbFDDsXZubEYARNC6zIz+tvd3MOkVR661Y0HNVTWUOB cxXQ== X-Gm-Message-State: AOAM531myloZrsunQqVs2jRTNa4RrWyesN5ve0CiouKiHR/kSIj64vS7 nTVh4tc2rNe6lvpDBX9mfimUDIV+eqjJ3nTPRGi00H7I4kfEAQ== X-Google-Smtp-Source: ABdhPJxqCipsk5qdAu7keI9sx1t8RIZdcB4CktaN+HaPUJxwa61AzWggNA84QzYFklEwJKjuUp1ZO+yI47g2ZyXFhTI= X-Received: by 2002:a1c:1d13:: with SMTP id d19mr16623942wmd.190.1634355302101; Fri, 15 Oct 2021 20:35:02 -0700 (PDT) MIME-Version: 1.0 From: Artem Chernyak Date: Fri, 15 Oct 2021 22:34:50 -0500 Message-ID: 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1634355370; 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=1TOwHkcsCJTfnbdEU7kCRfB2A2Wlsc3titjJLtNcJ7I=; b=QhnZ+qeYK+Xy1r7iZC7jlvrKWbTaGFqdsAU5BBwt2Wq8R/Z6ghIqqQRv8ZUP6a+iO4i+qK o8QK//txxoW3Zi5LEWT+iiUZR8/2aF+osG00OwJ0dMZW3lrzkK1cY2ekJrbz6wDIPG6WAI P0GVQiWSGg0LKxEyn83mem6uSVGMTA0Mvff/zbCZPpSUZpTZ373f+p+zOg2FUBg8V/0Q46 SqDOuaWJgjdYjB6WFy+XLy/eeBT1HHJKgyxtinV/IrcW9ZkVh7dlwNaGispsNIPKctXShp 8VpTuMz90xISQU2Z4APLN+lRegps8FteQTNztPSUKijX5HmblnDZsLzJSauTlQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1634355370; a=rsa-sha256; cv=none; b=kCIzEI+OC4kXHHuEVYP5bfuLjy8LI/R9Dio6Nf5BJyr+GcQ70EivAZntF+Qg5hcIiKR8bP bc9947MZIOzbMg6M0LKF7hJrOIPqhhNYP4AfVhxbshe3of8Jvdu5Z+tIvC3FtvSULGGgmG ZZQ6CaO6lHkAagNGbGUpdXrguDqWHr2qPWFoIa55446GsPXRi9Jwl8mZuOvVGybbPZB9Tz +2DhGFIMvT9fJ0GNEAH7hbutUlJppjGvOw7I9anFjarCA+7ZcDylvMJS6Aye12Xm/fONmh HIKWt5ElTva2i5IIa1Hr3sdySOBhKpR64kkmSakFSiW//z+RdOf4ELbswgqtAw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=lA+gPyhR; 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=lA+gPyhR; 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: 64460DBC1 X-Spam-Score: -1.72 X-Migadu-Scanner: scn1.migadu.com X-TUID: yTkZOhO4IWer * gnu/packages/patches/udiskie-no-appindicator.patch: Remove file --- .../patches/udiskie-no-appindicator.patch | 155 ------------------ 1 file changed, 155 deletions(-) delete mode 100644 gnu/packages/patches/udiskie-no-appindicator.patch 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