diff --git a/dank-qml-common b/dank-qml-common index 5942bc1c6..4fa313766 160000 --- a/dank-qml-common +++ b/dank-qml-common @@ -1 +1 @@ -Subproject commit 5942bc1c60b4538940922b58112c8ae125880891 +Subproject commit 4fa313766ab5cd2766be0f87a163305ca9af6faf diff --git a/distro/fedora/dms-git.spec b/distro/fedora/dms-git.spec index 841747303..32a514cf6 100644 --- a/distro/fedora/dms-git.spec +++ b/distro/fedora/dms-git.spec @@ -17,6 +17,8 @@ VCS: {{{ git_repo_vcs }}} Source0: {{{ git_repo_pack }}} Source1: https://go.dev/dl/go%{go_toolchain_version}.linux-amd64.tar.gz Source2: https://go.dev/dl/go%{go_toolchain_version}.linux-arm64.tar.gz +# git_repo_pack archives skip submodule content, so pack dank-qml-common separately +Source3: {{{ git_pack path=$GIT_ROOT/dank-qml-common dir_name=dank-qml-common source_name=dank-qml-common.tar.gz }}} BuildRequires: git-core BuildRequires: gzip @@ -61,6 +63,9 @@ Provides native DBus bindings, NetworkManager integration, and system utilities. %prep {{{ git_repo_setup_macro }}} +rm -rf dank-qml-common +tar -xzf %{SOURCE3} +test -e quickshell/DankCommon/Widgets/DankIcon.qml || { echo "DankCommon missing after submodule unpack"; exit 1; } %build # Build DMS CLI from source (core/subdirectory) @@ -127,7 +132,7 @@ install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalabl # Install shell files to shared data location install -dm755 %{buildroot}%{_datadir}/quickshell/dms -cp -r quickshell/* %{buildroot}%{_datadir}/quickshell/dms/ +cp -rL quickshell/* %{buildroot}%{_datadir}/quickshell/dms/ # Remove build files rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git* diff --git a/flake.lock b/flake.lock index 6cfed07d2..881cf23af 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "dank-qml-common": { "flake": false, "locked": { - "lastModified": 1784332064, + "lastModified": 1784386873, "narHash": "sha256-n0LKLirPnNSXYxElK1IpnybEwU0nnyso4kpsEFX88U0=", "owner": "AvengeMedia", "repo": "dank-qml-common", - "rev": "5942bc1c60b4538940922b58112c8ae125880891", + "rev": "4fa313766ab5cd2766be0f87a163305ca9af6faf", "type": "github" }, "original": {