Skip to content

fix: adopt #750 Utah#629 logo source - #754

Merged
hanthor merged 3 commits into
mainfrom
adopt/750
Oct 28, 2026
Merged

hanthor merged 3 commits into
mainfrom
adopt/750

Conversation

@hanthor

@hanthor hanthor commented Oct 28, 2026

Copy link
Copy Markdown
Member

Summary

Adopts the change from original fork PR #750 by @codebymarshall without changing its authored commit (1b825fc). It implements Utah#629's GNOME Settings > About artwork source by adding the SHA-512-verified bluefin-artwork-logos package from projectbluefin/artwork and pointing gnome-control-center at its light/dark pixmap paths.

The adoption branch merges current main to preserve the original commit and resolve generated package inventory, Packit, backlog, and architecture-count snapshots. The original PR will remain open until this PR merges.

Validation

  • python3 tools/validate.py
  • python3 tools/factory_build_backlog.py --check
  • python3 -m pytest tests/test_source_inventory.py tests/test_architecture_counts.py tests/test_recipe_set_agreement.py
  • just check (1391 passed; 2831 subtests passed)

Canary will be dispatched against this in-repository branch for bluefin-artwork-logos and gnome-control-center.

codebymarshall and others added 2 commits October 27, 2026 23:51
GNOME Settings > About draws its logo from paths compiled into
gnome-control-center. Those were Fedora's pixmaps, which the Utah image
filled with older Bluefin copies from projectbluefin/common.

Add bluefin-artwork-logos, built from projectbluefin/artwork at commit
9ab493b. artwork has no releases and its archive carries every
wallpaper, so a new generator in tools/generated_sources.py fetches the
two logo SVGs and the LICENSE at that commit, checks each file's
SHA-512, and packs them deterministically. The recipe renders the light
(black wordmark) and dark (white wordmark) PNGs 192 px wide, the widest
the About page shows. gnome-control-center now points
-Ddistributor_logo / -Ddark_mode_distributor_logo at those PNGs and
Requires the package.

Assisted-by: Claude Opus 5.5 via Claude Code
Hive-Run: #629
Hive-Plan: issue-629
Hive-Spec: issue-629#acceptance
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: codebymarshall <codebymarshall@users.noreply.github.com>
Preserve the original #750 commit and merge the current main inventory.

Assisted-by: GPT-6 Luna via GitHub Copilot

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@hanthor is auto-promoted for contributor-lane merging on this PR: the last 5 merged PRs by this author in this repository have no revert or sentinel-alert evidence. CI, reviewer verdict, diff fences, soak, holds and branch protection still apply.

@hivecommons-hive hivecommons-hive Bot added author/clanker A contributor's own hive authored this PR under their login dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@hanthor this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Review asks:

  • the branch conflicts with the base and needs a rebase

Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path.

Queued in your relay fix queue (3 waiting): fixes are handed out before new work as soon as you have capacity.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Summary: This change makes the logo shown in GNOME Settings > About come from Bluefin's official artwork repository, pinned to one exact revision with checksums, instead of stale copies. I re-downloaded the three upstream files and rebuilt the generated archive: the checksums match what the change records, and the repository's validators and tests pass. One gap against the issue it addresses (the About-page logo report, #629): that issue asks that two other logo files be either handled or explicitly left out with a reason, and this change says nothing about them.

What I need from you: Add one sentence saying those two logo sets are intentionally out of scope (and why), or handle them.


intent-alignment

  • low, in-scope — #629 acceptance: "fedora-logo-icon.png and the bluefin-logos PNGs are decided in the same change or explicitly left out with a reason." Neither the PR body, the recipe header (packages/bluefin-artwork-logos/bluefin-artwork-logos.spec:1-18), nor #750 mentions /usr/share/pixmaps/fedora-logo-icon.png or /usr/share/ublue-os/bluefin-logos/*.png. Suggested addition to the spec header comment:

    # points at the files this package installs, so the logo is whatever artwork
    # commit is pinned below (projectbluefin/utah-packages#629).
    #
    # Only the About logo is covered here. fedora-logo-icon.png (the os-release
    # LOGO icon) and /usr/share/ublue-os/bluefin-logos/*.png are still supplied
    # by the image build and are left for a follow-up, as #629 allows.
    
  • advisory, out-of-scope — once gnome-control-center reads %{_datadir}/bluefin-artwork-logos/*.png (packages/gnome-control-center/gnome-control-center.spec:168-169), the four /usr/share/pixmaps/fedora* restores in Utah's scripts/configure-branding.sh (cited in #629) no longer affect About; worth a follow-up in projectbluefin/utah so the desktop contract checks the new paths.

Verified at e07a28e: per-file SHA-512s in tools/generated_sources.py:99-105 match raw.githubusercontent.com at commit 9ab493b; generate() reproduces the lock digest 0cd3ce39… (config/upstream-sources.json:6014, packages/bluefin-artwork-logos/sources:1); tools/validate.py → 629/5 upstream as docs/architecture.md:144 states; 94 tests pass. Not verified: the 192 px About-logo clamp claimed in the spec header (:16-18).

No findings from: correctness, security, style, docs-currency.

Confidence: 3/5 (needs attention) — 1 perspective requested changes

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Hive filed review findings that do not block this PR as backlog items:

Cap: 10 backlog item(s) per PR per day.

Keep the original PR commit while including current main's strace inventory.

Assisted-by: GPT-6 Luna via GitHub Copilot

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@hanthor this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Failing checks:

  • check-failure

Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path.

Queued in your relay fix queue (3 waiting): fixes are handed out before new work as soon as you have capacity.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Summary: This change makes the "About" page in GNOME Settings show the current Bluefin logo, pulled from Bluefin's official artwork repository at a fixed, checksum-verified commit, instead of old copies. The code and tests are sound. One small gap: the original issue asked that the other old logo files be either replaced or explicitly left out with a written reason, and that reason currently lives only in the superseded pull request, not in anything that lands in this repository.

What I need from you: Add the two-line note to the package header (suggestion below); the rest is advisory.


Reviewed head 949c0ec.

intent-alignment

  • low, in-scope — #629's acceptance says fedora-logo-icon.png and the bluefin-logos PNGs must be "decided in the same change or explicitly left out with a reason". #750's body gives the reason ("About reads only the two meson paths ... The spec header records this"), but the header at packages/bluefin-artwork-logos/bluefin-artwork-logos.spec:1-18 does not mention either file, and this PR's body drops the paragraph entirely. Once #750 closes, nothing in-tree records the decision. Suggested addition after line 8:

    # commit is pinned below (projectbluefin/utah-packages#629).
    #
    # Left out on purpose (#629): About does not read the os-release LOGO icon
    # (/usr/share/pixmaps/fedora-logo-icon.png) or /usr/share/ublue-os/bluefin-logos/*.png,
    # so those stay with Utah's image build.
    
  • info, out-of-scope — after this lands, scripts/configure-branding.sh in projectbluefin/utah still restores the four /usr/share/pixmaps/fedora* files that gnome-control-center.spec:168-169 no longer reads. Follow-up in the Utah repo, not here.

style

  • low, in-scope — config/upstream-sources.json:6012 is the only lock entry whose version is an unexpanded macro string (0^%{gitdate}git%{shortcommit}); every other entry, generated ones included (fpaste, tailscale), carries a literal. spec_version() (tools/generated_sources.py:133-138) returns the raw tag, and test_the_lock_entry_matches_the_metadata pins the lock to it, so a fix touches the metadata function and the lock together:

    --- a/tools/generated_sources.py
    +++ b/tools/generated_sources.py
    @@ def _bluefin_artwork_metadata(package_dir: Path) -> dict:
         commit = _bluefin_artwork_commit(package_dir)
         filename = f"bluefin-artwork-logos-{commit[:7]}.tar.xz"
    +    macros = recipe_macros((package_dir / "bluefin-artwork-logos.spec").read_text())
    +    version = f"0^{macros['gitdate']}git{commit[:7]}"
         ...
    -        "version": spec_version(package_dir, "bluefin-artwork-logos.spec"),
    +        "version": version,

    and "version": "0^20261027git9ab493b" at config/upstream-sources.json:6012. Advisory.

correctness

  • info, in-scope — the PR's factory run (40610074672) rebuilt only libical, vulkan-headers, vulkan-loader; neither bluefin-artwork-logos nor gnome-control-center was built, so the new spec (rsvg-convert in %build, %check) is unexercised until the canary the body promises. pass3 / preflight failed but is the advisory job. Transform/generator logic is covered by tests/test_generated_sources.py:416-469 and tests/test_generated_sources_generate.py:219-262.

No findings from: security, docs-currency.

Confidence: 3/5 (needs attention) — 1 perspective requested changes

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

🐝 Possible duplicate

This PR changes exactly the same files as #750, which was opened first:

Evidence — identical changed-file set (11 file(s)):

  • .packit.yaml
  • config/upstream-sources.json
  • docs/architecture.md
  • docs/skills/supply-chain-provenance.md
  • packages/bluefin-artwork-logos/.hummingbird-upstream.json
  • packages/bluefin-artwork-logos/bluefin-artwork-logos.spec
  • packages/bluefin-artwork-logos/sources
  • packages/gnome-control-center/gnome-control-center.spec
  • tests/test_generated_sources.py
  • tests/test_generated_sources_generate.py
  • …and 1 more

This is a suggestion, not a verdict. Hive will not close, label, approve or merge anything here — a human decides.

It was produced by comparing changed-file sets across open PRs, which is a candidate generator: PRs that share a file are not necessarily the same work. Here the patches DIFFER, so this is the weaker tier: dependency-bump PRs that edit one shared manifest, and unrelated fixes to one busy file, both land in it. Read the diffs before acting.

@hivecommons-hive hivecommons-hive Bot added stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hanthor
hanthor merged commit 0787c2b into main Oct 28, 2026
650 of 653 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author/clanker A contributor's own hive authored this PR under their login dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants