ungoogled-software / ungoogled-chromium-archlinux

Arch Linux packaging for ungoogled-chromium
BSD 3-Clause "New" or "Revised" License
338 stars 37 forks source link

error during patch phase #270

Closed Brli closed 2 months ago

Brli commented 2 months ago
INFO: * Applying missing-dependencies.patch (1/106)
patching file chrome/browser/extensions/BUILD.gn
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file chrome/browser/extensions/BUILD.gn.rej
patching file chrome/common/BUILD.gn
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file chrome/common/BUILD.gn.rej
patching file content/browser/BUILD.gn
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file content/browser/BUILD.gn.rej
patching file services/passage_embeddings/BUILD.gn
Traceback (most recent call last):
  File "/build/ungoogled-chromium/src/ungoogled-chromium-126.0.6478.55-1/utils/patches.py", line 257, in <module>
    main()
  File "/build/ungoogled-chromium/src/ungoogled-chromium-126.0.6478.55-1/utils/patches.py", line 253, in main
    args.callback(args, parser.error)
  File "/build/ungoogled-chromium/src/ungoogled-chromium-126.0.6478.55-1/utils/patches.py", line 204, in _apply_callback
    apply_patches(generate_patches_from_series(patch_dir, resolve=True),
  File "/build/ungoogled-chromium/src/ungoogled-chromium-126.0.6478.55-1/utils/patches.py", line 138, in apply_patches
    subprocess.run(cmd, check=True)
  File "/usr/lib/python3.12/subprocess.py", line 571, in run
    raise CalledProcessError(retcode, process.args,

it seems to be in conflicts with ninja-out-of-order-generation-fix.patch

Also, the pkgbuild of this repo is out-of-sync with what's offered in [AUR](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=ungoogled-chromium

PF4Public commented 2 months ago

it seems to be in conflicts with ninja-out-of-order-generation-fix.patch

Both patches serve the same purpose.

networkException commented 2 months ago

Ah, my bad, I forgot that this is now included upstream.

Also, the pkgbuild of this repo is out-of-sync with what's offered in [AUR]

the non -bin aur version is maintained by someone else

ptr1337 commented 2 months ago

the non -bin aur version is maintained by someone else

The package is generally poorly and slow maintained. If you the AUR maintainer of it, would be interested to give someone co-maintainer - we would welcome it.

jstkdng commented 2 months ago

The package is generally poorly

rude

and slow maintained

that might be true, but that happens when the maintainers are volunteers and it can happen to anyone

If you the AUR maintainer of it, would be interested to give someone co-maintainer - we would welcome it.

I'm actually a co-maintainer and handled everything before @networkException came in. I think it'd be better to integrate the OBS workflow for the AUR as well. We'd need to ask seppia (https://aur.archlinux.org/account/seppia) to give maintainer to us or just fill an orphan request.

Edit: already submitted a request, we'll see what happens

networkException commented 2 months ago

Looks like the maintainance status got transferred fully?

I guess we'll adjust the CI here to just push this repo to the AUR minus some folders and with a .SRCINFO

jstkdng commented 2 months ago

we need another user and add that user's ssh key here.

networkException commented 2 months ago

for -bin I use my personal account's ssh key (which isn't used anywhere else)

jstkdng commented 2 months ago

alright then, just added your account.

inb4 jia tan 2.0

networkException commented 2 months ago

inb4 jia tan 2.0

:( /lh

(with what's publically accessible online about me that'd be a pretty bad idea though lol)

I added a new CI step and pushed a new tag, looks good so far. I copied things that looked important from the other PKGBUILD, feel free to add things back if needed though.