[gnome-3.38] libhandy fixes #99498
Closed
[gnome-3.38] libhandy fixes #99498
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
Not an official release yet, but this is needed for gnome 3.38.
Use xmllint in docs generation. Remove an old patch. Remove an old postPatch workaround.
* adapt for the move under the gnome project The gnome team now maintains this * format * cleanup meson flags The auto features are enabled automatically https://gitlab.gnome.org/GNOME/libhandy/-/tags/v0.80.0 https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.81.0 https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.82.0 https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.83.0 https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.84.0 https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.85.0 https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.90.0 https://gitlab.gnome.org/GNOME/libhandy/-/tags/0.91.0 https://gitlab.gnome.org/GNOME/libhandy/-/tags/1.0.0
* updateScript * use rust vendor (there's actually no isuse with doing that) * add libhandy
* format Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
The dropped patch is now included in the upstream release. https://gitlab.gnome.org/GNOME/cogl/-/blob/1.22.8/NEWS
* regenerate fix-paths.patch * set systemd_session to default https://gitlab.gnome.org/GNOME/gnome-session/-/blob/3.38.0/NEWS
* add libhandy * cleanup
Add appstream-glib to native build inputs, for appstream-util. Add patch for inkscape 1.0 CLI arguments. Silence an inkscape warning regarding profile directory.
Add libXres to buildInputs.
Add patch to set gnome panel's modules dir, during configurePhase.
Use tracker-2 and libhandy_0. Add appstream-glib for appstream-util.
Meld’s post install script requires gtk-update-icon-cache program on PATH. Because Meld is a Python app, it uses strictDeps so we need to explicitly add the program to nativeBuildInputs. For some reason, Linux version has the program available, though, which hides the missing dependency. Perhaps it is propagated by something but I do not know how to determine it.
Switch to meson & ninja. Add new deps and remove libxlm2 and libtool from native. Update patches. Unset enableParallelBuilding since with meson it's the default.
This also requires explicitly specifying path to dbus-daemon otherwise it can't be found and GDM fails to start. Co-authored-by: Piotr Bogdan <ppbogdan@gmail.com>
worldofpeace
suggested changes
Oct 3, 2020
There was a problem hiding this comment.
For seahorse I see in the dynamic header
0x0000000000000001 (NEEDED) Shared library: [libhandy-0.0.so.0]
And looking at https://gitlab.gnome.org/GNOME/seahorse/-/blob/3.37.2/meson.build#L40 I don't see a requirement for libhandy-1 or a PR anywhere.
So what I believe is happening is gobject-introspection is needed for the subproject.
The actual error is from the subproject as well
subprojects/libhandy/src/meson.build:234:3: ERROR: Dependency "gobject-introspection-1.0" not found, tried pkgconfig
Could you drop that particular commit?
Also, I don't think we should do treewide for the commit (there's only 8 files changed, not 100+). If you could individually commit them that would be better 👍
Atemu
force-pushed
the
gnome-3.38-libhandy-fixes
branch
from
e99b453
to
f25c069
Compare
worldofpeace
force-pushed
the
gnome-3.38
branch
from
dd74a81
to
81a6702
Compare
|
I merged this manually to gnome-3.38. I think the branch issue was that I force pushed to the gnome-3.38 branch (overwrite) and this was based off the old version. I guess a |
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.
Motivation for this change
The libhandy update broke a few packages, this puts them back on _0.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)