diff options
Diffstat (limited to 'net-misc/electron-cash/files')
-rw-r--r-- | net-misc/electron-cash/files/2.8.0-no-user-root.patch | 15 | ||||
-rw-r--r-- | net-misc/electron-cash/files/3.3.6-no-user-root.patch | 27 |
2 files changed, 27 insertions, 15 deletions
diff --git a/net-misc/electron-cash/files/2.8.0-no-user-root.patch b/net-misc/electron-cash/files/2.8.0-no-user-root.patch deleted file mode 100644 index 2ca5363effe7..000000000000 --- a/net-misc/electron-cash/files/2.8.0-no-user-root.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./setup.py.orig 2017-01-06 19:17:44.294137848 +0000 -+++ ./setup.py 2017-01-06 19:17:50.093161327 +0000 -@@ -21,12 +21,6 @@ - parser.add_argument('--root=', dest='root_path', metavar='dir', default='/') - opts, _ = parser.parse_known_args(sys.argv[1:]) - usr_share = os.path.join(sys.prefix, "share") -- if not os.access(opts.root_path + usr_share, os.W_OK) and \ -- not os.access(opts.root_path, os.W_OK): -- if 'XDG_DATA_HOME' in os.environ.keys(): -- usr_share = os.environ['XDG_DATA_HOME'] -- else: -- usr_share = os.path.expanduser('~/.local/share') - data_files += [ - (os.path.join(usr_share, 'applications/'), ['electrum.desktop']), - ] diff --git a/net-misc/electron-cash/files/3.3.6-no-user-root.patch b/net-misc/electron-cash/files/3.3.6-no-user-root.patch new file mode 100644 index 000000000000..f5f0aecf382f --- /dev/null +++ b/net-misc/electron-cash/files/3.3.6-no-user-root.patch @@ -0,0 +1,27 @@ +--- a/setup.py ++++ b/setup.py +@@ -33,23 +33,7 @@ + # Use per-user */share directory if the global one is not writable or if a per-user installation + # is attempted + user_share = os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')) +- system_share = os.path.join(opts.prefix_path, "share") +- if not opts.is_user: +- # Not neccarily a per-user installation try system directories +- if os.access(opts.root_path + system_share, os.W_OK): +- # Global /usr/share is writable for us – so just use that +- share_dir = system_share +- elif not os.path.exists(opts.root_path + system_share) and os.access(opts.root_path, os.W_OK): +- # Global /usr/share does not exist, but / is writable – keep using the global directory +- # (happens during packaging) +- share_dir = system_share +- else: +- # Neither /usr/share (nor / if /usr/share doesn't exist) is writable, use the +- # per-user */share directory +- share_dir = user_share +- else: +- # Per-user installation +- share_dir = user_share ++ share_dir = os.path.join(opts.prefix_path, "share") + data_files += [ + # Menu icon + # Menu entry |