Bug 283531 - graphics/cairo: Update to 1.18.2
Summary: graphics/cairo: Update to 1.18.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-desktop (Team)
URL:
Keywords:
Depends on:
Blocks: 283993
  Show dependency treegraph
 
Reported: 2024-12-23 23:02 UTC by Tijl Coosemans
Modified: 2025-01-11 10:31 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (desktop)
antoine: exp-run+


Attachments
patch (11.42 KB, patch)
2024-12-23 23:02 UTC, Tijl Coosemans
no flags Details | Diff
patch2 (20.13 KB, patch)
2025-01-01 23:29 UTC, Tijl Coosemans
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tijl Coosemans freebsd_committer freebsd_triage 2024-12-23 23:02:42 UTC
Created attachment 256082 [details]
patch
Comment 1 Tijl Coosemans freebsd_committer freebsd_triage 2024-12-23 23:06:36 UTC
Request exp-run.  Please include bug 283530 (pixman update) and bug 283533 (pango update) in the exp-run.
Comment 2 Daniel Engberg freebsd_committer freebsd_triage 2024-12-24 08:25:42 UTC
Have you check if www/webkit2* compiles? Last time I checked they failed to do so which probably will be considered a showstopper. Sidenote, they're also causing issues bumping libxml2 (279705) and libxslt (279741).
Comment 4 Tijl Coosemans freebsd_committer freebsd_triage 2025-01-01 23:29:52 UTC
Created attachment 256329 [details]
patch2

audio/fogpad-lv2, audio/ssr-lv2, audio/stone-phaser-lv2, audio/string-machine-lv2: Add dependency on libGL now that cairo no longer pulls it in.

devel/doxygen: Add upstream patches to support compressed PDF files generated by more recent versions of cairo.

www/webkit2-gtk3, www/webkit2-gtk4: Remove requirement for cairo-egl.

x11/hyprpaper: Remove inclusion of unused GLES3 headers so a dependency on libGLES is not needed.

x11/rofi-file-browser-extended: Fix patch to make sure GLIB2_INCLUDE_DIRS is defined.
Comment 5 Daniel Engberg freebsd_committer freebsd_triage 2025-01-02 00:09:05 UTC
Regarding devel/doxygen, instead of backporting patches can't we just try to update it?
Comment 6 Daniel Engberg freebsd_committer freebsd_triage 2025-01-02 00:09:23 UTC
Hit enter too soon, PR 279330
Comment 7 Tijl Coosemans freebsd_committer freebsd_triage 2025-01-02 09:51:39 UTC
(In reply to Daniel Engberg from comment #5)
Yes, but that's probably a large patch on its own.  I don't want to be blocked by that.
Comment 8 Antoine Brodin freebsd_committer freebsd_triage 2025-01-06 14:31:42 UTC
Exp-run with patch2 seems fine
Comment 9 commit-hook freebsd_committer freebsd_triage 2025-01-07 10:35:51 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=299bcfac714453b3ebc0a1424b3ec928b0cf3f2d

commit 299bcfac714453b3ebc0a1424b3ec928b0cf3f2d
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2024-06-21 14:45:30 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2025-01-07 10:34:47 +0000

    graphics/cairo: Update to 1.18.2

    Upstream has removed OpenGL support and switched from autoconf to meson.

    Some ports needed to be fixed:

    audio/fogpad-lv2, audio/ssr-lv2, audio/stone-phaser-lv2,
    audio/string-machine-lv2: Add dependency on libGL now that cairo
    no longer pulls it in.

    devel/doxygen: Add upstream patches to support compressed PDF files
    generated by more recent versions of cairo.

    www/webkit2-gtk3, www/webkit2-gtk4: Remove requirement for cairo-egl.

    x11/hyprpaper: Remove inclusion of unused GLES3 headers so a dependency
    on libGLES is not needed.

    x11/rofi-file-browser-extended: Fix patch to make sure
    GLIB2_INCLUDE_DIRS is defined.

    PR:             283531
    Reviewed by:    diizzy
    Exp-run by:     antoine

 audio/fogpad-lv2/Makefile                          |  5 +-
 audio/ssr-lv2/Makefile                             |  5 +-
 audio/stone-phaser-lv2/Makefile                    |  4 +-
 audio/string-machine-lv2/Makefile                  |  5 +-
 devel/doxygen/Makefile                             |  8 +-
 devel/doxygen/distinfo                             | 10 ++-
 graphics/cairo/Makefile                            | 85 ++++++++--------------
 graphics/cairo/distinfo                            | 10 +--
 graphics/cairo/files/patch-Makefile.am (gone)      | 10 ---
 .../files/patch-build_configure.ac.system (gone)   | 17 -----
 graphics/cairo/files/patch-configure.ac (gone)     | 11 ---
 graphics/cairo/pkg-plist                           | 43 +++++------
 www/webkit2-gtk3/Makefile                          |  7 --
 www/webkit2-gtk4/Makefile                          |  7 --
 x11/hyprpaper/Makefile                             |  1 +
 .../files/patch-CMakeLists.txt                     | 18 ++---
 16 files changed, 90 insertions(+), 156 deletions(-)