Skip to content

Add LibreMerge - #3863

Merged
probonopd merged 2 commits into
AppImage:masterfrom
iagodpassos:add-libremerge
Sep 27, 2026
Merged

probonopd merged 2 commits into
AppImage:masterfrom
iagodpassos:add-libremerge

Conversation

@iagodpassos

Copy link
Copy Markdown
Contributor

Adds LibreMerge, a free differencing and merging tool for Linux and macOS (GPL-3.0-or-later): a Qt 6 port of the WinMerge comparison engine with side-by-side file compare and merge (2- and 3-way), folder comparison, CSV/TSV table comparison, image comparison, syntax highlighting, and light/dark themes.

AppImages for x86_64 and aarch64 are published on the GitHub releases page. The x86_64 AppImage was tested on a clean Ubuntu 22.04 (offscreen and X11/Xvfb) with the app's built-in selftests.

@probonopd probonopd closed this Sep 26, 2026
@probonopd probonopd reopened this Sep 26, 2026
@github-actions

github-actions Bot commented Sep 26, 2026 •

Copy link
Copy Markdown
Contributor

✅ Test passed

Please check that the screenshot shows the application's main window.

LibreMerge

LibreMerge

Compatibility: not self-contained: uses the C library of the system; references glibc 2.35

Warnings:

Commit 310e592. Full log

@probonopd probonopd closed this Sep 26, 2026
@probonopd probonopd reopened this Sep 26, 2026
@github-actions github-actions Bot added error-app-exits Test failed: the application quit or crashed right after starting error-glibc-too-new Test failed: built on a too new system (needs a newer glibc) labels Sep 26, 2026
iagodpassos added a commit to iagodpassos/libremerge that referenced this pull request Sep 27, 2026
AppImageHub's test (AppImage/appimage.github.io#3863) fails since 0.9.3:
"GLIBC_2.36 not found (required by .../libarchive.so.13)" on its Ubuntu
22.04 runner. Of everything the AppImage bundles, only Debian 12's
libarchive13 needs glibc 2.36, for one symbol, arc4random_buf; 0.8.0,
before libarchive, passed there.

make_appimage.sh now builds libarchive 3.8.1 from source (checksum
pinned; the dmg's version and options) with HAVE_ARC4RANDOM_BUF off, so
it uses its own generator, points the app build and linuxdeploy at it,
and checks it links zlib, bzip2, liblzma and zstd, since a missing -dev
package would silently drop a codec. A final check fails the build when
anything in the AppDir needs glibc newer than 2.35.

Both AppImages open on a clean Ubuntu 22.04 (glibc 2.35), x86_64 and
arm64, and pass all 28 selftests there, the archive ones included.
@iagodpassos

Copy link
Copy Markdown
Contributor Author

The failure was on our side: since 0.9.3 the AppImage bundled Debian 12's libarchive, which needs glibc 2.36 for a single function, arc4random_buf. LibreMerge 0.9.6 builds libarchive without it, and our build now fails if anything bundled needs glibc newer than 2.35; the AppImages run on a clean Ubuntu 22.04. I pushed an empty commit to re-run the test. Thanks for looking at it, @probonopd!

@github-actions github-actions Bot added screenshot-ok Test passed; the screenshot was checked and looks fine and removed error-app-exits Test failed: the application quit or crashed right after starting error-glibc-too-new Test failed: built on a too new system (needs a newer glibc) labels Sep 27, 2026
@probonopd
probonopd merged commit 088a44a into AppImage:master Sep 27, 2026
2 checks passed
@iagodpassos
iagodpassos deleted the add-libremerge branch September 27, 2026 21:58
@iagodpassos

Copy link
Copy Markdown
Contributor Author

/retest

@probonopd probonopd mentioned this pull request Oct 1, 2026
@github-actions

github-actions Bot commented Oct 1, 2026

Copy link
Copy Markdown
Contributor

This pull request is merged, so its entries are tested again in a new pull request: #9571. Please follow the test there (comment /retest there to test again); this conversation is locked now.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Oct 1, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

screenshot-ok Test passed; the screenshot was checked and looks fine

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants