Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.05] davinci-resolve: fix desktop item, fix mainProgram for studio variant #342620

Merged
merged 4 commits into from
Sep 17, 2024

Conversation

github-actions[bot]
Copy link
Contributor

Bot-based backport to release-24.05, triggered by a label in #278164.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

- The exec was wrong—perhaps correct once-upon-a-time, but no more
- Differentiate for studio version

(cherry picked from commit e3bb70e)
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/davinci-resolve-does-not-show-up-in-applications-of-the-de/52298/2

@winterqt winterqt force-pushed the backport-278164-to-release-24.05 branch from b83cebf to fc7774c Compare September 17, 2024 20:31
@winterqt
Copy link
Member

Force pushed last commit (checkout && git commit --amend --no-edit) to force GHA jobs to run, as they weren't triggering before.

@Atemu
Copy link
Member

Atemu commented Sep 17, 2024

(FYI: IME it usually just takes a moment longer to trigger but it does eventually happen.)

Copy link
Member

@amarshall amarshall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Built studio and verified the desktop file exists in the output.

@winterqt
Copy link
Member

winterqt commented Sep 17, 2024

@amarshall Just to confirm, did it have the (correct) icon path? Never mind, I guess your statement implies it's correct.

@amarshall
Copy link
Member

Yea looks good to me

$ cat ./result/share/applications/davinci-resolve-studio.desktop
[Desktop Entry]
Categories=AudioVideo;AudioVideoEditing;Video;Graphics
Comment=Professional video editing, color, effects and audio post-processing
Exec=davinci-resolve-studio
GenericName=Video Editor
Icon=davinci-resolve-studio
Name=Davinci Resolve Studio
Type=Application
Version=1.4

$ find ./result/share/icons                                     
./result/share/icons
./result/share/icons/hicolor
./result/share/icons/hicolor/128x128
./result/share/icons/hicolor/128x128/apps
./result/share/icons/hicolor/128x128/apps/davinci-resolve-studio.png

@winterqt
Copy link
Member

Thanks! (I would have tested myself, but don't have easy access to an x86_64-linux machine at this moment.)

Waiting on OfBorg, then landing.

@ofborg ofborg bot requested a review from amarshall September 17, 2024 21:54
@winterqt winterqt merged commit 600c503 into release-24.05 Sep 17, 2024
25 of 27 checks passed
@winterqt winterqt deleted the backport-278164-to-release-24.05 branch September 17, 2024 22:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants