From patchwork Tue Oct 29 15:14:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guillaume Le Vaillant X-Patchwork-Id: 15882 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 A9CCF1768E; Tue, 29 Oct 2019 15:15:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BFB1317607 for ; Tue, 29 Oct 2019 15:15:54 +0000 (GMT) Received: from localhost ([::1]:58318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPTDs-0005F0-7M for patchwork@mira.cbaines.net; Tue, 29 Oct 2019 11:15:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40235) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPTDA-00054g-M6 for guix-patches@gnu.org; Tue, 29 Oct 2019 11:15:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPTD6-00076h-Dm for guix-patches@gnu.org; Tue, 29 Oct 2019 11:15:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39658) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iPTD4-00074s-ML for guix-patches@gnu.org; Tue, 29 Oct 2019 11:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iPTD4-0003g4-G5 for guix-patches@gnu.org; Tue, 29 Oct 2019 11:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37975] [PATCH v3 2/2] gnu: Add udiskie. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2019 15:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37975 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37975@debbugs.gnu.org Cc: Guillaume Le Vaillant Received: via spool by 37975-submit@debbugs.gnu.org id=B37975.157236210014104 (code B ref 37975); Tue, 29 Oct 2019 15:15:02 +0000 Received: (at 37975) by debbugs.gnu.org; 29 Oct 2019 15:15:00 +0000 Received: from localhost ([127.0.0.1]:48478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPTCs-0003fF-0s for submit@debbugs.gnu.org; Tue, 29 Oct 2019 11:15:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:52470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPTCk-0003ej-8q for 37975@debbugs.gnu.org; Tue, 29 Oct 2019 11:14:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 85122160061 for <37975@debbugs.gnu.org>; Tue, 29 Oct 2019 16:14:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1572362076; bh=S70kE1HvIeEPDPFztqR132Y4tLPLPjbeLsVg2rgyGW8=; h=From:To:Cc:Subject:Date:From; b=Imrj005PpLYwth2JNiPXAJddUZCT6/W/icXZMFBxh1pjy+0nLzqMQwK7aJ1bnZ1dc 2oNC4dAfrjWODQ1Ht0M6r6RPl/Ihg4K6zw8UUxdJCUPKr5onr5k1/Sr33IAbfNWHDG mgnKS36kwCTGkCFvxxwBsI+WvPqNcKPegvVNT8JSFX1Ot3SDZmfIlJdzah8KGIx0Xp Bf9+SMcam1KdbWUqqzcaFIeqGB7i9oqAjVGFKM7h1ehiBZwDA04t2RdU7oqixA4BZv QV05ki44W9eg3fWK3WIASyRUcm4ry25XYdy71bJr1uycSQjuQ2I1MiG+0ffLuclpFw a68jbNcKgA7bA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 472ZrC5pyWz6tqw; Tue, 29 Oct 2019 16:14:35 +0100 (CET) From: Guillaume Le Vaillant Date: Tue, 29 Oct 2019 16:14:14 +0100 Message-Id: <20191029151414.1654-2-glv@posteo.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191029151414.1654-1-glv@posteo.net> References: <87v9s7skj4.fsf@ambrevar.xyz> <20191029151414.1654-1-glv@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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): New variable. * gnu/packages/patches/udiskie-no-appindicator.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 63 +++++++ .../patches/udiskie-no-appindicator.patch | 155 ++++++++++++++++++ 3 files changed, 219 insertions(+) create mode 100644 gnu/packages/patches/udiskie-no-appindicator.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1b04485422..01ab967148 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1387,6 +1387,7 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/txr-shell.patch \ %D%/packages/patches/u-boot-fix-mkimage-header-verification.patch \ + %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ %D%/packages/patches/unzip-CVE-2014-8141.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b18d71cb98..2574153cef 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Stefan Stefanović ;;; Copyright © 2019 Reza Alizadeh Majd +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) #:use-module (gnu packages valgrind) @@ -1439,3 +1441,64 @@ encoding names are iconv-compatible.") ;; This combines code under MPL 1.1, LGPL 2.1+, and GPL 2.0+, so the ;; combination is GPL 2.0+. (license license:gpl2+))) + +(define-public udiskie + (package + (name "udiskie") + (version "1.7.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "udiskie" version)) + (sha256 + (base32 + "121g9dkr7drv9igpdbcbkj59x15mm72rzp3198bp50zj0lr4wbvi")) + ;; Remove support for the libappindicator library of the + ;; Unity desktop environment which is not in Guix. + (patches (search-patches "udiskie-no-appindicator.patch")))) + (build-system python-build-system) + (native-inputs + `(("asciidoc" ,asciidoc) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gobject-introspection" ,gobject-introspection) + ("gtk+" ,gtk+) + ("libnotify" ,libnotify) + ("udisks" ,udisks))) + (propagated-inputs + `(("python-docopt" ,python-docopt) + ("python-pygobject" ,python-pygobject) + ("python-keyutils" ,python-keyutils) + ("python-pyxdg" ,python-pyxdg) + ("python-pyyaml" ,python-pyyaml))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-gi-typelib + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append out "/bin/udiskie") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + #t))))) + (home-page "https://github.com/coldfix/udiskie") + (synopsis "Automounter for removable media") + (description + "The @command{udiskie} program is a udisks2 front-end that allows to +manage removable media such as CDs or flash drives from userspace. + +Its features include: + +@itemize +@item automount removable media, +@item notifications, +@item tray icon, +@item command line tools for manual (un)mounting, +@item LUKS encrypted devices, +@item unlocking with keyfiles, +@item loop devices (mounting ISO archives), +@item password caching. +@end itemize +") + (license license:expat))) diff --git a/gnu/packages/patches/udiskie-no-appindicator.patch b/gnu/packages/patches/udiskie-no-appindicator.patch new file mode 100644 index 0000000000..c19099cdaa --- /dev/null +++ b/gnu/packages/patches/udiskie-no-appindicator.patch @@ -0,0 +1,155 @@ +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 @@ + '(-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-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. + +-*-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-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 +@@ -1,61 +0,0 @@ +-""" +-Status icon using AppIndicator3. +-""" +- +-from gi.repository import Gtk +-from gi.repository import AppIndicator3 +- +-from udiskie.async_ import Async +- +- +-class AppIndicatorIcon(object): +- +- """ +- 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 = Async() +- 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.callback() +- +- @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-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 @@ + -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 + +@@ -400,7 +397,6 @@ + 'notify': True, + 'tray': False, + 'menu': 'flat', +- 'appindicator': False, + 'file_manager': 'xdg-open', + 'password_prompt': 'builtin:gui', + 'password_cache': False, +@@ -415,7 +411,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'), +@@ -541,11 +536,7 @@ + raise ValueError("Invalid menu: %s" % (options['menu'],)) + + menu_maker = udiskie.tray.UdiskieMenu(self, icons, actions, flat) +- 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-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 @@ + test/test_cache.py + test/test_match.py + udiskie/__init__.py +-udiskie/appindicator.py + udiskie/async_.py + udiskie/automount.py + udiskie/cache.py +@@ -46,4 +45,4 @@ + udiskie.egg-info/dependency_links.txt + udiskie.egg-info/entry_points.txt + udiskie.egg-info/requires.txt +-udiskie.egg-info/top_level.txt +\ Pas de fin de ligne à la fin du fichier ++udiskie.egg-info/top_level.txt