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

Jump to bottom

gtk3: 3.24.8 -> 3.24.10, meson! #63874

Merged
merged 4 commits into from Jul 17, 2019
Merged

gtk3: 3.24.8 -> 3.24.10, meson! #63874

merged 4 commits into from Jul 17, 2019

Conversation

worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Jun 27, 2019 •
edited

Motivation for this change

GTK can now be built with the meson build system.

Did this pretty blindly, not ready for review yet.

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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from vcunat and 7c6f434c June 27, 2019 20:59
@worldofpeace
Copy link
Contributor Author

@GrahamcOfBorg build gtk3

@worldofpeace worldofpeace changed the base branch from staging to master June 27, 2019 21:27
worldofpeace
worldofpeace commented Jun 27, 2019
View reviewed changes
pkgs/development/libraries/gtk+/gtk3-setup-hook.sh
fixupOutputHooks+=(_gtk3CleanComments)

# Clean comments that link to generator of the file
_gtk3CleanComments() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed to add this because of how this file is created with post_install.py it causes a circular reference.

@worldofpeace worldofpeace marked this pull request as ready for review June 28, 2019 21:20
@7c6f434c
Copy link
Member

Seems fine at the first glance.

worldofpeace
worldofpeace commented Jul 6, 2019
View reviewed changes
pkgs/development/libraries/gtk+/3.x.nix

for program in ''${demos[@]}; do
wrapProgram $dev/bin/$program \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$dev/share/gsettings-schemas/${pname}-${version}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be wrapped for darwin?

@worldofpeace worldofpeace mentioned this pull request Jul 9, 2019
Closed
10 tasks
@worldofpeace worldofpeace requested a review from dtzWill July 9, 2019 13:32
@worldofpeace worldofpeace changed the title gtk3: 3.24.8 -> 3.24.9, meson! gtk3: 3.24.8 -> 3.24.10, meson! Jul 9, 2019
@7c6f434c
Copy link
Member

Wait, why is this targeted to master?

@worldofpeace
Copy link
Contributor Author

worldofpeace commented Jul 15, 2019 •
edited

At the time of opening staging was broken and I wanted to test if it built on all platforms.
It should probably target staging now.

@worldofpeace
gtk3: cleanup expression
8726a5e
@worldofpeace
gtk3: 3.24.8 -> 3.24.10, meson!
7f0a46f 
We now build gtk3 with the meson build system.
Notably, at least for the expression, all the platforms
logic for we had for configureFlags should be unneeded
with meson.
@worldofpeace
gtk3: add sassc
df3aa9d 
This makes us generate the .css instead of
using the pregenerated ones.
@worldofpeace
gtk3: wrap demos, cleanup output
91374d7
@7c6f434c
Copy link
Member

Currently the changes still look fine (and I still don't have time to do an in-depth analysis/testing, sorry)

@FRidh FRidh merged commit ff1be88 into NixOS:staging Jul 17, 2019
@FRidh
Copy link
Member

FRidh commented Jul 19, 2019 •
edited

There are quite some gtk failures on staging-next. Could you have a look?

@FRidh FRidh mentioned this pull request Jul 19, 2019
Merged
10 tasks
@worldofpeace worldofpeace deleted the gtk-meson branch July 19, 2019 16:45
@worldofpeace
Copy link
Contributor Author

@FRidh The path handling for their pkgconfig file's wasn't great and includeddir ended up like

includedir=/nix/store/k0zdsqmhiqc4a9inyix4nnghizkjq4n9-gtk+3-3.24.10-dev//nix/store/k0zdsqmhiqc4a9inyix4nnghizkjq4n9-gtk+3-3.24.10-dev/include

That patch should be fairly simple I think, incoming soon.

@worldofpeace worldofpeace mentioned this pull request Jul 19, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat Awaiting requested review from vcunat

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@dtzWill dtzWill Awaiting requested review from dtzWill

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@worldofpeace @7c6f434c @FRidh