Skip to content

x11-toolkits/gtk40: remove unguarded duplicate plist entries - #3365

Merged
laffer1 merged 1 commit into
masterfrom
x11-toolkits/gtk40-plist
Nov 17, 2026
Merged

laffer1 merged 1 commit into
masterfrom
x11-toolkits/gtk40-plist

Conversation

@laffer1

@laffer1 laffer1 commented Nov 17, 2026 •

Copy link
Copy Markdown
Member

Summary

Fixes the gtk40 4.24.0_1 failure on Magus run 652 (i386, 4.1, port_id 2304857):

include/gtk-4.0/gdk/broadway/gdkbroadway{,display,monitor,surface}.h not installed.
include/gtk-4.0/gsk/broadway/gskbroadwayrenderer.h not installed.
Fake failed.

pkg-plist listed the broadway headers both with and without the %%BROADWAY%% guard. BROADWAY is off by default, so the unguarded copies are never installed.

The 16 gdk/x11/*.h headers were also duplicated without the %%X11%% guard. They produced duplicate-entry warnings at package time and would break WITHOUT=X11 builds. This PR removes those copies too.

Default-option package contents are unchanged, so there is no PORTREVISION bump.

Testing

  • bmake fake package WITHOUT="BROADWAY GSTREAMER" on amd64 passed and produced gtk4-4.24.0_1.mport. GSTREAMER was off only because the build host has an older gstreamer1-plugins-bad installed. Its plist entries are separately guarded.
  • After removing the X11 duplicates, I expanded the final plist with PLIST_SUB and compared it to the fake tree: 628 entries, 0 missing, no duplicates.
  • git diff --check is clean. portlint reports 0 fatal errors.

🤖 Generated with Claude Code

Summary by Sourcery

Bug Fixes:

  • Remove unguarded Broadway and X11 header entries from the GTK 4.0 package plist to prevent missing-file failures, duplicate-entry warnings, and failures when building without X11.

pkg-plist listed the broadway headers both with and without the
%%BROADWAY%% guard. BROADWAY is off by default, so fake failed on
Magus run 652 (i386, 4.1) with five "not installed" broadway headers.

The gdk/x11 headers were likewise duplicated without the %%X11%%
guard, which would break builds with X11 disabled and caused
duplicate-entry warnings at package time.

Default-option package contents are unchanged, so no PORTREVISION bump.

AI-Assisted-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Lucas Holt <luke@foolishgames.com>
@sourcery-ai

sourcery-ai Bot commented Nov 17, 2026

Copy link
Copy Markdown
Contributor

Sorry @laffer1, you've used your own review budget of 250,000 diff characters for the last 7 days.

You can request another review in 27 minutes by commenting @sourcery-ai review. Upgrade to get a review now.

@sourcery-ai

sourcery-ai Bot commented Nov 17, 2026

Copy link
Copy Markdown
Contributor

Reviewer's Guide

Configuration

Remove unguarded duplicate Broadway and X11 header entries from the package plist so files are required only when their options are enabled.

  • x11-toolkits/gtk40/pkg-plist L19 (removed lines), L77 (removed lines), L106 (removed lines)

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@github-actions

github-actions Bot commented Nov 17, 2026 •

Copy link
Copy Markdown

Claude finished @laffer1's task in 15s —— View job


Review of #3365: gtk40 plist cleanup

Verdict: looks good to merge.

  • Read the diff
  • Checked that every removed line still has a guarded counterpart in pkg-plist
  • Checked the options in the Makefile

Findings

  • The 4 gdk/broadway/*.h lines and gsk/broadway/gskbroadwayrenderer.h that were removed are still present with the %%BROADWAY%% guard (lines 14-17 and 102).
  • The 16 removed gdk/x11/*.h lines are still present with %%X11%%. grep finds 16 guarded entries and no unguarded x11/gdkx entries.
  • sort pkg-plist | uniq -d reports no duplicate lines.
  • In the Makefile, BROADWAY is in OPTIONS_DEFINE but not in OPTIONS_DEFAULT. That explains why the unguarded broadway headers failed fake by default.
  • X11 is in OPTIONS_DEFAULT, so the default package contents stay the same. Skipping the PORTREVISION bump is reasonable.

Not verified

  • I did not run a build. I relied on the PR's stated bmake fake package results (amd64, WITHOUT="BROADWAY GSTREAMER"). I also did not check a build with BROADWAY on or X11 off.

No changes were pushed.

@laffer1
laffer1 merged commit 9dfc0fe into master Nov 17, 2026
10 checks passed
@laffer1
laffer1 deleted the x11-toolkits/gtk40-plist branch November 17, 2026 02:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant