File tree Expand file tree Collapse file tree 2 files changed +1
-26
lines changed Expand file tree Collapse file tree 2 files changed +1
-26
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,6 @@ target := if debug == '1' { 'debug' } else { 'release' }
9
9
vendor_args := if vendor == ' 1' { ' --frozen --offline' } else { ' ' }
10
10
debug_args := if debug == ' 1' { ' ' } else { ' --release' }
11
11
cargo_args := vendor_args + ' ' + debug_args
12
- xdp_cosmic := ' /usr/libexec/xdg-desktop-portal-cosmic'
13
12
orca := ' /usr/bin/orca'
14
13
cosmic_dconf_profile := prefix + ' /share/dconf/profile/cosmic'
15
14
@@ -21,7 +20,7 @@ applicationdir := rootdir / prefix + '/share/applications'
21
20
all : _extract_vendor build
22
21
23
22
build :
24
- XDP_COSMIC= {{ xdp_cosmic }} ORCA={{ orca}} cargo build {{ cargo_args}}
23
+ ORCA={{ orca}} cargo build {{ cargo_args}}
25
24
26
25
# Installs files into the system
27
26
install :
Original file line number Diff line number Diff line change @@ -46,7 +46,6 @@ use tracing::{Instrument, metadata::LevelFilter};
46
46
use tracing_subscriber:: { EnvFilter , fmt, prelude:: * } ;
47
47
48
48
use crate :: notifications:: notifications_process;
49
- const XDP_COSMIC : Option < & ' static str > = option_env ! ( "XDP_COSMIC" ) ;
50
49
#[ cfg( feature = "autostart" ) ]
51
50
const AUTOSTART_DIR : & ' static str = "autostart" ;
52
51
#[ cfg( feature = "autostart" ) ]
@@ -427,29 +426,6 @@ async fn start(
427
426
)
428
427
. await ;
429
428
430
- if env:: var ( "XDG_CURRENT_DESKTOP" ) . as_deref ( ) == Ok ( "COSMIC" ) {
431
- let span = info_span ! ( parent: None , "xdg-desktop-portal-cosmic" ) ;
432
- let mut sockets = Vec :: with_capacity ( 1 ) ;
433
- let extra_env = Vec :: with_capacity ( 1 ) ;
434
- let portal_extras =
435
- if let Ok ( ( mut env, fd) ) = create_privileged_socket ( & mut sockets, & extra_env) {
436
- let mut env = env. remove ( 0 ) ;
437
- env. 0 = "PORTAL_WAYLAND_SOCKET" . to_string ( ) ;
438
- vec ! [ ( fd, env, sockets. remove( 0 ) ) ]
439
- } else {
440
- Vec :: new ( )
441
- } ;
442
- start_component (
443
- XDP_COSMIC . unwrap_or ( "/usr/libexec/xdg-desktop-portal-cosmic" ) ,
444
- span,
445
- & process_manager,
446
- & env_vars,
447
- & socket_tx,
448
- portal_extras,
449
- )
450
- . await ;
451
- }
452
-
453
429
#[ cfg( feature = "autostart" ) ]
454
430
if !* is_systemd_used ( ) {
455
431
info ! ( "looking for autostart folders" ) ;
You can’t perform that action at this time.
0 commit comments