Solved (New user) How to add a commit to a port (xorg-server) ?

Hello !
I'm a bit new to FreeBSD and I've been using up to now packages, as it's far easier to start like I do.
Anyway, I'm following this link to set my Optimus laptop ready, and I need to add this commit to the xorg-server port before make it (I'll also have to remove the xorg-server package, hoping not to break everything... Too bad the commit is not in the pkg).

But I don't know to add it, and I haven't seen anything about this in the handbook.

Can someone tell me how to do this ? Do I have to do a git clone ? I think it's very basic, but I don't know at all and without this, I can't finalize my setup...

Thanks very much !!
 
I second grahamperrin - if the commit is such old, I'd double check if it is really not in ports.

If the commit is really missing and you need to apply it, there are at least 2 ways:
1. The hacky way: Execute make extract and apply the commit manually in the work subdirectory.
2. The clean way: If the commit is really not in the port but helps on FreeBSD, you might want to create a files/patch* which applies the commit as patch file. That patch can the be submitted to FreeBSD Bugzilla requesting a commit to the FreeBSD ports git.

In any case before building the port I would run make install-missing-packages in the port directory upfront in order to avoid a chaotic mixing of ports and packages.
 
… referenced commit was/is for x11-servers/xwayland. …

I saw it as also, more broadly, on the master branch:

1698719917829.png
 
Point 1 can be worked around by adding this commit as a port-local patch in the xorg-server port.
Oh, right. Downloaded the patch file from that commit. You can 'massage' the diffs to create patch-* files that go in the files/ directory of x11-servers/xorg-server. But that's easier said than done. One of the files that need to be modified already has an existing patch-* file. You'll need to 'mash' those together.
 
@ashafer ping, anything to add? TIA

In Discord, he replied:

❝That change isn’t in the latest port’s X version but it’s a patch in the ports tree iirc❞

Perceval you can simply install the FreeBSD-provided package.

ashafer (Austin Shafer) is correct.

Perceval you linked to commit 5468123822bbe8cd0a0abe07bbbd3a9cb14ed2cb, which is visible in FreshPorts, with Austin's name:
1699143930664.png

Linked from FreshPorts (the GitHub icon in the first column):




My bad:

… on the master branch: …

I wasn't thinking entirely straight. Sorry.

(A mental block, involving FreeBSD and the cherry-picking tradition (the absence of a branch for a commit does not necessarily mean that the stuff is not on the branch).)
 
Hello,
First of all - sorry for my late response, I didn't see there were new stuff on the thread !
I'd like to thank you all, as these parts are really obscure to me and I need to train myself on these.
I now know I can search the commit the way you did Graham, and thanks to Elgrande, I'll test these on NomadBSD (maybe on this commit, it's only to train myself and it's not very important if I break a NomadBSD, as I don't touch my FreeBSD setup).
Thank you again, I'll mark the thread solved as you both replied on how to add a commit... !

EDIT : I hope to do so, as there's no option... Is it because I'm a new user ?
 
EDIT : I hope to do so, as there's no option... Is it because I'm a new user ?

That's correct; one more post and you'll have more options. As soon as you clear 10 posts and 10 days of membership (both), your posts are no longer held for moderation, for example.
 
Thank you !
I have lots of other questions to "upgrade my score" but I try first to find by my own before hijacking another thread or start an already stated problem thread ?
Thanks again...
 
Back
Top