diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/freedesktop.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/udiskie-no-appindicator.patch | 72 |
2 files changed, 39 insertions, 39 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ed221439b4..c4328386a5 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> ;;; Copyright © 2019 Reza Alizadeh Majd <r.majd@pantherx.org> -;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> +;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; ;;; This file is part of GNU Guix. @@ -1472,14 +1472,14 @@ encoding names are iconv-compatible.") (define-public udiskie (package (name "udiskie") - (version "1.7.7") + (version "2.0.4") (source (origin (method url-fetch) (uri (pypi-uri "udiskie" version)) (sha256 (base32 - "121g9dkr7drv9igpdbcbkj59x15mm72rzp3198bp50zj0lr4wbvi")) + "0gjjzz0k8dlsk03fl2882lbl88hbv031ww72qj02gr65yph0jqgc")) ;; Remove support for the libappindicator library of the ;; Unity desktop environment which is not in Guix. (patches (search-patches "udiskie-no-appindicator.patch")))) diff --git a/gnu/packages/patches/udiskie-no-appindicator.patch b/gnu/packages/patches/udiskie-no-appindicator.patch index c19099cdaa..df3efe104b 100644 --- a/gnu/packages/patches/udiskie-no-appindicator.patch +++ b/gnu/packages/patches/udiskie-no-appindicator.patch @@ -1,9 +1,9 @@ Remove the support for Unity's appindicator. -diff -Naur udiskie-1.7.7/completions/_udiskie udiskie-1.7.7a/completions/_udiskie ---- udiskie-1.7.7/completions/_udiskie 2019-02-17 18:28:58.000000000 +0100 -+++ udiskie-1.7.7a/completions/_udiskie 2019-10-29 14:21:04.556193639 +0100 -@@ -21,8 +21,6 @@ +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]" @@ -12,14 +12,14 @@ diff -Naur udiskie-1.7.7/completions/_udiskie udiskie-1.7.7a/completions/_udiski '(-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-1.7.7/doc/udiskie.8.txt udiskie-1.7.7a/doc/udiskie.8.txt ---- udiskie-1.7.7/doc/udiskie.8.txt 2019-02-17 18:28:58.000000000 +0100 -+++ udiskie-1.7.7a/doc/udiskie.8.txt 2019-10-29 14:21:52.304570344 +0100 -@@ -95,12 +95,6 @@ - *-F, \--no-file-manager*:: - Disable browsing. +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*:: +-*--appindicator*:: - Use AppIndicator3 for the status icon. Use this on Ubuntu/Unity if no icon is shown. - -*--no-appindicator*:: @@ -28,9 +28,9 @@ diff -Naur udiskie-1.7.7/doc/udiskie.8.txt udiskie-1.7.7a/doc/udiskie.8.txt *--password-cache MINUTES*:: Cache passwords for LUKS partitions and set the timeout. -diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindicator.py ---- udiskie-1.7.7/udiskie/appindicator.py 2019-02-17 18:28:58.000000000 +0100 -+++ udiskie-1.7.7a/udiskie/appindicator.py 1970-01-01 01:00:00.000000000 +0100 +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. @@ -39,10 +39,10 @@ diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindic -from gi.repository import Gtk -from gi.repository import AppIndicator3 - --from udiskie.async_ import Async +-from .async_ import Future - - --class AppIndicatorIcon(object): +-class AppIndicatorIcon: - - """ - Show status icon using AppIndicator as backend. Replaces @@ -63,7 +63,7 @@ diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindic - 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 = Async() +- self.task = Future() - menumaker._quit_action = self.destroy - # Populate menu initially, so libdbusmenu does not ignore the - # 'about-to-show': @@ -72,7 +72,7 @@ diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindic - def destroy(self): - self.show(False) - self._dbusmenuitem.disconnect(self._conn) -- self.task.callback() +- self.task.set_result(True) - - @property - def visible(self): @@ -93,10 +93,10 @@ diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindic - # repopulate: - self._maker(self._menu) - self._menu.show_all() -diff -Naur udiskie-1.7.7/udiskie/cli.py udiskie-1.7.7a/udiskie/cli.py ---- udiskie-1.7.7/udiskie/cli.py 2019-02-17 18:28:58.000000000 +0100 -+++ udiskie-1.7.7a/udiskie/cli.py 2019-10-29 14:18:22.678919186 +0100 -@@ -376,9 +376,6 @@ +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] @@ -106,15 +106,15 @@ diff -Naur udiskie-1.7.7/udiskie/cli.py udiskie-1.7.7a/udiskie/cli.py --password-cache MINUTES Set password cache timeout --no-password-cache Disable password cache -@@ -400,7 +397,6 @@ +@@ -312,7 +309,6 @@ 'notify': True, 'tray': False, 'menu': 'flat', - 'appindicator': False, 'file_manager': 'xdg-open', + 'terminal': '', 'password_prompt': 'builtin:gui', - 'password_cache': False, -@@ -415,7 +411,6 @@ +@@ -328,7 +324,6 @@ '--no-tray': False, '--smart-tray': 'auto'}), 'menu': Value('--menu'), @@ -122,10 +122,10 @@ diff -Naur udiskie-1.7.7/udiskie/cli.py udiskie-1.7.7a/udiskie/cli.py 'file_manager': OptionalValue('--file-manager'), 'password_prompt': OptionalValue('--password-prompt'), 'password_cache': OptionalValue('--password-cache'), -@@ -541,11 +536,7 @@ - raise ValueError("Invalid menu: %s" % (options['menu'],)) +@@ -459,11 +454,7 @@ - menu_maker = udiskie.tray.UdiskieMenu(self, icons, actions, flat) + menu_maker = udiskie.tray.UdiskieMenu(self, icons, actions, flat, + config.quickmenu_actions) - if options['appindicator']: - import udiskie.appindicator - TrayIcon = udiskie.appindicator.AppIndicatorIcon @@ -135,10 +135,10 @@ diff -Naur udiskie-1.7.7/udiskie/cli.py udiskie-1.7.7a/udiskie/cli.py trayicon = TrayIcon(menu_maker, icons) return udiskie.tray.UdiskieStatusIcon(trayicon, menu_maker, smart) -diff -Naur udiskie-1.7.7/udiskie.egg-info/SOURCES.txt udiskie-1.7.7a/udiskie.egg-info/SOURCES.txt ---- udiskie-1.7.7/udiskie.egg-info/SOURCES.txt 2019-02-17 19:42:25.000000000 +0100 -+++ udiskie-1.7.7a/udiskie.egg-info/SOURCES.txt 2019-10-29 14:40:09.333315287 +0100 -@@ -24,7 +24,6 @@ +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 @@ -146,10 +146,10 @@ diff -Naur udiskie-1.7.7/udiskie.egg-info/SOURCES.txt udiskie-1.7.7a/udiskie.egg udiskie/async_.py udiskie/automount.py udiskie/cache.py -@@ -46,4 +45,4 @@ - udiskie.egg-info/dependency_links.txt +@@ -47,4 +46,4 @@ udiskie.egg-info/entry_points.txt udiskie.egg-info/requires.txt --udiskie.egg-info/top_level.txt + udiskie.egg-info/top_level.txt +-udiskie.egg-info/zip-safe \ Pas de fin de ligne à la fin du fichier -+udiskie.egg-info/top_level.txt ++udiskie.egg-info/zip-safe |