Skip to content

Merge trixie to master & update master to 1.3.2

Faidon Liambotis requested to merge paravoid/inkscape:update-master-132 into master

This MR does three things:

  • A three-way merge between master and trixie, incorporating the changes made in the trixie branch since it diverged from master. Among other things, this addresses a FTBFS currently affecting master (= experimental) due to changes in the toolchain & poppler.
  • Updating master from 1.3 to 1.3.2. While this is technically a separate change, given the amount of backports involved, it made more sense to target the latest upstream.
  • Fixing a FTBFS with poppler 24.05.0. Again, completely is separate (and possibly affecting sid/trixie?), but I wanted to submit something that I can actually build & test 😄

Merge request reports

Loading