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.

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

[gnome-3.38] libhandy fixes #99498

Closed
wants to merge 186 commits into from
Closed

Conversation

@Atemu
Copy link
Member

@Atemu Atemu commented Oct 3, 2020

Motivation for this change

The libhandy update broke a few packages, this puts them back on _0.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
doronbehar and others added 30 commits Sep 20, 2020
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.
* 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
worldofpeace and others added 12 commits Oct 2, 2020
* fix build by using libhandy_0
* 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>
@Atemu Atemu requested a review from worldofpeace Oct 3, 2020
Copy link
Member

@worldofpeace worldofpeace left a 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 👍

@worldofpeace worldofpeace changed the title [Gnome 3.38] libhandy fixes [gnome-3.38] libhandy fixes Oct 3, 2020
@worldofpeace worldofpeace requested a review from NixOS/gnome Oct 3, 2020
@Atemu Atemu force-pushed the Atemu:gnome-3.38-libhandy-fixes branch from e99b453 to f25c069 Oct 3, 2020
@worldofpeace worldofpeace force-pushed the NixOS:gnome-3.38 branch from dd74a81 to 81a6702 Oct 4, 2020
@Atemu Atemu requested review from FRidh and jonringer as code owners Oct 4, 2020
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Oct 4, 2020

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 git rebase --onto could've fixed that. Anyways, thanks for fixing this 👍 This saves a lot of time for us

@worldofpeace worldofpeace added this to Done in GNOME 3.38 Oct 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.