From 3ff993086f9874aaec40a8d6bbc2ccbbb56f6aca Mon Sep 17 00:00:00 2001 From: Ashley Wulber <48420062+wash2@users.noreply.github.com> Date: Tue, 14 Feb 2023 19:57:00 -0500 Subject: [PATCH] chore: remove wayland-proxy-virtwl (#70) --- .gitmodules | 3 --- README.md | 7 ------- cosmic-comp | 2 +- data/wayland-proxy-virtwl.service | 9 --------- justfile | 10 +--------- wayland-proxy-virtwl | 1 - 6 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 data/wayland-proxy-virtwl.service delete mode 160000 wayland-proxy-virtwl diff --git a/.gitmodules b/.gitmodules index 6e5ad61..6a15cc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,6 +31,3 @@ [submodule "cosmic-bg"] path = cosmic-bg url = https://github.com/pop-os/cosmic-bg.git -[submodule "wayland-proxy-virtwl"] - path = wayland-proxy-virtwl - url = https://github.com/talex5/wayland-proxy-virtwl diff --git a/README.md b/README.md index a1a30f7..44ef8f9 100644 --- a/README.md +++ b/README.md @@ -57,13 +57,6 @@ It also requires the previously mentioned libraries/dependencies at runtime to b It is thus no proper method for long term deployment. -### Experimental X Support - -With [opam installed](https://opam.ocaml.org/doc/Install.html) X support using wayland-proxy-virtwl can be optionally enabled during installation. When building, use `just x=1 sysext` and after refreshing with `sudo systemd-sysext refresh`, run -``` -systemctl --user daemon-reload -systemctl --user enable --now wayland-proxy-virtwl -``` ### Packaging Cosmic DE is packaged for Pop!_OS for reference look at the `debian` folders in the projects repositories. diff --git a/cosmic-comp b/cosmic-comp index 32762fb..5ba068e 160000 --- a/cosmic-comp +++ b/cosmic-comp @@ -1 +1 @@ -Subproject commit 32762fb9833269e9c9560605cafce6c2928d6b48 +Subproject commit 5ba068ec82554109ab7d9051ead9a004bb3f2cb5 diff --git a/data/wayland-proxy-virtwl.service b/data/wayland-proxy-virtwl.service deleted file mode 100644 index e323913..0000000 --- a/data/wayland-proxy-virtwl.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Wayland-proxy-virtwl -After=cosmic-session.target - -[Service] -ExecStart=/usr/bin/wayland-proxy-virtwl --wayland-display wayland-virtwl --x-display=0 - -[Install] -WantedBy=cosmic-session.target diff --git a/justfile b/justfile index 7318d12..1de4d6b 100644 --- a/justfile +++ b/justfile @@ -2,7 +2,6 @@ set dotenv-load just := just_executable() make := `which make` meson := `which meson` -x := '0' _meson_build dir: -rm -rf {{dir}}_build @@ -27,7 +26,6 @@ build: {{ make }} -C xdg-desktop-portal-cosmic all sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --short HEAD`): build && (_extension_release dir version) - #!/usr/bin/env sh mkdir -p {{dir}}/usr/lib/extension-release.d/ {{ just }} rootdir={{dir}} cosmic-applets/install {{ just }} _meson_install cosmic-applibrary {{dir}} @@ -38,13 +36,7 @@ sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --sh {{ make }} -C cosmic-panel install DESTDIR={{dir}} prefix=/usr {{ make }} -C cosmic-settings-daemon install DESTDIR={{dir}} prefix=/usr {{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr - if test {{x}} = 1; then - install -Dm0644 data/wayland-proxy-virtwl.service {{dir}}/usr/lib/systemd/user/wayland-proxy-virtwl.service - opam install ./wayland-proxy-virtwl --destdir={{dir}}/usr - {{ just }} x=1 rootdir={{dir}} cosmic-session/install - else - {{ just }} rootdir={{dir}} cosmic-session/install - fi + {{ just }} rootdir={{dir}} cosmic-session/install _extension_release dir version: #!/usr/bin/env sh cat >{{dir}}/usr/lib/extension-release.d/extension-release.cosmic-sysext <