-
Notifications
You must be signed in to change notification settings - Fork 93
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Gnome 3.32 support - alternative pull request #312
Conversation
Removed a broken URL in the docs to make the CI pass. |
I would rather not be associated with this, thank you. :) |
@ernestask Why? He makes it more clear |
If Martin here wants to get more internet points so badly that the usual review process seems too slow, so be it. I’m past caring by now. |
@ernestask, I assure you I was not after "internet points". I thought I'd given you the credits you deserve. I'm sorry if you feel otherwise. I certainly did not want to annoy you, or steal any "points" from anyone. The reason I created this PR is this: I was looking at #308, and found if very hard to review because of the big amount of changes in a single patch. I could have reviewed #308, asking you to split your patch yourself. But you had already indicated that you were not interested in investing more time into the issue. Therefore I did it myself. Maybe I should have submitted a PR to your branch rather than to the main repo, but I couldn't figure out how to do that without reverting your patches first. In any case, you did the main work, and if anyone is to be credited, it should be you, not me. |
@elbenfreund, for clarification: if you intend to merge changes for 3.32, I have no objections if you merge #308 rather than this PR. As already indicated, the two approaches are technically equiv |
Closing in favor of #316. |
@ernestask Indeed, it would have been better to discuss the splitting beforehand,
So you are not alone. Hope to see you contributing on the main hamster ! |
Indeed, I wasn't aware of this practice. But I've clearly given @ernestask credit both in the commit messages and in the head of this PR. I have absolutely no issue with naming @ernestask in the
Now this is a completely different issue. openSUSE requests are not about authorship, they are simply part of the work flow of integrating updates or bug fixes in the distribution. My name in the changelog does not mean that I claim authorship or credits for the changes in the request. It means that I'm responsible for pushing the changes to openSUSE. In the case you mention, I was trying to speed up things. I could have rejected your request, and left it to you to figure out how to fix it. That would most likely have taken several hops, wasting both your time and mine. Instead I fixed it myself. I can assure you that this happens all the time in the openSUSE submission work flow. This is the first time I've seen a complaint about it. |
This comment has been minimized.
This comment has been minimized.
I hope your grudge against myself has diminished over time. Let me reaffirm that my intention has never been to claim credits for your work. #316, which is based on this PR and thus on the work you did, is going to be merged soon, and before that happens, I'd like to ask you whether you'd like to be given credit in the form of |
@ernestask, gentle reminder. You don't have to respond of course, but please understand that we will merge #316 very soon either way. |
Rebased on top of current develop, changed commit messages of ba2f868 and |
This functionality is provided by ExtensionUtils in GNOME 3.32.
The class syntax is unsupported in pre-ES6 versions, and using ExtensionUtils instead of convenience.js is only possible in 3.32.
This patch is heavily based on original work by Ernestas Kulik <ekulik@redhat.com>. This patch is required to make hamster-shell-extension work on GNOME 3.32. At the same time, it breaks compatibility with older gnome-shell versions that don't support ES6 class syntax. See https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/361 Fixes projecthamster#307
I haven't found a more elegant way to fix these warnings, which break "make test-style".
Code cleanup. Mostly gets rid of the Lang module. Don't use arrow functions just yet.
This patch is heavily based on original work by Ernestas Kulik <ekulik@redhat.com>. Continue port to ES6 by converting the Controller class, too. This is not strictly necessary to make the extension work, but allows dropping the "Lang" module. This patch deliberately breaks indentation, for ease of review.
Patch "Port non-GObject class to JS6" introduced indentation problems. Fix them.
The site seems to be down, and no obvious replacement exists. This breaks the CI.
Rebased on current develop branch. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To my eyes, this looks good, but I haven't been able to test it / make use of it, as I'm on an older Shell. But it follows the semver release pattern that we had been planning, and I much appreciate the order that changes and deprecation happens in 👍
@DirkHoffmann, @hedayat, gentle reminder. If you don't care, please indicate that at least. |
I can make a test over the week-end, because I am still working daily with a 3.32 shell (unless @hedayat wants to do it, but I think he is already on a newer system). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry to be late. Looks OK.
Yep, I'm already on 3.36. I usually jump to next Fedora when its Beta comes. |
@DirkHoffmann, have you been able to do the test you talked about? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a small remark: The Makefile
should be completed with some explanations, namely what clean
and clean-docs
do exactly. I think it is "do all cleans at once" and "clean only doc directory", and I can submit such a PR of course. I am not sure on which branch I should commit it though, because it should go to all branches for the various shell versions.
I did
git fetch origin refs/pull/312/head
git checkout -b mwilck/GNOME-3.32 FETCH_HEAD
and after installation, following the now-up-to-date instructions (Thanks!), I found my shell extension working in production exactly as before. So this PR is approved by me, too.
Finally, I gave gh
(as proposed for local checkout/review) a try, installed it and (in the same directory):
[hoffmann hamster-shell-extension]$ gh pr checkout 312
Switched to branch 'GNOME-3.32'
Your branch and 'remotes/mwilck/GNOME-3.32' have diverged,
and have 12 and 19 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
fatal: Not possible to fast-forward, aborting.
exit status 128
So I am puzzled here, although it has nothing to do with the PR itself, of course.
There was a force-push 8 days ago. I'm not familiar with the tool that you are using, but it sounds like you have a local branch 'GNOME-3.32' that has a history from before that force-push. It's not to say that force-pushing is bad, but you have to anticipate them sometimes.. if you're not working in the branch anyways, it's harmless to delete it with |
Merged Dirk Hoffmann's README change.
Definitely @mwilck -- I did mean as reviewers of a PR, we have to anticipate that there is a force-push once in a while 👍 |
To avoid another force-push after merging #303, I've merged the develop branch locally and pushed a README change about the GNOME shell version compatibility. |
So, given that all reviewers have approved, I'll move forward here. |
I think the only person who can do it right now is @elbenfreund. |
I had not answered this. Maybe for our general culture?
Actually this is what github suggests (
Yes, understood. Thank you. Never mind. |
This PR aims to fix #307. It is almost equivalent to #308, and very heavily based on @ernestask's work there.
Differences are:
If we want to support older GNOME versions in the future, we'll need to fork.
Note that the only parts that are necessary to make hamster-shell-extension work with GNOME 3.32 are 78bc2ff (plus the fix 76e961c) and 0621854.