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.

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

Fix #739 - Issues with Ubuntu 24.04: unmet apt dependencies, icon not showing #740

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Fix #739 - Issues with Ubuntu 24.04: unmet apt dependencies, icon not showing #740

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
a2999af
Ubuntu 24.04: set available libwxgtk3
jmarrec Sep 4, 2024
9eed191
Try to fixup Icon on Ubuntu 24.04 by adding StartupWMClass and move t…
jmarrec Sep 4, 2024
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
10 changes: 5 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ elseif(UNIX)
# set(CPACK_DEBIAN_PACKAGE_DEBUG ON)

# Focal Fossa (20.04) uses libwxgtk3.0-gtk3-0v5, apparently need libxcb-xinerama0 as well
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libxcb-xinerama0 (>= 1.13), libwxgtk3.0-0v5 (>= 3.0.0) | libwxgtk3.0-0 (>=3.0.0) | libwxgtk3.0-gtk3-0v5 (>=3.0.0), libxcb-cursor0")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libxcb-xinerama0 (>= 1.13), libwxgtk3.0-0v5 (>= 3.0.0) | libwxgtk3.0-0 (>=3.0.0) | libwxgtk3.0-gtk3-0v5 (>=3.0.0) | libwxgtk3.2-1t64 (>= 3.2.0), libxcb-cursor0")
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Add dep alternative for libwxgtk3 for 24.04


# These two will set the .deb install path correctly
set(CPACK_SET_DESTDIR ON)
Expand Down Expand Up @@ -887,12 +887,12 @@ elseif(UNIX)
# Create a proper App with file associations

# Install the .desktop manifest (allows the App to be seen in the Dash and adding to the dock, and to map it a mimetype)
# install(FILES "${PROJECT_SOURCE_DIR}/src/openstudio_app/openstudioapp.desktop" DESTINATION /usr/share/applications)
install(FILES "${PROJECT_SOURCE_DIR}/src/openstudio_app/openstudioapp.desktop" DESTINATION Temp/)
# install(FILES "${PROJECT_SOURCE_DIR}/debian/openstudioapp.desktop" DESTINATION /usr/share/applications)
install(FILES "${PROJECT_SOURCE_DIR}/debian/openstudioapp.desktop" DESTINATION Temp/)

# Install the XML mime info
# install(FILES "${PROJECT_SOURCE_DIR}/src/openstudio_app/x-openstudio.xml" DESTINATION /usr/share/mime/application)
install(FILES "${PROJECT_SOURCE_DIR}/src/openstudio_app/x-openstudio.xml" DESTINATION Temp/)
# install(FILES "${PROJECT_SOURCE_DIR}/debian/x-openstudio.xml" DESTINATION /usr/share/mime/application)
install(FILES "${PROJECT_SOURCE_DIR}/debian/x-openstudio.xml" DESTINATION Temp/)

set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CPACK_DEBIAN_BIN_PACKAGE_CONTROL_EXTRA};${POSTINST_FILE};${POSTRM_FILE}")

Expand Down
2 changes: 1 addition & 1 deletion src/openstudio_app/openstudioapp.desktop → debian/openstudioapp.desktop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Icon=openstudioapp
Terminal=false
Categories=Utility;X-OpenStudio;X-EnergyModeling;
MimeType=application/x-openstudio;

StartupWMClass=OpenStudioApp
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think that's what's missing for 24.04, but not sure.

I tested that it still works on 20.04 with it though

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

https://askubuntu.com/questions/1516383/missing-icons-in-dock-after-upgrade-to-ubuntu-24-04

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

xprop WM_CLASS

0 src/openstudio_app/x-openstudio.xml → debian/x-openstudio.xml
View file
Open in desktop
File renamed without changes.
Loading