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

Install jamulus.desktop #331

Merged
merged 1 commit into from
Jun 5, 2020
Merged

Conversation

atsampson
Copy link
Contributor

As suggested in #223.

Because jamulus.desktop assumes the binary is called jamulus, and qmake doesn't have a mechanism for string expansion, only install the file so if noupcasename is set.

Because this assumes the binary is called jamulus, and qmake doesn't
have a mechanism for string expansion, only do so if noupcasename is
set.
@corrados corrados merged commit c780d82 into jamulussoftware:master Jun 5, 2020
Copy link

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Thanks for tackling this.

@seb314 could you please test this?

APPSDIR = $$absolute_path($$APPSDIR, $$PREFIX)
desktop.path = $$APPSDIR
desktop.files = distributions/jamulus.desktop
# the .desktop file assumes the binary is called jamulus
Copy link

Choose a reason for hiding this comment

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

It should be possible to rename the desktop file end with .in, put $$TARGET in the Exec file and then use QMAKE_SUBSTITUTES += distributions/jamulus.desktop.in.

See https://martin.rpdev.net/2017/05/10/creating-config-header-files-using-qmake.html or https://github.com/detrout/debian-signon-ui/blob/c03c68965f92285d3d5341b45414473081ed5c1b/src/signon-ui.pro#L105-L109.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahh! That is... extremely well hidden in the qmake documentation.

# the .desktop file assumes the binary is called jamulus
contains(CONFIG, "noupcasename") {
INSTALLS += desktop
}
}
Copy link

Choose a reason for hiding this comment

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

We probably also need to install the icon, see #247 (comment).

@seb314
Copy link
Contributor

seb314 commented Jun 5, 2020

@seb314 could you please test this?

seems to work!
more specifically: when using this patch with the nix jamulus package, Jamulus is found in i3 or gnome3 like other apps via the .desktop file (without icon though)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants