leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update debian packaing for new repo structure.

Browse source
This commit is contained in:
13r0ck 2022-12-22 19:59:58 -07:00 • committed by Ashley Wulber
parent a682b8deb0
commit 31362c7dc1
5 changed files with 76 additions and 2430 deletions
Download patch file Download diff file Expand all files Collapse all files

2329
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

25
Cargo.toml
View file

@ -1,25 +0,0 @@
[workspace]
members = [
"applets/cosmic-applet-status-area",
"applets/cosmic-panel-button",
"libcosmic-applet",
]
exclude = [
"applets/cosmic-applet-network",
"applets/cosmic-applet-graphics",
"applets/cosmic-applet-workspaces",
"applets/cosmic-applet-battery",
"applets/cosmic-applet-audio",
"applets/cosmic-applet-power",
"applets/cosmic-applet-time",
"applets/cosmic-app-list",
"applets/cosmic-applet-notifications",
]
[patch.crates-io]
wayland-protocols = { git = "https://github.com/smithay/wayland-rs", version = "0.30.0-beta.9"}
wayland-protocols-wlr = { git = "https://github.com/smithay/wayland-rs", version = "0.1.0-beta.9"}
wayland-sys = { git = "https://github.com/smithay/wayland-rs", version = "0.30.0-beta.9"}
wayland-backend = { git = "https://github.com/smithay/wayland-rs", version = "0.1.0-beta.9"}
wayland-scanner = { git = "https://github.com/smithay/wayland-rs", version = "0.30.0-beta.9"}
wayland-client = { git = "https://github.com/smithay/wayland-rs", version = "0.30.0-beta.9"}

42
debian/rules vendored
View file

@ -12,67 +12,73 @@ override_dh_shlibdeps:
override_dh_auto_clean: override_dh_auto_clean:
if test "${CLEAN}" = "1"; then \ if test "${CLEAN}" = "1"; then \
cargo clean; \ cd cosmic-applet-graphics; \
cargo clean --manifest-path applets/cosmic-applet-graphics/Cargo.toml; \ cargo clean --manifest-path Cargo.toml; \
cargo clean --manifest-path applets/cosmic-applet-workspaces/Cargo.toml; \ cd ../cosmic-applet-workspaces; \
cargo clean --manifest-path Cargo.toml; \
cd ../cosmic-applet-notifications; \
cargo clean --manifest-path Cargo.toml; \
cd ..; \
fi fi
if ! ischroot && test "${VENDOR}" = "1"; then \ if ! ischroot && test "${VENDOR}" = "1"; then \
cd cosmic-applet-graphics/; \
mkdir -p .cargo; \ mkdir -p .cargo; \
cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \ cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \
echo 'directory = "vendor"' >> .cargo/config; \ echo 'directory = "vendor"' >> .cargo/config; \
tar pcf vendor.tar vendor; \ tar pcf vendor.tar vendor; \
rm -rf vendor; \ rm -rf vendor; \
cd applets/cosmic-applet-graphics/; \ cd ..; \
cd cosmic-applet-workspaces/; \
mkdir -p .cargo; \ mkdir -p .cargo; \
cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \ cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \
echo 'directory = "vendor"' >> .cargo/config; \ echo 'directory = "vendor"' >> .cargo/config; \
tar pcf vendor.tar vendor; \ tar pcf vendor.tar vendor; \
rm -rf vendor; \ rm -rf vendor; \
cd ../..; \ cd ..; \
cd applets/cosmic-applet-workspaces/; \ cd cosmic-applet-battery/; \
mkdir -p .cargo; \ mkdir -p .cargo; \
cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \ cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \
echo 'directory = "vendor"' >> .cargo/config; \ echo 'directory = "vendor"' >> .cargo/config; \
tar pcf vendor.tar vendor; \ tar pcf vendor.tar vendor; \
rm -rf vendor; \ rm -rf vendor; \
cd ../..; \ cd ..; \
cd applets/cosmic-applet-battery/; \ cd cosmic-applet-audio/; \
mkdir -p .cargo; \ mkdir -p .cargo; \
cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \ cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \
echo 'directory = "vendor"' >> .cargo/config; \ echo 'directory = "vendor"' >> .cargo/config; \
tar pcf vendor.tar vendor; \ tar pcf vendor.tar vendor; \
rm -rf vendor; \ rm -rf vendor; \
cd ../..; \ cd ..; \
cd applets/cosmic-applet-audio/; \ cd cosmic-applet-time/; \
mkdir -p .cargo; \ mkdir -p .cargo; \
cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \ cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \
echo 'directory = "vendor"' >> .cargo/config; \ echo 'directory = "vendor"' >> .cargo/config; \
tar pcf vendor.tar vendor; \ tar pcf vendor.tar vendor; \
rm -rf vendor; \ rm -rf vendor; \
cd ../..; \ cd ..; \
cd applets/cosmic-applet-time/; \ cd cosmic-applet-power/; \
mkdir -p .cargo; \ mkdir -p .cargo; \
cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \ cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \
echo 'directory = "vendor"' >> .cargo/config; \ echo 'directory = "vendor"' >> .cargo/config; \
tar pcf vendor.tar vendor; \ tar pcf vendor.tar vendor; \
rm -rf vendor; \ rm -rf vendor; \
cd ../..; \ cd ..; \
cd applets/cosmic-applet-power/; \ cd cosmic-applet-notifications/; \
mkdir -p .cargo; \ mkdir -p .cargo; \
cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \ cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \
echo 'directory = "vendor"' >> .cargo/config; \ echo 'directory = "vendor"' >> .cargo/config; \
tar pcf vendor.tar vendor; \ tar pcf vendor.tar vendor; \
rm -rf vendor; \ rm -rf vendor; \
cd ../..; \ cd ..; \
cd applets/cosmic-applet-network/; \ cd cosmic-applet-network/; \
mkdir -p .cargo; \ mkdir -p .cargo; \
cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \ cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \
echo 'directory = "vendor"' >> .cargo/config; \ echo 'directory = "vendor"' >> .cargo/config; \
tar pcf vendor.tar vendor; \ tar pcf vendor.tar vendor; \
rm -rf vendor; \ rm -rf vendor; \
cd ../..; \ cd ..; \
cd applets/cosmic-app-list/; \ cd cosmic-app-list/; \
mkdir -p .cargo; \ mkdir -p .cargo; \
cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \ cargo vendor --sync Cargo.toml | head -n -1 > .cargo/config; \
echo 'directory = "vendor"' >> .cargo/config; \ echo 'directory = "vendor"' >> .cargo/config; \

109
justfile
View file

@ -28,108 +28,103 @@ workspaces_button_id := 'com.system76.CosmicPanelWorkspacesButton'
build: _extract_vendor build: _extract_vendor
#!/usr/bin/env bash #!/usr/bin/env bash
pushd applets/cosmic-app-list/ pushd cosmic-app-list/
cargo build {{cargo_args}} cargo build {{cargo_args}}
popd popd
pushd applets/cosmic-applet-audio/ pushd cosmic-applet-audio/
cargo build {{cargo_args}} cargo build {{cargo_args}}
popd popd
pushd applets/cosmic-applet-network/ pushd cosmic-applet-network/
cargo build {{cargo_args}} cargo build {{cargo_args}}
popd popd
pushd applets/cosmic-applet-graphics/ pushd cosmic-applet-graphics/
cargo build {{cargo_args}} cargo build {{cargo_args}}
popd popd
pushd applets/cosmic-applet-battery/ pushd cosmic-applet-battery/
cargo build {{cargo_args}} cargo build {{cargo_args}}
popd popd
pushd applets/cosmic-applet-power/ pushd cosmic-applet-power/
cargo build {{cargo_args}} cargo build {{cargo_args}}
popd popd
pushd applets/cosmic-applet-time/ pushd cosmic-applet-notifications/
cargo build {{cargo_args}} cargo build {{cargo_args}}
popd popd
pushd applets/cosmic-applet-workspaces/ pushd cosmic-applet-time/
cargo build {{cargo_args}} cargo build {{cargo_args}}
popd popd
pushd cosmic-applet-workspaces/
cargo build {{cargo_args}} cargo build {{cargo_args}}
popd
# Installs files into the system # Installs files into the system
install: install:
# audio # audio
install -Dm0644 applets/cosmic-applet-audio/data/icons/{{audio_id}}.svg {{iconsdir}}/{{audio_id}}.svg install -Dm0644 cosmic-applet-audio/data/icons/{{audio_id}}.svg {{iconsdir}}/{{audio_id}}.svg
install -Dm0644 applets/cosmic-applet-audio/data/{{audio_id}}.desktop {{sharedir}}/applications/{{audio_id}}.desktop install -Dm0644 cosmic-applet-audio/data/{{audio_id}}.desktop {{sharedir}}/applications/{{audio_id}}.desktop
install -Dm0755 applets/cosmic-applet-audio/target/release/cosmic-applet-audio {{bindir}}/cosmic-applet-audio install -Dm0755 cosmic-applet-audio/target/release/cosmic-applet-audio {{bindir}}/cosmic-applet-audio
# app list # app list
install -Dm0644 applets/cosmic-app-list/data/icons/{{app_list_id}}-symbolic.svg {{iconsdir}}/{{app_list_id}}-symbolic.svg install -Dm0644 cosmic-app-list/data/icons/{{app_list_id}}-symbolic.svg {{iconsdir}}/{{app_list_id}}-symbolic.svg
install -Dm0644 applets/cosmic-app-list/data/icons/{{app_list_id}}.Devel.svg {{iconsdir}}/{{app_list_id}}.Devel.svg install -Dm0644 cosmic-app-list/data/icons/{{app_list_id}}.Devel.svg {{iconsdir}}/{{app_list_id}}.Devel.svg
install -Dm0644 applets/cosmic-app-list/data/icons/{{app_list_id}}.svg {{iconsdir}}/{{app_list_id}}.svg install -Dm0644 cosmic-app-list/data/icons/{{app_list_id}}.svg {{iconsdir}}/{{app_list_id}}.svg
install -Dm0644 applets/cosmic-app-list/data/{{app_list_id}}.desktop {{sharedir}}/applications/{{app_list_id}}.desktop install -Dm0644 cosmic-app-list/data/{{app_list_id}}.desktop {{sharedir}}/applications/{{app_list_id}}.desktop
install -Dm0755 applets/cosmic-app-list/target/release/cosmic-app-list {{bindir}}/cosmic-app-list install -Dm0755 cosmic-app-list/target/release/cosmic-app-list {{bindir}}/cosmic-app-list
# network # network
install -Dm0644 applets/cosmic-applet-network/data/icons/{{network_id}}.svg {{iconsdir}}/{{network_id}}.svg install -Dm0644 cosmic-applet-network/data/icons/{{network_id}}.svg {{iconsdir}}/{{network_id}}.svg
install -Dm0644 applets/cosmic-applet-network/data/{{network_id}}.desktop {{sharedir}}/applications/{{network_id}}.desktop install -Dm0644 cosmic-applet-network/data/{{network_id}}.desktop {{sharedir}}/applications/{{network_id}}.desktop
install -Dm0755 applets/cosmic-applet-network/target/release/cosmic-applet-network {{bindir}}/cosmic-applet-network install -Dm0755 cosmic-applet-network/target/release/cosmic-applet-network {{bindir}}/cosmic-applet-network
# notifications # notifications
install -Dm0644 applets/cosmic-applet-notifications/data/icons/{{notifications_id}}.svg {{iconsdir}}/{{notifications_id}}.svg install -Dm0644 cosmic-applet-notifications/data/icons/{{notifications_id}}.svg {{iconsdir}}/{{notifications_id}}.svg
install -Dm0644 applets/cosmic-applet-notifications/data/{{notifications_id}}.desktop {{sharedir}}/applications/{{notifications_id}}.desktop install -Dm0644 cosmic-applet-notifications/data/{{notifications_id}}.desktop {{sharedir}}/applications/{{notifications_id}}.desktop
install -Dm04755 target/release/cosmic-applet-notifications {{bindir}}/cosmic-applet-notifications install -Dm0755 cosmic-applet-notifications/target/release/cosmic-applet-notifications {{bindir}}/cosmic-applet-notifications
# power # power
install -Dm0644 applets/cosmic-applet-power/data/icons/{{power_id}}.svg {{iconsdir}}/{{power_id}}.svg install -Dm0644 cosmic-applet-power/data/icons/{{power_id}}.svg {{iconsdir}}/{{power_id}}.svg
install -Dm0644 applets/cosmic-applet-power/data/{{power_id}}.desktop {{sharedir}}/applications/{{power_id}}.desktop install -Dm0644 cosmic-applet-power/data/{{power_id}}.desktop {{sharedir}}/applications/{{power_id}}.desktop
install -Dm0755 applets/cosmic-applet-power/target/release/cosmic-applet-power {{bindir}}/cosmic-applet-power install -Dm0755 cosmic-applet-power/target/release/cosmic-applet-power {{bindir}}/cosmic-applet-power
# status area
install -Dm0644 applets/cosmic-applet-status-area/data/icons/{{status_area_id}}.svg {{iconsdir}}/{{status_area_id}}.svg
install -Dm0644 applets/cosmic-applet-status-area/data/{{status_area_id}}.desktop {{sharedir}}/applications/{{status_area_id}}.desktop
install -Dm0755 target/release/cosmic-applet-status-area {{bindir}}/cosmic-applet-status-area
# time # time
install -Dm0644 applets/cosmic-applet-time/data/icons/{{time_id}}.svg {{iconsdir}}/{{time_id}}.svg install -Dm0644 cosmic-applet-time/data/icons/{{time_id}}.svg {{iconsdir}}/{{time_id}}.svg
install -Dm0644 applets/cosmic-applet-time/data/{{time_id}}.desktop {{sharedir}}/applications/{{time_id}}.desktop install -Dm0644 cosmic-applet-time/data/{{time_id}}.desktop {{sharedir}}/applications/{{time_id}}.desktop
install -Dm0755 applets/cosmic-applet-time/target/release/cosmic-applet-time {{bindir}}/cosmic-applet-time install -Dm0755 cosmic-applet-time/target/release/cosmic-applet-time {{bindir}}/cosmic-applet-time
# app library button # app library button
install -Dm0644 applets/cosmic-panel-app-button/data/icons/{{app_button_id}}.svg {{iconsdir}}/{{app_button_id}}.svg install -Dm0644 cosmic-panel-app-button/data/icons/{{app_button_id}}.svg {{iconsdir}}/{{app_button_id}}.svg
install -Dm0644 applets/cosmic-panel-app-button/data/{{app_button_id}}.desktop {{sharedir}}/applications/{{app_button_id}}.desktop install -Dm0644 cosmic-panel-app-button/data/{{app_button_id}}.desktop {{sharedir}}/applications/{{app_button_id}}.desktop
# workspaces button # workspaces button
install -Dm0644 applets/cosmic-panel-workspaces-button/data/icons/{{workspaces_button_id}}.svg {{iconsdir}}/{{workspaces_button_id}}.svg install -Dm0644 cosmic-panel-workspaces-button/data/icons/{{workspaces_button_id}}.svg {{iconsdir}}/{{workspaces_button_id}}.svg
install -Dm0644 applets/cosmic-panel-workspaces-button/data/{{workspaces_button_id}}.desktop {{sharedir}}/applications/{{workspaces_button_id}}.desktop install -Dm0644 cosmic-panel-workspaces-button/data/{{workspaces_button_id}}.desktop {{sharedir}}/applications/{{workspaces_button_id}}.desktop
# panel button
install -Dm0755 target/release/cosmic-panel-button {{bindir}}/cosmic-panel-button
# graphics # graphics
install -Dm0644 applets/cosmic-applet-graphics/data/icons/{{graphics_id}}.svg {{iconsdir}}/{{graphics_id}}.svg install -Dm0644 cosmic-applet-graphics/data/icons/{{graphics_id}}.svg {{iconsdir}}/{{graphics_id}}.svg
install -Dm0644 applets/cosmic-applet-graphics/data/{{graphics_id}}.desktop {{sharedir}}/applications/{{graphics_id}}.desktop install -Dm0644 cosmic-applet-graphics/data/{{graphics_id}}.desktop {{sharedir}}/applications/{{graphics_id}}.desktop
install -Dm0755 applets/cosmic-applet-graphics/target/release/cosmic-applet-graphics {{bindir}}/cosmic-applet-graphics install -Dm0755 cosmic-applet-graphics/target/release/cosmic-applet-graphics {{bindir}}/cosmic-applet-graphics
# workspaces # workspaces
install -Dm0644 applets/cosmic-applet-workspaces/data/icons/{{workspaces_id}}.svg {{iconsdir}}/{{workspaces_id}}.svg install -Dm0644 cosmic-applet-workspaces/data/icons/{{workspaces_id}}.svg {{iconsdir}}/{{workspaces_id}}.svg
install -Dm0644 applets/cosmic-applet-workspaces/data/{{workspaces_id}}.desktop {{sharedir}}/applications/{{workspaces_id}}.desktop install -Dm0644 cosmic-applet-workspaces/data/{{workspaces_id}}.desktop {{sharedir}}/applications/{{workspaces_id}}.desktop
install -Dm0755 applets/cosmic-applet-workspaces/target/release/cosmic-applet-workspaces {{bindir}}/cosmic-applet-workspaces install -Dm0755 cosmic-applet-workspaces/target/release/cosmic-applet-workspaces {{bindir}}/cosmic-applet-workspaces
# battery # battery
install -Dm0644 applets/cosmic-applet-battery/data/icons/{{battery_id}}.svg {{iconsdir}}/{{battery_id}}.svg install -Dm0644 cosmic-applet-battery/data/icons/{{battery_id}}.svg {{iconsdir}}/{{battery_id}}.svg
install -Dm0644 applets/cosmic-applet-battery/data/{{battery_id}}.desktop {{sharedir}}/applications/{{battery_id}}.desktop install -Dm0644 cosmic-applet-battery/data/{{battery_id}}.desktop {{sharedir}}/applications/{{battery_id}}.desktop
install -Dm0755 applets/cosmic-applet-battery/target/release/cosmic-applet-battery {{bindir}}/cosmic-applet-battery install -Dm0755 cosmic-applet-battery/target/release/cosmic-applet-battery {{bindir}}/cosmic-applet-battery
# Extracts vendored dependencies if vendor=1 # Extracts vendored dependencies if vendor=1
_extract_vendor: _extract_vendor:
#!/usr/bin/env sh #!/usr/bin/env sh
if test {{vendor}} = 1; then if test {{vendor}} = 1; then
rm -rf vendor; tar pxf vendor.tar rm -rf vendor; tar pxf vendor.tar
rm -rf applets/cosmic-applet-graphics/vendor; tar xf applets/cosmic-applet-graphics/vendor.tar --directory applets/cosmic-applet-graphics rm -rf cosmic-applet-graphics/vendor; tar xf cosmic-applet-graphics/vendor.tar --directory cosmic-applet-graphics
rm -rf applets/cosmic-applet-workspaces/vendor; tar xf applets/cosmic-applet-workspaces/vendor.tar --directory applets/cosmic-applet-workspaces rm -rf cosmic-applet-workspaces/vendor; tar xf cosmic-applet-workspaces/vendor.tar --directory cosmic-applet-workspaces
rm -rf applets/cosmic-applet-battery/vendor; tar xf applets/cosmic-applet-battery/vendor.tar --directory applets/cosmic-applet-battery rm -rf cosmic-applet-notifications/vendor; tar xf cosmic-applet-notifications/vendor.tar --directory cosmic-applet-notifications
rm -rf applets/cosmic-applet-audio/vendor; tar xf applets/cosmic-applet-audio/vendor.tar --directory applets/cosmic-applet-audio rm -rf cosmic-applet-battery/vendor; tar xf cosmic-applet-battery/vendor.tar --directory cosmic-applet-battery
rm -rf applets/cosmic-applet-power/vendor; tar xf applets/cosmic-applet-power/vendor.tar --directory applets/cosmic-applet-power rm -rf cosmic-applet-audio/vendor; tar xf cosmic-applet-audio/vendor.tar --directory cosmic-applet-audio
rm -rf applets/cosmic-applet-time/vendor; tar xf applets/cosmic-applet-time/vendor.tar --directory applets/cosmic-applet-time rm -rf cosmic-applet-power/vendor; tar xf cosmic-applet-power/vendor.tar --directory cosmic-applet-power
rm -rf applets/cosmic-applet-network/vendor; tar xf applets/cosmic-applet-network/vendor.tar --directory applets/cosmic-applet-network rm -rf cosmic-applet-time/vendor; tar xf cosmic-applet-time/vendor.tar --directory cosmic-applet-time
rm -rf applets/cosmic-app-list/vendor; tar xf applets/cosmic-app-list/vendor.tar --directory applets/cosmic-app-list rm -rf cosmic-applet-network/vendor; tar xf cosmic-applet-network/vendor.tar --directory cosmic-applet-network
rm -rf cosmic-app-list/vendor; tar xf cosmic-app-list/vendor.tar --directory cosmic-app-list
fi fi

1
rust-toolchain
View file

@ -1 +0,0 @@
1.65