Oolite Bulletins

git merge doesn't seem to be able to start merging at a specific point. It looks for the common ancestor between the branches and starts there. I think that works great if one of the branches didn't get commits after that common ancestor or they change different parts of the sourcecode. With 2 branc...

Setting this should not be necessary: ESPEAK_DATA_PATH=/usr/share/espeak-ng-data/. The Oolite build copies the espeak-ng-data folder from the installed package during build into Resources and modifies one voice (another_commanders change of the female voice). It was necessary to set that var to get...

Conflict resolution and whether that's different between merge and cherry-pick . I kinda expect both will require the same manual adjustments . EDIT New repo created from oolite on github with 2 copied branches : master & 1.92-maintenance and 2 new ones : cherry & merge To avoid issues this ...

The thing I'm puzzled about in your package is how the Resources folder gets found as I thought it has to be in the same folder as the oolite binary. I can't see anything in the code that gets oolite to look in /usr/share/oolite/Resources or ../share/oolite/Resources. I guess it's a GNUstep thing, ...

That suggests the scripts perform these functions : install , first_run & user config , start oolite . I'll need to replicate the installer part in the PKGBUILD, for first_run & user config I'll need one or more user scripts that will probably be called from a wrapper to start oolite. PKGBUI...

That clarifies how it happened. I do remember the script was present in 1.92 but it wasn't started from oolite.desktop so I didn't look at it. The pngs in that folder are screenshots and don't match the oolite logo used as icon. For now I'll copy oolite.desktop and oolite-icon.png from master (which...

Keep in mind that proton is a downstream fork of wine so only usable to run windows games gamescope is a great addition but usable on most linux distros. I have been reading about SteamOS and was fascinated to learn their plan for 2026 to open it to other hardware. That other hardware seems to be ha...

It would have been nice if you had alerted me to that. You do realise who maintains aur oolite & oolite-git ? I am looking at updating the package to the last commit of the 1.92.maintenance branch , but hit a snag. https://github.com/OoliteProject/oolite/pull/561 changed a lot of things in src/o...

keep in mind that there are now 2 things needed to switch from gcc to clang - gnustep libobjc2, gnustep-make , gnustep-base build with clang - libjs build with clang This will lead to having to support 2 deviating sets of 4 libraries with oolite : one build with clang and one build with gcc Or is th...

I've figured out what went wrong and now use these commands to prepare everything : $ git clone https://github.com/OoliteProject/oolite $ git checkout 1.92-maintenance $ git switch master $ git remote set-url origin git@git.sr.ht:~lone_wolf/repo-name # replace with correct name $ git push $ git bran...

Merging the first differing commit will fail as that updates the version from 1.92 to 1.92.1 and master is at 1.93 The change in the 2nd commit is already present in master. Both will have to be skipped and documented why they are skipped. git cherry-pick does use git merge but is a lot more flexibl...

hiran wrote: ↑Wed Mar 25, 2026 6:43 am

I am with you but would like to track such activity on a backlog. It would allow others to add ideas and more people to work in the same direction.

Tracking/documenting this would also make it easier to adjust/update the baseline (assuming it's defined before this change happens) .

-j16 will slow compiling and cause OOM to abort the compilation (or other programs like a browser, DE etc) if the host system lacks cores/threads or memory .

Use make -j$(nproc) instead .

@hiran & @phkb : wouldn't that require changing the default branch ? Great! As you investigate, please can you find out about the following questions (I often find that the devil is in the details): I'm currently reading up on git-cherry-pick and git-merge manpages and can give partial answers a...

First off : I have no personal experience with cherry-pick . Yesterday I entered "git how to port multiple commits from one branch to another" into DDG and every result was about cherry-pick . I do know that archlinux & mesa devs use cherry-picking so I felt mentioning it in the PR as ...