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

Jump to bottom

Apply Fix for Qt running in Snap Packages #214

Merged
merged 3 commits into from
Sep 19, 2023
Merged

Apply Fix for Qt running in Snap Packages #214

merged 3 commits into from
Sep 19, 2023

Conversation

spham-amzn
Copy link
Contributor

Summary
This fixes a QT bug when running the Project Manager from a Linux Snap package.

  • Applying a patch similar to the fix onto the o3de fork of Qt when building from source.
  • Fixing build config to conform to how the custom *scripts are evaluated
  • Updating and applying a previous update to link against the static version of OpenSSL from O3DE's 3P repository as well.
  • Update the linux revision numbers for the new fixed version

Build Logs
qt_build_linux_rev9_x86_64.log

qt_build_linux_rev9_aarch64.log

Fixes o3de/o3de#16697

@spham-amzn
- Apply fix for QDesktopServices/linux to fix issue with Snap confine…
43c9e17 
…ments (https://bugs.launchpad.net/ubuntu/+source/qtbase-opensource-src/+bug/1876237)

- Remove openssl dependency since its no longer used
- Minor script fixes
- Update rev numbers for Linux (and aarch64)
- Fix the 'custom_install_cmd' for Qt to reflect updates on how custom scripts are interpreted in the build config files

Signed-off-by: Steve Pham <[email protected]>
@spham-amzn
Add 3P OpenSSL dependency to Qt (to use O3DE static openssl instead o…
5f3d904 
…f the system one)

Signed-off-by: Steve Pham <[email protected]>
@spham-amzn
Add qt patch for mac
4e2a314 
Signed-off-by: Steve Pham <[email protected]>
cgalvan
cgalvan approved these changes Sep 14, 2023
View reviewed changes
Copy link
Contributor

@cgalvan cgalvan left a comment

Choose a reason for hiding this comment

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

This works. Alternatively, we could just commit patches to our Qt fork which is why we originally created the forks (we had too many patches to keep track of).

@spham-amzn
Copy link
Contributor Author

spham-amzn commented Sep 14, 2023 •
edited
Loading

This works. Alternatively, we could just commit patches to our Qt fork which is why we originally created the forks (we had too many patches to keep track of).

Thats a good point, i created a GHI for that

@spham-amzn spham-amzn mentioned this pull request Sep 14, 2023
Open
@cgalvan
Copy link
Contributor

cgalvan commented Sep 14, 2023

This works. Alternatively, we could just commit patches to our Qt fork which is why we originally created the forks (we had too many patches to keep track of).

Thats a good point, i created a GHI for that

Cool, thank you!

lemonade-dm
lemonade-dm reviewed Sep 14, 2023
View reviewed changes
package-system/Qt/build-linux-x86.sh
@@ -11,7 +11,8 @@

TIFF_PACKAGE=tiff-4.2.0.15-rev3-linux
ZLIB_PACKAGE=zlib-1.2.11-rev5-linux
OPENSSL_PACKAGE=OpenSSL-1.1.1t-rev1-linux
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a way that we can get these set as environment variables using the build_config.json, so that we don't have the package revision in scripts.?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not without more changes to pull_and_build_from_git. These packages are defined using the depends_on_packages attribute in the build_config.json, which would require the addition of an additional 'KEY' field, and then all projects will need to update using this key. I don't mind doing this, but i want to reduce the scope of this change to focus on the Qt fix. I can create another PR to support this and update all the current projects in the future.

Copy link
Contributor

Choose a reason for hiding this comment

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

That sounds good to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

GHI: #217

@spham-amzn spham-amzn mentioned this pull request Sep 14, 2023
Merged
@spham-amzn spham-amzn merged commit f2df42b into o3de:main Sep 19, 2023
@lemonade-dm lemonade-dm deleted the spham_amzn/fix_qt_qdesktop_services_local_text_from_snap branch September 19, 2023 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lemonade-dm lemonade-dm lemonade-dm approved these changes

@cgalvan cgalvan cgalvan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Linux: Project Manager (o3de) running from a Snap install does not open any log file
3 participants
@spham-amzn @cgalvan @lemonade-dm