这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@sabamdarif
Copy link
Contributor

close #26742

@robertkirkman
Copy link
Member

@sabamdarif If you cherry-pick this PR, does it work as an alternative solution?

@robertkirkman
Copy link
Member

Another X11 GUI affected by an extremely similar problem is awesome. I am planning to fix it here:

@sabamdarif
Copy link
Contributor Author

@sabamdarif If you cherry-pick this PR, does it work as an alternative solution?

* [Prepare for GLib 2.86.0 typelib break linuxmint/cinnamon#13091](https://github.com/linuxmint/cinnamon/pull/13091)

i will try

@sabamdarif
Copy link
Contributor Author

yes @robertkirkman it did work, i understand now that is the real issue thanks

@sabamdarif sabamdarif changed the title fix(x11/cinnamon): skip desktopappinfo if unavailable fix(x11/cinnamon): use desktopappinfo form giounix not gio Oct 2, 2025
@robertkirkman
Copy link
Member

very good, and should it be called "from" or "form"? I thought it should be "from"

@sabamdarif
Copy link
Contributor Author

o yes wait

@sabamdarif
Copy link
Contributor Author

very good, and should it be called "from" or "form"? I thought it should be "from"

from

@robertkirkman
Copy link
Member

In order to pass the CI it will need to have TERMUX_PKG_REVISION increased by 1 in the build.sh

@TomJo2000
Copy link
Member

That should have already been caught by the linter.

# Check the latest commit that modified `$package`
# It must either:
# - Modify TERMUX_PKG_REVISION
# - Modify TERMUX_PKG_VERSION
# - Or specify one of the CI skip tags
check_version_change() {
local base_commit commit_diff package="$1"
base_commit="$(git merge-base 'master@{upstream}' 'HEAD')"
commit_diff="$(git log --patch "${base_commit}.." -- "$package")"
# If the diff is empty there's no commit modifying that package on this branch, which is a PASS.
[[ -z "$commit_diff" ]] && return
grep -q \
-e '^+TERMUX_PKG_REVISION=' \
-e '^+TERMUX_PKG_VERSION=' \
-e '\[no version check\]' <<< "$commit_diff" \
|| return 1
}

Why wasn't it...

@sabamdarif
Copy link
Contributor Author

In order to pass the CI it will need to have TERMUX_PKG_REVISION increased by 1 in the build.sh

oh yes i forgot about that

@robertkirkman
Copy link
Member

@TomJo2000 I don't fully understand how the linter works, but just looking at the part you highlighted, where does the {upstream} keyword "come from" there and how does the linter know what "upstream" is in that context?

~/code/termux-packages $ cat scripts/lint-packages.sh | grep upstream
        base_commit="$(git merge-base 'master@{upstream}' 'HEAD')"
~/code/termux-packages $

@TomJo2000
Copy link
Member

@TomJo2000 I don't fully understand how the linter works, but just looking at the part you highlighted, where does the {upstream} keyword "come from" there and how does the linter know what "upstream" is in that context?

That's some git-rev syntax1.
image

Footnotes

  1. https://man.archlinux.org/man/git-rev-parse.1#SPECIFYING_REVISIONS:~:text=%5B%3Cbranchname%3E%5D%40%7Bupstream%7D%2C%20e.g.%20master%40%7Bupstream%7D%2C%20%40%7Bu%7D

@robertkirkman
Copy link
Member

@TomJo2000 ok that's great but it doesn't work on my computer (a Termux right now) when I try to test it. How is it meant to work in CI, do I have it set up wrong? Also, can this condition detect a problem if build.sh of the package is not edited (only .patch files edited) in the PR?

Screenshot_20251002-121946_Termux

@TomJo2000
Copy link
Member

TomJo2000 commented Oct 2, 2025

It's supposed to make a diff of the entire branch using git log --patch "${base_commit}.." -- "$package" to look for changes to the package.

$package is $1 of check_version_change...
Which is $package_script, the iterator variable over $@ of linter_main...
And linter_main gets called build.sh locations for all packages that are being linted.
So it should actually be looking at the package directory instead, good catch.

@robertkirkman
Copy link
Member

robertkirkman commented Oct 2, 2025

If you can see my screenshot, do you see as well how my Test.log is empty? it seems like it shouldn't be so that is why i focused on that part first, do you know why that could be? I am concerned a similar problem could be happening in CI.

@TomJo2000
Copy link
Member

If you can see my screenshot, do you see as well how my Test.log is empty? it seems like it shouldn't be so that is why i focused on that part first, do you know why that could be? I am concerned a similar problem could be happening in CI.

I'm guessing there's no branch.<name>.merge set up for the branch.
Can you check the branch entry for that branch in the .git/config of the repo?

@robertkirkman
Copy link
Member

~/code/termux-packages $ cat .git/config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        url = https://github.com/sabamdarif/termux-packages
        fetch = +refs/heads/*:refs/remotes/origin/*
[branch "fix-26742"]
        remote = origin
        merge = refs/heads/fix-26742
~/code/termux-packages $

Maybe the CI doesn't have the correct information configured in git at this point either, but I don't know for sure.

@TomJo2000
Copy link
Member

I'll throw a cat of the .git/config in there for debugging.

TomJo2000 added a commit to TomJo2000/termux-packages-prs that referenced this pull request Oct 2, 2025
TomJo2000 added a commit to TomJo2000/termux-packages-prs that referenced this pull request Oct 2, 2025
@robertkirkman
Copy link
Member

very good, and should it be called "from" or "form"? I thought it should be "from"

from

could you edit the commit to change that?

@sabamdarif
Copy link
Contributor Author

could you edit the commit to change that?

ok

@robertkirkman
Copy link
Member

To me it looks like when you try to change that, it doesn't change anything, maybe the way you are trying to change it isn't working?

image

@sabamdarif
Copy link
Contributor Author

Screenshot From 2025-10-03 11-40-46 Screenshot From 2025-10-03 11-40-57

i added it in both of this palaces, where did you mean ?

@sabamdarif
Copy link
Contributor Author

i use git commit --amend

@robertkirkman
Copy link
Member

Oh, when I asked you did you mean "form" or "from" I meant, about this "form":

image

did you mean this to be "form" or "from"?

@sabamdarif
Copy link
Contributor Author

oh my bad i understand it wrong , wait

@sabamdarif sabamdarif changed the title fix(x11/cinnamon): use desktopappinfo form giounix not gio fix(x11/cinnamon): use desktopappinfo from giounix not gio Oct 3, 2025
@robertkirkman
Copy link
Member

Ok wonderful, now it's ready! I will merge it in 24 hours and I guess I will also merge my similar glib 2.86 compatibility PR for awesome in 24 hours.

@robertkirkman robertkirkman merged commit 6176b92 into termux:master Oct 4, 2025
11 checks passed
@sabamdarif sabamdarif deleted the fix-26742 branch October 4, 2025 06:57
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.

[Bug]: Cinnamon seems broken after few update

3 participants