From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 15 23:30:56 2021 Received: (at submit) by debbugs.gnu.org; 16 Oct 2021 03:30:56 +0000 Received: from localhost ([127.0.0.1]:40701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbaPQ-0006Wl-3m for submit@debbugs.gnu.org; Fri, 15 Oct 2021 23:30:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:59530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbaPO-0006Wd-9r for submit@debbugs.gnu.org; Fri, 15 Oct 2021 23:30:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbaPO-0007Ne-3H for guix-patches@gnu.org; Fri, 15 Oct 2021 23:30:54 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:40636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbaPM-0000wf-CC for guix-patches@gnu.org; Fri, 15 Oct 2021 23:30:53 -0400 Received: by mail-wr1-x436.google.com with SMTP id i12so29595340wrb.7 for ; Fri, 15 Oct 2021 20:30:51 -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=jj7NE8dlsjqAPK3wz0JWA/WiU/0ta7lYNAECqLxVnXE=; b=oj6tAAfIJxNhAQMIgIU8YLCcuBZa/+ycH44T9c6ueKDjx0AnPFmgt4i2OyWNLco/EC vKCozl9P1AB6SVPbh2GFQQ5PSkL4xa4QNvfB3qBEszIzhqCCYt3aplbNu4QKtggkoG/A WnurENDYTf2ALWO64jocunvZAJrs40a0ul3sApQsBnuMd/ibLpJEkE7wQ3EhE6JCUwih rQ5cuqry96500tG49hsBg21X6SJbOWxwEtHoR/V8zn6mOzmX4eBvjBI2qb3+fB3zeM8d 8ia8z9Tfn0Z/A0lWJRU6Y0W5QzyaMQbc1FOlELW/cUyyZX2Ivhi6OYeu9zZRqnHp21Lb flIA== 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=jj7NE8dlsjqAPK3wz0JWA/WiU/0ta7lYNAECqLxVnXE=; b=N+C8swseuJtgh7AQJqPHbpH5QCnjT9Jblg7JxioQYnf3J4KyGpPb56pjnDvaEj7f3m Frq0TCW4+0O9NNxoO9ZpYGcSVeZSINQOIqFfa+Oo+Fw6T0lnSLU3v7l1Llq+3iyAE1jx iP6SkXw54/hmc7t7kPjyTVn2TQ5d3+mC3pzyY2cNuiC0s2hpQCOWCSgdpSryXOJzjWCN 5bBc+Y3yS9bZZPuQKkH0EEAKWZwzUYwniRsMOo0Pm52kNA+GADG3gyG/asCEubYXxB1i ppbTd5xzo+jJRi8NslN20PSYye5Wx1Ef/EQWy3/hMig7WzRUZDtnY+r0fdM2U/vpw6m9 AJNg== X-Gm-Message-State: AOAM531kwcgOBsn0O0e/Qgq+ZxfLdTr+pcw/OC+8j80+nWVYsgzmDdsg k7JndOFv2jVUvnpV5rbuCmfK3wglxtuDhZhIUdDjvGvbwPnjsw== X-Google-Smtp-Source: ABdhPJzGLHsK9brDQAodC3FKIQOEDmK1HVnxmZnnyV33zrPZvkOinu2xfg8DsiFjr7Iq2x9fhqFlS7CDUbaptH99Tsk= X-Received: by 2002:a05:6000:1acd:: with SMTP id i13mr19042156wry.351.1634355049627; Fri, 15 Oct 2021 20:30:49 -0700 (PDT) MIME-Version: 1.0 From: Artem Chernyak Date: Fri, 15 Oct 2021 22:30:38 -0500 Message-ID: Subject: [PATCH 0/2] gnu: Update udiskie to 2.3.3 To: guix-patches@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=artemchernyak@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Since we now have libappindicator packaged, we can safely remove the patch instead of updating it for the new version. Artem Chernyak (2): gnu: Update udiskie to 2.3.3 gnu: Remove udiskie-no-appindicator.patch gnu/packages/freedesktop.scm | 8 +- .../patches/udiskie-no-appindicator.patch | 155 ------------------ 2 files changed, 3 insertions(+), 160 deletions(-) delete mode 100644 gnu/packages/patches/udiskie-no-appindicator.patch -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 15 23:34:04 2021 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: Subject: [PATCH 1/2] gnu: Update udiskie to 2.3.3 To: 51232@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51232 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 15 23:35:21 2021 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: Subject: [PATCH 2/2] gnu: Remove udiskie-no-appindicator.patch To: 51232@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51232 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 18 05:07:48 2021 Received: (at 51232) by debbugs.gnu.org; 18 Oct 2021 09:07:48 +0000 Received: from localhost ([127.0.0.1]:45978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcOcV-0004Kj-MC for submit@debbugs.gnu.org; Mon, 18 Oct 2021 05:07:47 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcOcU-0004KR-Fw for 51232@debbugs.gnu.org; Mon, 18 Oct 2021 05:07:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AFFF5240103 for <51232@debbugs.gnu.org>; Mon, 18 Oct 2021 11:07:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1634548059; bh=7pSYN045ZXDkeZhpt8y7ldtwiv5GruvSBii0ABrghMM=; h=From:To:Cc:Subject:Date:From; b=U2+ru118veDFZzzfDs/0tfa6e+KaPFQTztude4lwNfSWGv2gY8ZhZMQtteWEulAqW fLh5Q3JZUfb4Br+pZBHDt3zhmsEpKQVCyILHWgrBo9ErESxJe+vmJpTmTILXO0OLaB qtPWlAWZ380OxR9FQVX/LU5+nvEvo9CeQ2cKzvD+6kuuv8GQG5/4i3luGMQ7LQFtlU IHSc7isBQp/EG1iPEJKKitn9EHCdrq74Yqp0szsfIYR5tFNz1hJsigbPqcv1kVIi29 DqYoN3kREOP754Lwk1zE8ovB+yOa/XlMYKyZP4XSLCFMQ84OeEau71XBqc4OH72zIt Zz5O9ipa2kszw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HXrcV5z4vz6tmN; Mon, 18 Oct 2021 11:07:38 +0200 (CEST) References: From: Guillaume Le Vaillant To: Artem Chernyak Subject: Re: [bug#51232] [PATCH 0/2] gnu: Update udiskie to 2.3.3 Date: Mon, 18 Oct 2021 09:00:11 +0000 In-reply-to: Message-ID: <87ee8iwvja.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 51232 Cc: 51232@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Artem Chernyak skribis: > Since we now have libappindicator packaged, we can safely remove the > patch instead of updating it for the new version. > > Artem Chernyak (2): > gnu: Update udiskie to 2.3.3 > gnu: Remove udiskie-no-appindicator.patch > > gnu/packages/freedesktop.scm | 8 +- > .../patches/udiskie-no-appindicator.patch | 155 ------------------ > 2 files changed, 3 insertions(+), 160 deletions(-) > delete mode 100644 gnu/packages/patches/udiskie-no-appindicator.patch When removing a patch file, you must also remove it in the 'dist_patch_DATA' list of patches in the "gnu/local.mk" file. Also, you don't need to split the patch removal in several commits (see commit 2f0986b0f7cbf4dec5a3e575c67a508cf71c6dd5 for example). Could you send an updated patch? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCYW05WQ8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j+h+AD/TP8sploR0cBH9jGe/XMi+NeLBSttxJ/5Qtwg fHKTdU4A/RO33sp9IcFkepln3hNN5OOe7QyZykH91fD9o3eoWOQ2 =YjRL -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 18 08:15:28 2021 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 ) 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 ) 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 Date: Mon, 18 Oct 2021 07:14:57 -0500 Message-ID: Subject: [PATCH] gnu: Update udiskie to 2.3.3 To: 51232@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51232 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 18 10:46:17 2021 Received: (at 51232-done) by debbugs.gnu.org; 18 Oct 2021 14:46:17 +0000 Received: from localhost ([127.0.0.1]:48263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcTu4-00058i-W0 for submit@debbugs.gnu.org; Mon, 18 Oct 2021 10:46:17 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45517) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcTu1-00058T-QM for 51232-done@debbugs.gnu.org; Mon, 18 Oct 2021 10:46:15 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 30002240027 for <51232-done@debbugs.gnu.org>; Mon, 18 Oct 2021 16:46:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1634568366; bh=tFSxGfLwX79UxDSjZzeBHr73hJPlzFc9Q966irkM1xo=; h=From:To:Cc:Subject:Date:From; b=TDGDgeY0rs+CFwilr4SCUK6nWLqQ92EPaBHdzGMn229dDiyUxN6mjjSwEQpp+O1PZ lJQXXF65rQFVNprshiyqgN31z3/x7GoM+E/rsF6R9wGU833Y+bQ+6Sv0OCpm2C54EQ mX4IOOOSKKUUfMc/iwklj+TqWQ/7EfrdzRv0IelrO5mkBEz6G16vhsqKFHbvYQ4gAx 9gradzM3QlwqqsomxoWSz8dwMajDFF/IPCBHlmVHnWW3dDPBgu/Z/egygbygd6hjiY jGg9mGYiPvpbf/4idKEXynFx+j0xllDv+Klt3jPiqdkqiz+QzKDtdAYihqSihCHf0F mo+i5DYHoU6IQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HY0712bQfz6tmM; Mon, 18 Oct 2021 16:46:04 +0200 (CEST) References: From: Guillaume Le Vaillant To: Artem Chernyak Subject: Re: [bug#51232] [PATCH] gnu: Update udiskie to 2.3.3 Date: Mon, 18 Oct 2021 14:44:54 +0000 In-reply-to: Message-ID: <871r4iwfv7.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 51232-done Cc: 51232-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Patch pushed as 878744c5e3be6165633ead99c0efdca88abfcaea. Thanks. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCYW2IrA8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j+ZrgD/XFzY1ukbYJOPELCuxTW4YZ3tSBGPNH3gZ0rw 1inF9PwA/i43xdoxlXMcdcEEJGcic1uTz6q57w+0W9TwP5Ey+fl6 =MCec -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Aug 18 08:27:23 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 16 Nov 2021 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator