Update libglnx subtree to 2024-04-20 #1
Draft
Conversation
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
Signed-off-by: Simon McVittie <[email protected]>
flatpak-builder does this. Signed-off-by: Simon McVittie <[email protected]>
Recent versions of openSUSE default to using -Werror=return-type for package builds, which results in all of these function checks incorrectly detecting the function as not being available. Co-authored-by: Peng Yi Resolves: https://gitlab.gnome.org/GNOME/libglnx/-/issues/4 Signed-off-by: Simon McVittie <[email protected]>
backports: Avoid warnings for g_steal_fd when targeting older GLib See merge request GNOME/libglnx!56
backports: Add a fallback definition for G_PID_FORMAT See merge request GNOME/libglnx!55
build: Fix function detection when using -Werror=return-type Closes flatpak#4 See merge request GNOME/libglnx!57
This will allow it to be re-added as a `git subtree`, which stores commit history inline in the flatpak git repository. Signed-off-by: Simon McVittie <[email protected]>
…39841d1210b' This makes the flatpak project more self-contained, and would have avoided the problems we encountered with unintended changes in the 1.14.7 release. See <https://diziet.dreamwidth.org/14666.html> for an opinionated description of some of the problems with submodules. If we can eliminate submodules altogether, then it will become possible to build Flatpak from a simple `git clone` or `git archive`, or from the source tarballs auto-generated by Github (which are equivalent to a `git archive`), without needing an extra step to populate the submodules. As well as reducing the support burden from users periodically complaining that our source releases are incomplete, this is a useful "nothing up my sleeve" mechanism to make it easy to verify that our source releases do not contain malicious changes hidden in vendored or generated files, like the one that made CVE-2024-3094 possible. Added with: git remote add --no-tags libglnx https://gitlab.gnome.org/GNOME/libglnx.git git fetch libglnx git subtree add -P subprojects/libglnx 202b294 To compare with upstream: git remote add --no-tags libglnx https://gitlab.gnome.org/GNOME/libglnx.git git fetch libglnx git diff HEAD:subprojects/libglnx libglnx/master After checking the diff, updates can be merged into this project with: git subtree merge -P subprojects/libglnx libglnx/master The commit merged here is the same one that was previously a submodule. A subsequent commit will update it to the latest version of libglnx, demonstrating how to review such updates. git-subtree-dir: subprojects/libglnx git-subtree-mainline: 7df25d6 git-subtree-split: 202b294
* Fix function detection when using -Werror=return-type
(Resolves: flatpak#5778)
* Add a fallback definition for G_PID_FORMAT
* Avoid warnings for g_steal_fd() when targeting older GLib
This commit was created via:
git remote add --no-tags libglnx https://gitlab.gnome.org/GNOME/libglnx.git
git fetch libglnx
git diff HEAD:subprojects/libglnx libglnx/master
git subtree merge -P subprojects/libglnx libglnx/master
git commit --amend -s
Signed-off-by: Simon McVittie <[email protected]>
This was referenced May 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge libglnx commit 'b38235ac2d8f1a7b1b8b9960a109eb734b8ec4dd'
(Resolves: [Bug]: 1.15.7 pre-release subproject libglnx build failure in opensuse rpmbuild environment using meson due to flaw in feature detection code flatpak/flatpak#5778)
This commit was created via:
Normally this would be a pull request against
flatpak/flatpakbranchmain, but I've generated this one againstsmcv/flatpakbranchlibglnx-into-subtreeto illustrate what a subtree update would normally look like to reviewers.