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

adding jamulus-server.desktop.in and new icons #1672

Merged
merged 6 commits into from May 13, 2021

Conversation

jujudusud
Copy link
Member

In order to be in line with the comments made on #1605 , proposing this new pull request.
Fixes #1316

Copy link
Member

@softins softins left a comment

Choose a reason for hiding this comment

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

I'm happy to add these for future use by packagers.

Do the files jamulus.desktop and jamulus.desktop.in also need attention? They are the same except for the Exec line, for which the latter has Exec=$$TARGET

@jujudusud
Copy link
Member Author

jujudusud commented May 11, 2021

You're right @softins ! Adding $$TARGET instead of Jamulus is the right way to do.
jamulus.desktop is generated when creating deb package I think.

Copy link
Member

@hoffie hoffie left a comment

Choose a reason for hiding this comment

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

I think two further things should be done:

  • The image files should probably be added to DISTFILES in Jamulus.pro, similar to jamulus.png
  • jamulus-server.desktop.in should probably be added to DISTFILES and QMAKE_SUBSTITUES. The resulting jamulus-server.desktop should probably be added to dekstop.files in Jamulus.pro

(Note: I don't know specifics either, I'm just looking for similarities and what seems to be needed to make this useful)

distributions/jamulus-server.desktop.in Show resolved Hide resolved
@gilgongo gilgongo added this to the Release 3.8.0 milestone May 12, 2021
@gilgongo gilgongo added this to Triage in Tracking (old) via automation May 12, 2021
@gilgongo gilgongo moved this from Triage to Waiting on Team in Tracking (old) May 12, 2021
@jujudusud jujudusud requested a review from hoffie May 12, 2021 23:29
Copy link
Member

@hoffie hoffie left a comment

Choose a reason for hiding this comment

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

Thanks! This looks good to me.

Two (hopefully last) nits:

  • After building this PR, the generated jamulus-server.desktop file looks good, but I think it should also be added to .gitignore similar to jamulus.desktop? (I think someone else -- @softins? -- had already pointed that out)
  • One stray space, see inline comment

Jamulus.pro Outdated Show resolved Hide resolved
@hoffie hoffie moved this from Waiting on Team to Waiting Externally in Tracking (old) May 13, 2021
@jujudusud
Copy link
Member Author

*it should also be added to .gitignore similar to jamulus.desktop?

Done by 48e837d

@jujudusud jujudusud closed this May 13, 2021
Tracking (old) automation moved this from Waiting Externally to Done May 13, 2021
@jujudusud jujudusud reopened this May 13, 2021
Tracking (old) automation moved this from Done to In Progress May 13, 2021
@jujudusud jujudusud requested a review from hoffie May 13, 2021 19:12
Copy link
Member

@hoffie hoffie left a comment

Choose a reason for hiding this comment

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

Looks good to me. Sorry for the forth-and-back, I was unsure myself what other parts needed to be touched, but I think this lead to a good state now.

I'll defer merging for some days in case anyone else wants to have another look (@softins's review was about an earlier state, for example). Besides that, this is ready to go into 3.8.0, I think.

Thanks!

Copy link
Member

@softins softins left a comment

Choose a reason for hiding this comment

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

Looks good to me now. Thanks!

@hoffie hoffie merged commit 90e8046 into jamulussoftware:master May 13, 2021
Tracking (old) automation moved this from In Progress to Done May 13, 2021
@jujudusud
Copy link
Member Author

Thanks !

@jujudusud jujudusud deleted the desktop-server-in branch May 13, 2021 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Install the .desktop file and icon for Jamulus Server (optionally or not)
4 participants