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

librsvg 2.59.2 #202992

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

librsvg 2.59.2 #202992

wants to merge 3 commits into from
+16 −58

Conversation

bevanjkay
Copy link
Member

Created with brew bump-formula-pr.

@github-actions github-actions bot added rust Rust use is a significant feature of the PR or issue bump-formula-pr PR was created using `brew bump-formula-pr` automerge-skip `brew pr-automerge` will skip this pull request labels Jan 2, 2025
@bevanjkay
Copy link
Member Author

2.59.* is a stable branch for librsvg.

@bevanjkay bevanjkay force-pushed the bump-librsvg-2.59.2 branch from 23e3639 to 8bebc6f Compare January 2, 2025 12:59
@bevanjkay bevanjkay added the build failure CI fails while building the software label Jan 2, 2025
@bevanjkay
Copy link
Member Author

As of 2.59 this has moved to a meson build, need to update passing the gdk-pixbuf args to the new build structure.

chenrui333
chenrui333 reviewed Jan 2, 2025
View reviewed changes
@chenrui333 chenrui333 force-pushed the bump-librsvg-2.59.2 branch from 8bebc6f to 8535dbf Compare January 2, 2025 16:15
@chenrui333 chenrui333 added ready to merge PR can be merged once CI is green and removed build failure CI fails while building the software automerge-skip `brew pr-automerge` will skip this pull request labels Jan 2, 2025
@chenrui333 chenrui333 force-pushed the bump-librsvg-2.59.2 branch from 8535dbf to b4dbc5e Compare January 2, 2025 16:26
@github-actions github-actions bot added the automerge-skip `brew pr-automerge` will skip this pull request label Jan 2, 2025
@carlocab carlocab removed the automerge-skip `brew pr-automerge` will skip this pull request label Jan 2, 2025
carlocab
carlocab reviewed Jan 2, 2025
View reviewed changes
Formula/lib/librsvg.rb Outdated
system "make", "install",
"gdk_pixbuf_binarydir=#{lib}/gdk-pixbuf-2.0/2.10.0/loaders",
"gdk_pixbuf_moduledir=#{lib}/gdk-pixbuf-2.0/2.10.0/loaders"
system "meson", "setup", "build", "-Dpixbuf-loader=disabled", *std_meson_args
Copy link
Member

Choose a reason for hiding this comment

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

-Dpixbuf-loader=disabled looks suspicious given that we used to pass --enable-pixbuf-loader=yes.

Copy link
Member

Choose a reason for hiding this comment

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

Yea, this change looks responsible for this failure: https://github.com/Homebrew/homebrew-core/actions/runs/12585492280/job/35078161710?pr=202992#step:3:234

  (<unknown>:24532): Gtk-WARNING **: 16:51:08.887: Found an icon but could not load it. Most likely gdk-pixbuf does not provide SVG support.
  [2025-01-02 16:51:08.888] [gtk] [critical] 
  unhandled exception (type Glib::Error) in signal handler:
  domain: gtk-icon-theme-error-quark
  code  : 0
  what  : Icon 'cherrytree' not present in theme Adwaita

Copy link
Member

Choose a reason for hiding this comment

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

sounds about right, let me find another way to fix the build issue 👍

@carlocab carlocab added test failure CI fails while running the test-do block and removed ready to merge PR can be merged once CI is green labels Jan 2, 2025
carlocab
carlocab requested changes Jan 2, 2025
View reviewed changes
Copy link
Member

@carlocab carlocab left a comment

Choose a reason for hiding this comment

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

We should keep the pixbuf-loader to avoid breaking clients.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 4, 2025

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. To keep this pull request open, add a help wanted or in progress label.

@github-actions github-actions bot added the stale No recent activity label Jan 4, 2025
@chenrui333 chenrui333 added in progress Stale bot should stay away and removed stale No recent activity labels Jan 4, 2025
@github-actions github-actions bot added the automerge-skip `brew pr-automerge` will skip this pull request label Feb 17, 2025
@cho-m
Copy link
Member

cho-m commented Feb 25, 2025

Part of issue is needing to bypass postinstall by the common DESTDIR=/ workaround:
https://github.com/GNOME/librsvg/blob/main/gdk-pixbuf-loader/meson_install.py#L21

Other part of issue is the patch we apply to gdk-pixbuf pkg-config file

homebrew-core/Formula/g/gdk-pixbuf.rb

Lines 75 to 76 in 0e0c92e

s.change_make_var! "gdk_pixbuf_binarydir",
HOMEBREW_PREFIX/"lib/gdk-pixbuf-#{gdk_so_ver}"/libv

This breaks support for:

pkg-config --variable=gdk_pixbuf_moduledir --define-variable=prefix=/path/to/install/prefix gdk-pixbuf-2.0

Which is what dependents like librsvg use
https://github.com/GNOME/librsvg/blob/main/gdk-pixbuf-loader/meson.build#L14

Main options are:

  1. avoid non-standard modification of gdk-pixbuf-2.0.pc. In which case, would need to patch in a more standard prefix=#{HOMEBREW_PREFIX}. Only limitation is behavior of brew unlink gdk-pixbuf (though not sure if this currently works given files are expected in linked path).
  2. manually patch/inreplace the meson.build. Problem here is having to hack multiple formulae.

@cho-m
gdk-pixbuf: drop non-standard modification of gdk-pixbuf-2.0.pc
aa2fcf9 
Patching `gdk_pixbuf_binarydir` impacts dependents that determine
loader install path re-defining prefix like `librsvg`.
@cho-m cho-m force-pushed the bump-librsvg-2.59.2 branch from f675414 to aa2fcf9 Compare February 27, 2025 05:31
cho-m
cho-m reviewed Feb 27, 2025
View reviewed changes
Formula/g/gdk-pixbuf.rb
libv = s.get_make_var "gdk_pixbuf_binary_version"
s.change_make_var! "gdk_pixbuf_binarydir",
HOMEBREW_PREFIX/"lib/gdk-pixbuf-#{gdk_so_ver}"/libv
s.change_make_var! "prefix", HOMEBREW_PREFIX
Copy link
Member

@cho-m cho-m Feb 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Need to decide if this is better option or patching dependents. Mainly if there are any scenarios that unlinked gdk-pixbuf should work.

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

@chenrui333 chenrui333 chenrui333 approved these changes

@cho-m cho-m cho-m left review comments

@carlocab carlocab carlocab requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
automerge-skip `brew pr-automerge` will skip this pull request bump-formula-pr PR was created using `brew bump-formula-pr` in progress Stale bot should stay away rust Rust use is a significant feature of the PR or issue test failure CI fails while running the test-do block
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bevanjkay @cho-m @chenrui333 @carlocab