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
Build: Include jamulus-server.desktop in Debian/Ubuntu builds and fix Linux SVG icon installation location #2460
Build: Include jamulus-server.desktop in Debian/Ubuntu builds and fix Linux SVG icon installation location #2460
Conversation
@@ -1,3 +1,4 @@ | |||
usr/bin/jamulus | |||
usr/share/applications/jamulus.desktop | |||
usr/share/applications/jamulus-server.desktop |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately it doesn't show the server icon for me. Probably the icon is not set correctly?
Edit: Yes. It's not even in the data file of the .deb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's no .png in the tree, I'll check whether the .svgs can be used.
Edit: /usr/share/pixmaps seems to work.
https://specifications.freedesktop.org/icon-theme-spec/latest/ar01s07.html
installing a svg icon in $prefix/share/icons/hicolor/scalable/apps means most desktops will have one icon that works for all sizes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yes. .svg's would be even better.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The .svgs were already installed by the Makefile
, but to the wrong location (IMO). I've fixed that as well and adjusted the debian .install
file. Can you test again once the build is done?
a650515
to
f2d2841
Compare
isEmpty(ICONSDIR_SVG) { | ||
ICONSDIR_SVG = share/icons/hicolor/scalable/apps/ | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've no idea why we are checking ICONSDIR
(and others) for emptiness. Those variables do not seem magical (i.e. they are not pre-set by qmake, as far as I can see). Therefore the intention was probably to make them overridable. Anyway, I'm following this path and I'm using the same pattern (probably same reasoning what @atsampson did in 69e3286 when first adding it for ICONSDIR
).
Fear of breakage is what prevents me from removing that. :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok. Works now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Based on @ann0see's OK.
Both combined should the effect of having a working Jamulus Server desktop icon in the .deb package.
Short description of changes
CHANGELOG: Linux: Added the Jamulus Server desktop icon to the Debian/Ubuntu build and fixed SVG icon installation location.
Context: Fixes an issue?
Related: #2451 (comment)
Fixes: #1879
Does this change need documentation? What needs to be documented and how?
No.
Status of this Pull Request
Ready, resulting .deb has been checked if the file is there -- it is. I can't test the UI (icon rendering) myself though.
What is missing until this pull request can be merged?
Ready.
Checklist