cairo: 1.16.0 -> 1.18.0 by alyssais · Pull Request #257301 · NixOS/nixpkgs

alyssais · 2023-09-25T18:13:18Z

Hydra comparisons

1800235 (complete)

Description of changes

libiconv and expat are no longer used.
libintl and xcbutil no longer appear to be used.
The GL backend has been removed.
We can no longer disable PDF support, since something always propagates zlib.
Not sure whether the Requires.private is still needed, so I've left it.

Fixes #256519.

Things done

RaitoBezarius · 2023-09-26T10:21:18Z

Do you want to get a Hydra jobset for this?

bobby285271 · 2023-09-26T14:06:11Z

The only build fixes for this in GNOME 45 PR so far are 2968007 and cd6c696 if you wish to do this in separate PR (we have no non-linux testing so far - but the GNOME 45 does need at least cairo 1.17.0 for librsvg, glycin-loaders, loupe, etc)

alyssais · 2023-10-05T09:15:46Z

@vcunat could we get a Hydra jobset?

bobby285271 · 2023-10-05T09:18:18Z

The GNOME 45 PR now also have 2141f32 (sway) b3575ab (i3lock) 5b579d0 (hyprland) a7c25f4 (i3lock-color) 610aabe (wayfire) e1e8282 (celluloid) b871990 (wxSVG), and I-don't-know-why 9f5f74b (cogl)

Update: also initial fixup for weston, string-machine, stone-phaser, mission-center, hyprpicker, hyprpaper, fbida in a3338b0...aa6f1d8

vcunat · 2023-10-09T07:49:43Z

Jobset created: https://hydra.nixos.org/jobset/nixpkgs/pr-257301-cairo-1.18

I doubt that it will be possible to get significant amounts of builds for this PR done this week, with all-rebuilding rush starting on Wednesday due to security fixes. I guess we'll also wait with gnome jobset until this progresses? (it also contains the update and it doesn't make much sense to me for these jobsets to compete against each other for builders)

vcunat · 2023-10-09T08:32:47Z

I triggered it for x86_64-linux and aarch64-darwin for now.

vcunat · 2023-10-19T10:07:54Z

Builds finished, FYI.

vcunat · 2023-10-20T15:09:44Z

Uh, the today's push... do we really need to rebuild 100k builds now on Hydra? I mean, there are lots of other stuff to build, e.g. other branches asking for a jobset incidentally.

alyssais · 2023-10-20T15:17:56Z

No, go ahead and cancel it.

edit: I didn't realise that pushing would automatically trigger a Hydra build.

vcunat · 2023-10-20T15:26:35Z

I had one eval per day timer in there, but I triggered this one myself :-) I thought it was mainly the two extra commits shown by GitHub UI.

vcunat · 2023-10-20T15:28:48Z

So I suppose you'll soon consider this ready to merge, without another Hydra eval? There are only 10 days left to merge breaking changes that should reach NixOS 23.11.

alyssais · 2023-10-20T15:34:05Z

I'm still going through the first Hydra comparison, so we'll definitely need at least one more. All I've pushed so far is a rebase that was a prerequisite to applying @bobby285271's other changes. I won't push again until I've made as much progress as I can based on the current comparison.

vcunat · 2023-10-20T15:43:25Z

OK, I stopped the eval timer. Ping me when you want it.

Currently, this is propagated from cairo, but that will soon no longer be the case.

Cairo will soon no longer propagate libGL. The DPF submodule needs this: src/pugl/pugl.h:39:14: fatal error: GL/gl.h: No such file or directory 39 | # include <GL/gl.h> | ^~~~~~~~~ compilation terminated. (See also the fix for string-machine, which has the same build issue)

Cairo will soon no longer propagate libGL. The DPF submodule needs this: src/pugl/pugl.h:39:14: fatal error: GL/gl.h: No such file or directory 39 | # include <GL/gl.h> | ^~~~~~~~~ compilation terminated.

Currently, this is propagated from cairo, but that will soon no longer be the case.

Cairo will soon no longer propagate libGL. Run-time dependency egl found: NO (tried pkgconfig and cmake)

Currently, this is propagated from cairo, but that will soon no longer be the case.

- libiconv and expat are no longer used. - libintl and xcbutil no longer appear to be used. - The GL backend has been removed. - We can no longer disable PDF support, since something always propagates zlib. - Not sure whether the Requires.private is still needed, so I've left it.

alyssais · 2023-10-21T08:23:41Z

@bobby285271 I've fixed cogl in a different way, just linking libGL and avoiding the need for a patch.

alyssais · 2023-10-21T08:46:34Z

@vcunat I've now addressed all the direct new build failures from the last Hydra run, so I think it's time for another.

fabianhjr

Been using cairo 1.18.0 as part of GNOME 45 branch: https://github.com/NixOS/nixpkgs/pull/247766/files#diff-c1b6675856a14491b8c610758d37ad4372e04a3f25a6049926c738f21121e5b0

Eval looks great with minimal breakage ( https://hydra.nixos.org/eval/1800745 )

vcunat · 2023-10-25T11:06:30Z

After taking various things into consideration, let's finish this during the upcoming staging-next.

bobby285271 · 2023-10-25T11:22:52Z

And we probably still need to fix cross there I guess (did not test, but I saw the ipc_rmid_deferred_release lines commented) 🤔

alyssais · 2023-10-25T11:41:22Z

Oh, whoops.

trofi · 2024-11-25T15:49:33Z

I noticed that cairo bump changed x11Support condition from !stdenv.isDarwin to !stdenv.isDarwin || true which seems to be an effective true. Should it be just true? Or it's a debug leftover that should be !stdenv.isDarwin?

fabianhjr · 2024-11-26T01:23:26Z

pkgs/development/libraries/cairo/default.nix

-, x11Support? !stdenv.isDarwin, libXext, libXrender
+{ lib, stdenv, fetchurl, fetchpatch, gtk-doc, meson, ninja, pkg-config, python3
+, docbook_xsl, fontconfig, freetype, libpng, pixman, zlib
+, x11Support? !stdenv.isDarwin || true, libXext, libXrender


Good observation, my instinct thinks this is an unintended change and || true should be removed but tagging @NixOS/darwin-core for decision on disabling or enabling on darwin by default.

fabianhjr · 2024-11-26T01:24:41Z

Mhhh, and this is a year old. Probably best to leave enabled then? (It has been part of the last 2 stable releases)

reckenrode · 2024-11-26T01:32:51Z

I would prefer not to pull in X11 libraries unnecessarily, but what’s the effect on closure size?

alyssais requested a review from RaitoBezarius September 25, 2023 18:13

alyssais force-pushed the cairo-1.18.0 branch 2 times, most recently from b3e6619 to c447c0c Compare September 25, 2023 18:36

alyssais marked this pull request as draft September 25, 2023 21:56

alyssais force-pushed the cairo-1.18.0 branch from c447c0c to 03f8258 Compare September 25, 2023 21:57

alyssais mentioned this pull request Sep 25, 2023

GNOME: 44 → 45 #247766

Merged

alyssais force-pushed the cairo-1.18.0 branch from 03f8258 to 57c4449 Compare September 26, 2023 06:41

alyssais force-pushed the cairo-1.18.0 branch 2 times, most recently from 49adb92 to 325b485 Compare October 5, 2023 09:17

ofborg bot requested review from lilyinstarlight, matthewbauer and poscat0x04 October 5, 2023 11:32

alyssais force-pushed the cairo-1.18.0 branch from 325b485 to 0db3542 Compare October 20, 2023 13:15

alyssais and others added 9 commits October 20, 2023 22:02

squeak: add libGL build input

c1ac656

Currently, this is propagated from cairo, but that will soon no longer be the case.

string-machine: Add missing libGL

8d5b9fc

Cairo will soon no longer propagate libGL. The DPF submodule needs this: src/pugl/pugl.h:39:14: fatal error: GL/gl.h: No such file or directory 39 | # include <GL/gl.h> | ^~~~~~~~~ compilation terminated.

sway: add libGL build input

cb41438

Currently, this is propagated from cairo, but that will soon no longer be the case.

wayfire: add libGL build input

6bdb478

Currently, this is propagated from cairo, but that will soon no longer be the case.

weston: Add missing libGL

beb014d

Cairo will soon no longer propagate libGL. Run-time dependency egl found: NO (tried pkgconfig and cmake)

wmfocus: add expat build input

215518f

Currently, this is propagated from cairo, but that will soon no longer be the case.

wxSVG: add expat build input

77d52cd

Currently, this is propagated from cairo, but that will soon no longer be the case.

alyssais force-pushed the cairo-1.18.0 branch from 0db3542 to 2c0a4f4 Compare October 20, 2023 22:03

github-actions bot added the 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. label Oct 20, 2023

alyssais requested review from bobby285271 and jtojnar October 22, 2023 08:21

fabianhjr approved these changes Oct 23, 2023

View reviewed changes

alyssais mentioned this pull request Oct 25, 2023

pkgsStatic.cairo: fix build #256519

Closed

12 tasks

vcunat marked this pull request as ready for review October 25, 2023 11:05

vcunat requested a review from marsam as a code owner October 25, 2023 11:05

vcunat merged commit 47b0ad3 into NixOS:staging Oct 25, 2023

alyssais deleted the cairo-1.18.0 branch October 25, 2023 11:41

MarcelCoding mentioned this pull request Oct 25, 2023

rnote: 0.7.1 -> 0.8.0 #251391

Closed

12 tasks

fabianhjr reviewed Nov 26, 2024

View reviewed changes

Uh oh!

Conversation

alyssais commented Sep 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Hydra comparisons

Description of changes

Things done

Uh oh!

RaitoBezarius commented Sep 26, 2023

Uh oh!

bobby285271 commented Sep 26, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alyssais commented Oct 5, 2023

Uh oh!

bobby285271 commented Oct 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vcunat commented Oct 9, 2023

Uh oh!

vcunat commented Oct 9, 2023

Uh oh!

vcunat commented Oct 19, 2023

Uh oh!

vcunat commented Oct 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alyssais commented Oct 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vcunat commented Oct 20, 2023

Uh oh!

vcunat commented Oct 20, 2023

Uh oh!

alyssais commented Oct 20, 2023

Uh oh!

vcunat commented Oct 20, 2023

Uh oh!

alyssais commented Oct 21, 2023

Uh oh!

alyssais commented Oct 21, 2023

Uh oh!

fabianhjr left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vcunat commented Oct 25, 2023

Uh oh!

bobby285271 commented Oct 25, 2023

Uh oh!

alyssais commented Oct 25, 2023

Uh oh!

trofi commented Nov 25, 2024

Uh oh!

fabianhjr Nov 26, 2024

Choose a reason for hiding this comment

Uh oh!

fabianhjr commented Nov 26, 2024

Uh oh!

reckenrode commented Nov 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

alyssais commented Sep 25, 2023 •

edited

Loading

bobby285271 commented Sep 26, 2023 •

edited

Loading

bobby285271 commented Oct 5, 2023 •

edited

Loading

vcunat commented Oct 20, 2023 •

edited

Loading

alyssais commented Oct 20, 2023 •

edited

Loading

fabianhjr left a comment •

edited

Loading