Skip to content

Build: Include jamulus-server.desktop in Debian/Ubuntu builds and fix Linux SVG icon installation location #2460

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.

Sign up for GitHub

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

Merged
ann0see merged 2 commits into from
Mar 5, 2022
Merged

Build: Include jamulus-server.desktop in Debian/Ubuntu builds and fix Linux SVG icon installation location #2460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f04ac53
Jamulus.pro: Install .svg icons to proper directory
hoffie Mar 4, 2022
f2d2841
Build: Include jamulus-server.desktop in Debian builds
hoffie Mar 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Jamulus.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,14 @@ win32 {
}
ICONSDIR = $$absolute_path($$ICONSDIR, $$PREFIX)
icons.path = $$ICONSDIR
icons.files = distributions/jamulus.png distributions/jamulus.svg distributions/jamulus-server.svg
icons.files = distributions/jamulus.png

isEmpty(ICONSDIR_SVG) {
ICONSDIR_SVG = share/icons/hicolor/scalable/apps/
}
Comment on lines +415 to +417
Copy link
Copy Markdown
Member Author

@hoffie hoffie Mar 4, 2022

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. :)

ICONSDIR_SVG = $$absolute_path($$ICONSDIR_SVG, $$PREFIX)
icons_svg.path = $$ICONSDIR_SVG
icons_svg.files = distributions/jamulus.svg distributions/jamulus-server.svg

isEmpty(MANDIR) {
MANDIR = share/man/man1
Expand All @@ -419,7 +426,7 @@ win32 {
man.path = $$MANDIR
man.files = distributions/Jamulus.1

INSTALLS += target desktop icons man
INSTALLS += target desktop icons icons_svg man
}
}

Expand Down
3 changes: 3 additions & 0 deletions distributions/debian/jamulus.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
usr/bin/jamulus
usr/share/applications/jamulus.desktop
usr/share/applications/jamulus-server.desktop
Copy link
Copy Markdown
Member

@ann0see ann0see Mar 4, 2022 •
edited
Loading

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

Copy link
Copy Markdown
Member Author

@hoffie hoffie Mar 4, 2022 •
edited
Loading

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

Copy link
Copy Markdown
Member

@ann0see ann0see Mar 4, 2022

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.

Copy link
Copy Markdown
Member Author

@hoffie hoffie Mar 4, 2022

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?

usr/share/icons/hicolor/512x512/apps/jamulus.png
usr/share/icons/hicolor/scalable/apps/jamulus.svg
usr/share/icons/hicolor/scalable/apps/jamulus-server.svg