Skip to content

Conversation

@Kekun
Copy link
Contributor

@Kekun Kekun commented Oct 14, 2025

This overrides GNOME Shell from gnome-build-meta by https://github.com/Kekun/eos-gnome-shell/tree/eos7.0, a fork of https://github.com/endlessm/gnome-shell that rebases its commits from 43.9 to 48.4.

Compared to https://github.com/endlessm/gnome-shell, https://github.com/Kekun/eos-gnome-shell/tree/eos7.0:

  • removes commits that have been mainlined and are hence already there
  • removes commits that have been added and reverted in the branch
  • removes the "New translations from Transifex" commits as updating them requires tons of tedious manual work
  • doesn't merge fixup commits (yet): what are Endless' best practices in that regard?
  • put fixup commits next to the original commit when possible, to make them easier to read

I did my best to fix all the build time and runtime issues I encountered, though some may have slipped through. Assume this requires thorough testing as Shell evolved quite a bit in the 2½ years gap that separate 43 from 48.

Once we are happy with the change, how should https://github.com/Kekun/eos-gnome-shell/tree/eos7.0 be upstreamed to https://github.com/endlessm/gnome-shell?

This fixes #12.

@Kekun Kekun force-pushed the adrienplazas/payg-ui branch from f6f464d to 34c21dc Compare October 15, 2025 08:39
- kind: git_module
url: github:ptomato/jasmine-gjs.git
path: subprojects/jasmine-gjs
ref: 856465dddbd92e82e574891e1ebc79e17d7b708a
Copy link
Contributor

Choose a reason for hiding this comment

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

Surprised that the build dependency gnome-build-meta.bst:core-deps/jasmine-gjs.bst does not help here

Copy link
Contributor

Choose a reason for hiding this comment

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

I build without github:ptomato/jasmine-gjs.git locally successfully.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Mmh… OK I'll check this out. I wonder why it didn't pick the system-wide one up here.

@starnight
Copy link
Contributor

Thanks!

doesn't merge fixup commits (yet): what are Endless' best practices in that regard?

EOS will merge the fixup commits into the related commits when every rebase.

Once we are happy with the change, how should https://github.com/Kekun/eos-gnome-shell/tree/eos7.0 be upstreamed to https://github.com/endlessm/gnome-shell?

EOS staff will force push it the master branch after test.

@starnight
Copy link
Contributor

starnight commented Oct 20, 2025

Just notice this branch has not rebased on the latest main branch. So, the filesystem has not included eos-payg-nonfree, yet.

starnight added a commit that referenced this pull request Oct 20, 2025
Both EOS non-PAYG and PAYG system share the same OSTree branch. Which
means they all have PAYG components. So, install eos-payg.bst and
eos-payg-nonfree.bst directly. And, build eos-payg.bst and
eos-payg-nonfree.bst by following current eos-payg & eos-payg-nonfree's
build configuration.

Part-of: #165
starnight added a commit that referenced this pull request Oct 20, 2025
Both EOS non-PAYG and PAYG system share the same OSTree branch. Which
means they all have PAYG components. So, install eos-payg.bst and
eos-payg-nonfree.bst directly. And, build eos-payg.bst and
eos-payg-nonfree.bst by following current eos-payg & eos-payg-nonfree's
build configuration.

Part-of: #165
starnight added a commit that referenced this pull request Oct 21, 2025
Build eos-payg.bst and eos-payg-nonfree.bst by following current EOS 6
eos-payg & eos-payg-nonfree's build configuration.

Part-of: #165
This was referenced Oct 23, 2025
@starnight
Copy link
Contributor

The test needs #199, too

@Kekun Kekun force-pushed the adrienplazas/payg-ui branch 2 times, most recently from 69b48e6 to b086cc5 Compare October 28, 2025 08:23
@Kekun Kekun force-pushed the adrienplazas/payg-ui branch 2 times, most recently from f4fe0a7 to 2d62d2e Compare October 29, 2025 09:35
@starnight
Copy link
Contributor

I have squashed the fixup commits in @Kekun's gnome-shell branch, then pushed into EOS gnome-shell as branch 12-gnome-shell-48.4. Please update gnome-shell.bst's source, too.

After fix, I think it is good to merge, then let it build and test the image.

@Kekun Kekun force-pushed the adrienplazas/payg-ui branch from 2d62d2e to 3213a5b Compare October 29, 2025 10:44
@Kekun
Copy link
Contributor Author

Kekun commented Oct 29, 2025

Thanks! It's now updated. 🙂

@Kekun
Copy link
Contributor Author

Kekun commented Oct 30, 2025

Let me know if anything is needed from me to merge this. 🙂

@starnight starnight changed the title WIP: PAYG UI PAYG UI Oct 31, 2025
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.

PAYG UI

3 participants