-
Notifications
You must be signed in to change notification settings - Fork 21
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
Apply Fix for Qt running in Snap Packages #214
Merged
spham-amzn
merged 3 commits into
o3de:main
from
aws-lumberyard-dev:spham_amzn/fix_qt_qdesktop_services_local_text_from_snap
Sep 19, 2023
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| diff --git a/qtbase/src/platformsupport/services/genericunix/qgenericunixservices.cpp b/qtbase/src/platformsupport/services/genericunix/qgenericunixservices.cpp | ||
| index b583d636c0..4615ebb126 100644 | ||
| --- a/qtbase/src/platformsupport/services/genericunix/qgenericunixservices.cpp | ||
| +++ b/qtbase/src/platformsupport/services/genericunix/qgenericunixservices.cpp | ||
| @@ -203,8 +203,7 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url) | ||
| // handle_token (s) - A string that will be used as the last element of the @handle. | ||
| // writable (b) - Whether to allow the chosen application to write to the file. | ||
|
|
||
| -#ifdef O_PATH | ||
| - const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_PATH); | ||
| + const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_RDONLY); | ||
| if (fd != -1) { | ||
| QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"), | ||
| QLatin1String("/org/freedesktop/portal/desktop"), | ||
| @@ -219,9 +218,6 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url) | ||
|
|
||
| return QDBusConnection::sessionBus().call(message); | ||
| } | ||
| -#else | ||
| - Q_UNUSED(url) | ||
| -#endif | ||
|
|
||
| return QDBusMessage::createError(QDBusError::InternalError, qt_error_string()); | ||
| } | ||
|
|
||
| diff --git a/qtimageformats/src/imageformats/configure.json b/qtimageformats/src/imageformats/configure.json | ||
| index 5b876c3..f2fa1cc 100644 | ||
| --- a/qtimageformats/src/imageformats/configure.json | ||
| +++ b/qtimageformats/src/imageformats/configure.json | ||
| @@ -85,7 +85,7 @@ | ||
| }, | ||
| "sources": [ | ||
| { "type": "pkgConfig", "args": "libtiff-4" }, | ||
| - { "libs": "-ltiff" } | ||
| + { "libs": "-ltiff -lz" } | ||
| ] | ||
| }, | ||
| "webp": { |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
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.?
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.
Not without more changes to
pull_and_build_from_git. These packages are defined using thedepends_on_packagesattribute 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.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.
That sounds good to me.
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.
GHI: #217