Skip to content

Comments

libadwaita 1.0.1, pangomm 2.50.0#153235

Merged
jtojnar merged 2 commits intoNixOS:stagingfrom
Cogitri:libadwaita
Jan 7, 2022
Merged

libadwaita 1.0.1, pangomm 2.50.0#153235
jtojnar merged 2 commits intoNixOS:stagingfrom
Cogitri:libadwaita

Conversation

@Cogitri
Copy link
Contributor

@Cogitri Cogitri commented Jan 2, 2022

Motivation for this change

Now that libadwaita has a stable release, we should upgrade to it. Note that I'm currently in the process of testing this, so this is currently mostly here so we don't duplicate effort.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels Jan 2, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 2, 2022
@jtojnar
Copy link
Member

jtojnar commented Jan 2, 2022

Partial duplicate of #152948 (I did not update the C++ packages).

@jtojnar jtojnar marked this as a duplicate and then as not a duplicate of #152948 Jan 2, 2022
@jtojnar
Copy link
Member

jtojnar commented Jan 2, 2022

Also this causes mass rebuild (500/1000+ rebuilds) so it needs to target staging branch, see https://nixos.org/manual/nixpkgs/stable/#submitting-changes-commit-policy.

@Cogitri
Copy link
Contributor Author

Cogitri commented Jan 2, 2022

Ah, Github's search for pull requests really isn't all that great. I'll go ahead and only do the patch upgrade for libadwaita and *mm then.

@Cogitri Cogitri changed the base branch from master to staging January 2, 2022 19:28
@Cogitri Cogitri changed the title pango 1.50.3, GTK 4.6.0 and libadwaita 1.0.0 libadwaita 1.0.0, pangomm 2.50.0 Jan 2, 2022
@ofborg ofborg bot requested a review from jtojnar January 2, 2022 20:43
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. labels Jan 2, 2022
@ofborg ofborg bot removed 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 2, 2022
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Changes look okay:

https://ftp.gnome.org/pub/GNOME/sources/libadwaita/1.0/libadwaita-1.0.1.news

  • we do not use tarballs anyway since they were not available when I updated to 1.0.0.

(https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.49/pangomm-2.49.1.news)
2.49.1 (unstable)

  • Layout, LayoutIter: Add get_const_line() and get_const_lines()
    (Kjell Ahlstedt) Issue #10 (misos1)
  • GlyphItem: Make most methods public
    (Kjell Ahlstedt) Issue #11 (Josh Bialkowski)

(https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.50/pangomm-2.50.0.news)
2.50.0 (stable):

  • AttrList: Add get_attributes(), update(), equal()
    (Kjell Ahlstedt) Issue #12 (misos1)
  • Make CairoFontMap::set_resolution() usable
    by adding the CairoFontMapImpl class
    (Kjell Ahlstedt) Issue #15 (Ievgenii Meshcheriakov)
  • Add FontMap::get_family()
    (Kjell Ahlstedt)
  • AttrList: Add to_string() and from_string()
    Attribute: Add TextTransform, BaselineShift and FontScle enums
    and some create_attr_*() methods
    (Kjell Ahlstedt)

Build:

  • Don't include individual pango headers
    (Matthias Clasen, Kjell Ahlstedt) Merge request !22
  • Support Visual Studio 2022 builds
    (Chun-wei Fan)
  • Require pango >= 1.49.4
    (Kjell Ahlstedt)

@jtojnar jtojnar added the 8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. label Jan 2, 2022
@dotlambda dotlambda changed the title libadwaita 1.0.0, pangomm 2.50.0 libadwaita 1.0.1, pangomm 2.50.0 Jan 3, 2022
@Cogitri Cogitri marked this pull request as ready for review January 3, 2022 13:44
@bobby285271 bobby285271 removed 8.has: package (new) This PR adds a new package 8.has: clean-up This PR removes packages or removes other cruft labels Jan 3, 2022
Copy link
Contributor

@dasj19 dasj19 left a comment

Choose a reason for hiding this comment

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

Shouldn't the file pkgs/development/libraries/pangomm/2.48.nix be pkgs/development/libraries/pangomm/2.50.nix ?

Copy link
Contributor

@dasj19 dasj19 left a comment

Choose a reason for hiding this comment

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

Furthermore, the build fails on my system


Dependency gtk4 found: NO found 4.4.1 but need: '>= 4.5.0'
Did not find CMake 'cmake'
Found CMake: NO
Run-time dependency gtk4 found: NO 

src/meson.build:228:0: ERROR: Invalid version of dependency, need 'gtk4' ['>= 4.5.0'] found '4.4.1'.

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

@jtojnar
Copy link
Member

jtojnar commented Jan 7, 2022

Shouldn't the file pkgs/development/libraries/pangomm/2.48.nix be pkgs/development/libraries/pangomm/2.50.nix ?

No. The package name refers to ABI version: https://gitlab.gnome.org/GNOME/pangomm/-/blob/cd00ba55a53b71a41fb566827db8b7d7c28c36b6/meson.build#L13

@jtojnar
Copy link
Member

jtojnar commented Jan 7, 2022

The GTK 4.6 is on staging, which this PR targets.

@jtojnar jtojnar merged commit ecd989e into NixOS:staging Jan 7, 2022
@Cogitri
Copy link
Contributor Author

Cogitri commented Jan 8, 2022

Thanks for the quick reviews! :)

Sorry to ask for an ETA, but how long does it usually take for changes to move from staging to master?

@jtojnar
Copy link
Member

jtojnar commented Jan 8, 2022

Generally, it depends on how much breakage there is and how many people are available. Over the holidays it slowed down a bit and the current cycle is 14 days old so it does not include the GTK PR. My best estimate is another 14 days. You can also pop in to https://matrix.to/#/#staging:nixos.org to see what the current blockers are.

@Cogitri
Copy link
Contributor Author

Cogitri commented Jan 8, 2022

Oki, thanks for the info 👍

@jtojnar
Copy link
Member

jtojnar commented Jan 12, 2022

New iteration started today: #154708

@Cogitri
Copy link
Contributor Author

Cogitri commented Jan 12, 2022

Thanks for the notification!

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

Labels

8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants