diff --git a/scripts/package/package.sh b/scripts/package/package.sh index df37f02..096841e 100755 --- a/scripts/package/package.sh +++ b/scripts/package/package.sh @@ -11,6 +11,7 @@ chmod 755 bin/lsfg-vk-ui chmod 755 lib/liblsfg-vk.so chmod 644 share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json chmod 644 ui/rsc/gay.pancake.lsfg-vk-ui.desktop +chmod 644 ui/rsc/icon.png # build alpm package echo "Building ALPM package..." @@ -18,11 +19,12 @@ echo "Building ALPM package..." mkdir -pv alpm envsubst < scripts/package/alpm.PKGINFO > alpm/.PKGINFO -mkdir -pv alpm/usr/{bin,lib,share/vulkan/implicit_layer.d,share/applications} +mkdir -pv alpm/usr/{bin,lib,share/vulkan/implicit_layer.d,share/applications,share/icons/hicolor/256x256/apps} cp -v bin/lsfg-vk-ui alpm/usr/bin/lsfg-vk-ui cp -v lib/liblsfg-vk.so alpm/usr/lib/liblsfg-vk.so cp -v share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json alpm/usr/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.jsonc cp -v ui/rsc/gay.pancake.lsfg-vk-ui.desktop alpm/usr/share/applications/lsfg-vk-ui.desktop +cp -v ui/rsc/icon.png alpm/usr/share/icons/hicolor/256x256/apps/gay.pancake.lsfg-vk-ui.png tar -cvzf "lsfg-vk-$VERSION.x86_64.tar.zst" -C alpm \ .PKGINFO usr @@ -33,11 +35,12 @@ echo "Building DEB package..." mkdir -pv deb/DEBIAN envsubst < scripts/package/dpkg.control > deb/DEBIAN/control -mkdir -pv deb/usr/{bin,lib,share/vulkan/implicit_layer.d,share/applications} +mkdir -pv deb/usr/{bin,lib,share/vulkan/implicit_layer.d,share/applications,share/icons/hicolor/256x256/apps} cp -v bin/lsfg-vk-ui deb/usr/bin/lsfg-vk-ui cp -v lib/liblsfg-vk.so deb/usr/lib/liblsfg-vk.so cp -v share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json deb/usr/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json cp -v ui/rsc/gay.pancake.lsfg-vk-ui.desktop deb/usr/share/applications/lsfg-vk-ui.desktop +cp -v ui/rsc/icon.png deb/usr/share/icons/hicolor/256x256/apps/gay.pancake.lsfg-vk-ui.png dpkg-deb --root-owner-group --build deb "lsfg-vk-$VERSION.x86_64.deb" @@ -52,6 +55,7 @@ cp -v bin/lsfg-vk-ui rpm/SOURCES cp -v lib/liblsfg-vk.so rpm/SOURCES cp -v share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json rpm/SOURCES cp -v ui/rsc/gay.pancake.lsfg-vk-ui.desktop rpm/SOURCES/lsfg-vk-ui.desktop +cp -v ui/rsc/icon.png rpm/SOURCES/gay.pancake.lsfg-vk-ui.png rpmbuild -bb rpm/lsfg-vk.spec --define "_topdir $(pwd)/rpm" mv -v "rpm/RPMS/x86_64/lsfg-vk-$VERSION-1.x86_64.rpm" "lsfg-vk-$VERSION.x86_64.rpm" diff --git a/scripts/package/rpm.spec b/scripts/package/rpm.spec index 0b944ad..859c7d4 100644 --- a/scripts/package/rpm.spec +++ b/scripts/package/rpm.spec @@ -23,9 +23,11 @@ install -Dm755 %{_sourcedir}/lsfg-vk-ui %{buildroot}%{_bindir}/lsfg-vk-ui install -Dm755 %{_sourcedir}/liblsfg-vk.so %{buildroot}%{_libdir}/liblsfg-vk.so install -Dm644 %{_sourcedir}/VkLayer_LS_frame_generation.json %{buildroot}%{_datadir}/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json install -Dm644 %{_sourcedir}/lsfg-vk-ui.desktop %{buildroot}%{_datadir}/applications/lsfg-vk-ui.desktop +install -Dm644 %{_sourcedir}/gay.pancake.lsfg-vk-ui.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/gay.pancake.lsfg-vk-ui.png %files %{_bindir}/lsfg-vk-ui %{_libdir}/liblsfg-vk.so %{_datadir}/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json %{_datadir}/applications/lsfg-vk-ui.desktop +%{_datadir}/icons/hicolor/256x256/apps/gay.pancake.lsfg-vk-ui.png diff --git a/ui/Cargo.lock b/ui/Cargo.lock index 653ad82..4696f79 100644 --- a/ui/Cargo.lock +++ b/ui/Cargo.lock @@ -682,7 +682,7 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "lsfg-vk-ui" -version = "0.0.1" +version = "0.9.0" dependencies = [ "anyhow", "glib-build-tools", diff --git a/ui/rsc/gay.pancake.lsfg-vk-ui.desktop b/ui/rsc/gay.pancake.lsfg-vk-ui.desktop index e4ad22b..5b7ada2 100644 --- a/ui/rsc/gay.pancake.lsfg-vk-ui.desktop +++ b/ui/rsc/gay.pancake.lsfg-vk-ui.desktop @@ -9,5 +9,5 @@ Terminal=false Categories=GTK;Settings; Keywords=gaming;graphics;configuration; StartupNotify=true -StartupWMClass=gay.pancake.lsfg-vk-ui.ConfigurationUi +StartupWMClass=gay.pancake.lsfg-vk-ui MimeType=application/x-lsfg-profile; diff --git a/ui/src/main.rs b/ui/src/main.rs index 5e28a30..d89c919 100644 --- a/ui/src/main.rs +++ b/ui/src/main.rs @@ -8,7 +8,7 @@ mod wrapper; mod config; mod utils; -const APP_ID: &str = "gay.pancake.lsfg-vk.ConfigurationUi"; +const APP_ID: &str = "gay.pancake.lsfg-vk"; #[derive(Debug)] struct State {