From patchwork Sat Oct 16 03:33:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Chernyak X-Patchwork-Id: 33902 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 A782127BBE3; Sat, 16 Oct 2021 04:35:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7C2F827BBE1 for ; Sat, 16 Oct 2021 04:35:10 +0100 (BST) Received: from localhost ([::1]:57282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbaTV-0008G5-KA for patchwork@mira.cbaines.net; Fri, 15 Oct 2021 23:35:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbaTP-0008Fv-RA for guix-patches@gnu.org; Fri, 15 Oct 2021 23:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57394) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbaTP-0005HE-Ii for guix-patches@gnu.org; Fri, 15 Oct 2021 23:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mbaTP-0006dR-Eh for guix-patches@gnu.org; Fri, 15 Oct 2021 23:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51232] [PATCH 1/2] gnu: Update udiskie to 2.3.3 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:35:03 +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.163435524425417 (code B ref 51232); Sat, 16 Oct 2021 03:35:03 +0000 Received: (at 51232) by debbugs.gnu.org; 16 Oct 2021 03:34:04 +0000 Received: from localhost ([127.0.0.1]:40707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbaSS-0006bt-H1 for submit@debbugs.gnu.org; Fri, 15 Oct 2021 23:34:04 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:38668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbaSQ-0006bM-9e for 51232@debbugs.gnu.org; Fri, 15 Oct 2021 23:34:03 -0400 Received: by mail-wr1-f51.google.com with SMTP id u18so29753686wrg.5 for <51232@debbugs.gnu.org>; Fri, 15 Oct 2021 20:34:02 -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; bh=eoLmO2ZTQW5MdTXWxh9uo/KbeMGXACvbO1rmEEf+DOU=; b=RTSKepNGXb4+VPygieC4OVcGNN8ZrUgajAarStPIQnWmcJJ4zg/bIrd9XPAGwFbyVL 8+0svggAa16Y6mRoOtDBHXpXa6H+ohlXV8yGvm9RknyhMRH44QuK32d5mDCSzBhGoH7A 1K1p5WV/0Stux//WjnCj8Ieqh3hLuy30ofr9PmtWW03xKpQaA+xcHPjHeo37mWvxUT+u TmNQVCXbXyAViAbpeHmOk+mFYDcN8qZBRyD4G89VbXC+YJAos0A6asxaIQWVOejdY5hj 9iqrKzUWDIo0ri5oJY2jNaV1tiOUE9JLm5kUpZ2cQtPMoUTZvnp9Zm79IhMz6sDH/cNB d3pw== 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; bh=eoLmO2ZTQW5MdTXWxh9uo/KbeMGXACvbO1rmEEf+DOU=; b=kSvCbWDutlXyMldbvCqOSZKylWyqiuOw8pAabM5nZtmAm9f4rZCuoBs4jqeidkkgMm SLSHvVU0HhKMMY6m44eedtDjgxn83/wtVPqzUSN4ekFRa5XRazEpSwMwyMi/hNsjh7vY apDMfhhXlRo+D+lyqFO46NwiOEuMNFwdZRs5hX4DRPLZLXJOr8Hh8V50HbWnQy9q8ctR vUXrks8jZSMMTbC6QOEHG2ZYB5KiBC8xgsTk4FpTQltKyoqEE60/LljWzqwr2B3vrGLf GT0JDIr7MIGEpKCKeAqe8goEAJmoxVOeLpdgKfiTYxX4Uc737kVow73T+hFEoFDII1p7 riJg== X-Gm-Message-State: AOAM530o+L9WbyCK4DHGnkbwsfjts78igXm6WDdOszez5Ewp71H4/kLV +amUCSiBMSQt8+fB5VDfLFzZrurIUXyUX5FyTZTuu9aAH4J28Q== X-Google-Smtp-Source: ABdhPJxW3Gfc8IX6G7/GhoK1qqHtg0Xsapg8gXq8CayDw3dlu/s/wbngY8HCm99MIEzXPpyJQ410e6f0Z0pDQUo7Br0= X-Received: by 2002:a5d:5849:: with SMTP id i9mr19542947wrf.331.1634355235849; Fri, 15 Oct 2021 20:33:55 -0700 (PDT) MIME-Version: 1.0 From: Artem Chernyak Date: Fri, 15 Oct 2021 22:33:44 -0500 Message-ID: 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 * gnu/packages/freedesktop.scm (udiskie): Update to 2.3.3 --- gnu/packages/freedesktop.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 From patchwork Sat Oct 16 03:34:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Artem Chernyak X-Patchwork-Id: 33903 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 1AB5E27BBE3; Sat, 16 Oct 2021 04:36:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8463C27BBE1 for ; Sat, 16 Oct 2021 04:36:09 +0100 (BST) Received: from localhost ([::1]:57528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbaUS-00005H-Lc for patchwork@mira.cbaines.net; Fri, 15 Oct 2021 23:36:08 -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: 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 * 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 - 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 à la fin du fichier -+udiskie.egg-info/zip-safe 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 +0100 -@@ -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 +0100 -+++ 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 = menumaker -- self._menu = Gtk.Menu() -- self._indicator = 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 = self._indicator.get_property('dbus-menu-server') -- self._dbusmenuitem = dbusmenuserver.get_property('root-node') -- self._conn = self._dbusmenuitem.connect('about-to-show', self._on_show) -- self.task = Future() -- menumaker._quit_action = 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 = self._indicator.get_status() -- return status == AppIndicator3.IndicatorStatus.ACTIVE -- -- def show(self, show=True): -- if show == self.visible: -- return -- status = (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 timeout - --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 = udiskie.tray.UdiskieMenu(self, icons, actions, flat, - config.quickmenu_actions) -- if options['appindicator']: -- import udiskie.appindicator -- TrayIcon = udiskie.appindicator.AppIndicatorIcon -- else: -- TrayIcon = udiskie.tray.TrayIcon -+ TrayIcon = udiskie.tray.TrayIcon - trayicon = 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