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

geoclue2: 2.4.12 -> 2.5.1 #48438

Merged
merged 1 commit into from Nov 30, 2018
Merged

geoclue2: 2.4.12 -> 2.5.1 #48438

merged 1 commit into from Nov 30, 2018

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

An update.

Needs newer meson in #45950

I have tested that it builds with that branch.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@worldofpeace worldofpeace changed the title geoclue2: 2.4.12 -> 2.5.0 WIP geoclue2: 2.4.12 -> 2.5.0 Oct 14, 2018
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: geoclue2

Partial log (click to expand)

Build dir: /build/source/build
Build type: native build
WARNING: Unknown command line options: "auto_features"
This will become a hard error in a future Meson release.

meson.build:1:0: ERROR:  Meson version is 0.46.1 but project requires >= 0.47.2.

A full log can be found at /build/source/build/meson-logs/meson-log.txt
builder for '/nix/store/fx8g8z8zf2nryad3ba7bkdwlywga7pc9-geoclue-2.5.0.drv' failed with exit code 1
error: build of '/nix/store/fx8g8z8zf2nryad3ba7bkdwlywga7pc9-geoclue-2.5.0.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: geoclue2

Partial log (click to expand)

Build dir: /build/source/build
Build type: native build
WARNING: Unknown command line options: "auto_features"
This will become a hard error in a future Meson release.

meson.build:1:0: ERROR:  Meson version is 0.46.1 but project requires >= 0.47.2.

A full log can be found at /build/source/build/meson-logs/meson-log.txt
builder for '/nix/store/cj9s4272nq01wg4z0kryzdv0yipc3c11-geoclue-2.5.0.drv' failed with exit code 1
error: build of '/nix/store/cj9s4272nq01wg4z0kryzdv0yipc3c11-geoclue-2.5.0.drv' failed

@michaelpj michaelpj mentioned this pull request Oct 20, 2018
Closed
@asymmetric
Copy link
Contributor

2.5.1 is out.

@worldofpeace worldofpeace changed the title WIP geoclue2: 2.4.12 -> 2.5.0 WIP geoclue2: 2.4.12 -> 2.5.1 Oct 21, 2018
@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: geoclue2

Partial log (click to expand)

Build dir: /build/source/build
Build type: native build
WARNING: Unknown command line options: "auto_features"
This will become a hard error in a future Meson release.

meson.build:1:0: ERROR:  Meson version is 0.46.1 but project requires >= 0.47.2.

A full log can be found at /build/source/build/meson-logs/meson-log.txt
builder for '/nix/store/67lscv4nggziwapn34xdr4p076lcjh4q-geoclue-2.5.1.drv' failed with exit code 1
error: build of '/nix/store/67lscv4nggziwapn34xdr4p076lcjh4q-geoclue-2.5.1.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: geoclue2

Partial log (click to expand)

Build dir: /build/source/build
Build type: native build
WARNING: Unknown command line options: "auto_features"
This will become a hard error in a future Meson release.

meson.build:1:0: ERROR:  Meson version is 0.46.1 but project requires >= 0.47.2.

A full log can be found at /build/source/build/meson-logs/meson-log.txt
builder for '/nix/store/6l9mq1gk6mpbb4d9wjn5q9bhnzjs5xh2-geoclue-2.5.1.drv' failed with exit code 1
error: build of '/nix/store/6l9mq1gk6mpbb4d9wjn5q9bhnzjs5xh2-geoclue-2.5.1.drv' failed

@worldofpeace worldofpeace changed the base branch from master to staging November 19, 2018 16:22
@worldofpeace worldofpeace changed the title WIP geoclue2: 2.4.12 -> 2.5.1 geoclue2: 2.4.12 -> 2.5.1 Nov 19, 2018
@worldofpeace
Copy link
Contributor Author

meson has been upgraded to 0.48.2 in staging, so this should be clear now.

cc @jtojnar

@jtojnar
Copy link
Contributor

jtojnar commented Nov 19, 2018

I would still wait a while to make sure it sticks.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: geoclue2

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/isq7frmx9zcvwz28dndkfh9lgm4d2i8a-geoclue-2.5.1-dev
strip is /nix/store/1jprj383qnzd50vn8qq3a0id6a08a9fi-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/isq7frmx9zcvwz28dndkfh9lgm4d2i8a-geoclue-2.5.1-dev/lib
patching script interpreter paths in /nix/store/isq7frmx9zcvwz28dndkfh9lgm4d2i8a-geoclue-2.5.1-dev
checking for references to /build/ in /nix/store/isq7frmx9zcvwz28dndkfh9lgm4d2i8a-geoclue-2.5.1-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/n3y8wns4m4cqh0nj40q9j58i05wz5pdz-geoclue-2.5.1-devdoc
strip is /nix/store/1jprj383qnzd50vn8qq3a0id6a08a9fi-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/n3y8wns4m4cqh0nj40q9j58i05wz5pdz-geoclue-2.5.1-devdoc
checking for references to /build/ in /nix/store/n3y8wns4m4cqh0nj40q9j58i05wz5pdz-geoclue-2.5.1-devdoc...
/nix/store/dwdlkz03gxyjw2dwlnvjxn5wlpsxjd47-geoclue-2.5.1

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: geoclue2

Partial log (click to expand)

shrinking /nix/store/hdcpqjgib44rkhkxfvxw9zzqmvpyy0s3-glib-networking-2.56.0/lib/gio/modules/libgiolibproxy.so
shrinking /nix/store/hdcpqjgib44rkhkxfvxw9zzqmvpyy0s3-glib-networking-2.56.0/lib/gio/modules/libgiognutls.so
shrinking /nix/store/hdcpqjgib44rkhkxfvxw9zzqmvpyy0s3-glib-networking-2.56.0/libexec/glib-pacrunner
strip is /nix/store/j13c9z0z495wxdc97if8z451x53m1j25-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/hdcpqjgib44rkhkxfvxw9zzqmvpyy0s3-glib-networking-2.56.0/lib  /nix/store/hdcpqjgib44rkhkxfvxw9zzqmvpyy0s3-glib-networking-2.56.0/libexec
patching script interpreter paths in /nix/store/hdcpqjgib44rkhkxfvxw9zzqmvpyy0s3-glib-networking-2.56.0
checking for references to /build/ in /nix/store/hdcpqjgib44rkhkxfvxw9zzqmvpyy0s3-glib-networking-2.56.0...
strip is /nix/store/j13c9z0z495wxdc97if8z451x53m1j25-binutils-2.30/bin/strip
cannot build derivation '/nix/store/y5nzc73mk65ai5hfjrrlwx5ig03q1agk-geoclue-2.5.1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/y5nzc73mk65ai5hfjrrlwx5ig03q1agk-geoclue-2.5.1.drv' failed

@jtojnar jtojnar changed the base branch from staging to master November 30, 2018 20:59
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: geoclue2

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/w1dj8al32sdyxy0zzvfmgas60m3sz1gk-geoclue-2.5.1-dev
strip is /nix/store/6s8dkfj3irwv52cap2hd9k7gaddklfs1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/w1dj8al32sdyxy0zzvfmgas60m3sz1gk-geoclue-2.5.1-dev/lib
patching script interpreter paths in /nix/store/w1dj8al32sdyxy0zzvfmgas60m3sz1gk-geoclue-2.5.1-dev
checking for references to /build/ in /nix/store/w1dj8al32sdyxy0zzvfmgas60m3sz1gk-geoclue-2.5.1-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/57g427gbjrp9iwx9i9w0akgv9d90839d-geoclue-2.5.1-devdoc
strip is /nix/store/6s8dkfj3irwv52cap2hd9k7gaddklfs1-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/57g427gbjrp9iwx9i9w0akgv9d90839d-geoclue-2.5.1-devdoc
checking for references to /build/ in /nix/store/57g427gbjrp9iwx9i9w0akgv9d90839d-geoclue-2.5.1-devdoc...
/nix/store/3kkw0qx4wnf4z4jlp8yrgy3wynj55yd8-geoclue-2.5.1

@worldofpeace
Copy link
Contributor Author

I've added vala. Still builds locally.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: geoclue2

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/g4nhs6j9akbsx28hkgzzfq4iz9lcgrq7-geoclue-2.5.1-dev
strip is /nix/store/bbla06nbjnpi55x9b3zm945vq1mf5fbh-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/g4nhs6j9akbsx28hkgzzfq4iz9lcgrq7-geoclue-2.5.1-dev/lib
patching script interpreter paths in /nix/store/g4nhs6j9akbsx28hkgzzfq4iz9lcgrq7-geoclue-2.5.1-dev
checking for references to /build/ in /nix/store/g4nhs6j9akbsx28hkgzzfq4iz9lcgrq7-geoclue-2.5.1-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/ww2s5048zlnyp2xs48j0jfspm0hmrpc3-geoclue-2.5.1-devdoc
strip is /nix/store/bbla06nbjnpi55x9b3zm945vq1mf5fbh-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/ww2s5048zlnyp2xs48j0jfspm0hmrpc3-geoclue-2.5.1-devdoc
checking for references to /build/ in /nix/store/ww2s5048zlnyp2xs48j0jfspm0hmrpc3-geoclue-2.5.1-devdoc...
/nix/store/j38kx5s7ps1b1rjs14c2bynvqp81j3pj-geoclue-2.5.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: geoclue2

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/0gdyk7k9v389k9f39vjypdgwygm4d25h-geoclue-2.5.1-dev
strip is /nix/store/6s8dkfj3irwv52cap2hd9k7gaddklfs1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/0gdyk7k9v389k9f39vjypdgwygm4d25h-geoclue-2.5.1-dev/lib
patching script interpreter paths in /nix/store/0gdyk7k9v389k9f39vjypdgwygm4d25h-geoclue-2.5.1-dev
checking for references to /build/ in /nix/store/0gdyk7k9v389k9f39vjypdgwygm4d25h-geoclue-2.5.1-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/52a3vkic10rkmfw59fvl6q9fp7ynngzr-geoclue-2.5.1-devdoc
strip is /nix/store/6s8dkfj3irwv52cap2hd9k7gaddklfs1-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/52a3vkic10rkmfw59fvl6q9fp7ynngzr-geoclue-2.5.1-devdoc
checking for references to /build/ in /nix/store/52a3vkic10rkmfw59fvl6q9fp7ynngzr-geoclue-2.5.1-devdoc...
/nix/store/lw4hjijkin0c99hmnlq642i7jd7zj5y0-geoclue-2.5.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: geoclue2

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/007k204zyjkl2xkds6k4c6f15jxnvr2v-geoclue-2.5.1-dev
strip is /nix/store/bbla06nbjnpi55x9b3zm945vq1mf5fbh-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/007k204zyjkl2xkds6k4c6f15jxnvr2v-geoclue-2.5.1-dev/lib
patching script interpreter paths in /nix/store/007k204zyjkl2xkds6k4c6f15jxnvr2v-geoclue-2.5.1-dev
checking for references to /build/ in /nix/store/007k204zyjkl2xkds6k4c6f15jxnvr2v-geoclue-2.5.1-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/i912ikz7b874iskz6jz4hxg21qll0y3p-geoclue-2.5.1-devdoc
strip is /nix/store/bbla06nbjnpi55x9b3zm945vq1mf5fbh-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/i912ikz7b874iskz6jz4hxg21qll0y3p-geoclue-2.5.1-devdoc
checking for references to /build/ in /nix/store/i912ikz7b874iskz6jz4hxg21qll0y3p-geoclue-2.5.1-devdoc...
/nix/store/3bhhsyds923mp2p1k3v44lzwk7llbpm9-geoclue-2.5.1

@worldofpeace
Copy link
Contributor Author

@jtojnar I saw you changed the base branch to master. It's fine to merge there correct?

@worldofpeace worldofpeace merged commit 7131b7f into NixOS:master Nov 30, 2018
@worldofpeace
Copy link
Contributor Author

#45306 is now relevant

@worldofpeace worldofpeace deleted the geoclue2/2.5.0 branch November 30, 2018 23:08
@michaelpj
Copy link
Contributor

Note that in recent versions they've dropped the agent requirement for "system" apps, so we can potentially drop that whole annoyance and just go back to modifying the config file.

@michaelpj
Copy link
Contributor

You just put "system" in the config file, I can't remember the exact syntax.

@worldofpeace
Copy link
Contributor Author

Oops, deleted my comment instead of editing 😄

@worldofpeace
Copy link
Contributor Author

I think we'll still need to generate this https://gitlab.freedesktop.org/geoclue/geoclue/blob/master/data/geoclue.conf.in#L110

@michaelpj
Copy link
Contributor

Yeah, we still need the config file, but we can get rid of the agent. At least I think so!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@worldofpeace @GrahamcOfBorg @asymmetric @jtojnar @michaelpj