xxdiff icon indicating copy to clipboard operation
xxdiff copied to clipboard

patches from the Debian xxdiff package

Open blais opened this issue 9 years ago • 5 comments

Original report by Anonymous.


Hi,

the Debian package for xxdiff contains a number of patches, some of them for many years. The current list (and content) can be found at http://anonscm.debian.org/cgit/collab-maint/xxdiff.git/tree/debian/patches

While some of them may be Debian-specific, especially the ones fixing typos (03, 11) should have been sent to you long ago...

blais avatar Dec 21 '15 21:12 blais

Original comment by Martin Blais (Bitbucket: blais, GitHub: blais).


Thanks for sharing this. I'll try to apply those eventually. Going on vacation now, will need some time.

blais avatar Dec 23 '15 07:12 blais

Original comment by Martin Blais (Bitbucket: blais, GitHub: blais).


Thanks for pointing this out. I'll look into it.

blais avatar Jan 03 '16 15:01 blais

Original comment by Martin Blais (Bitbucket: blais, GitHub: blais).


Patches applied:

01_script_not_executable.patch 02_doc_furius.ca_href.patch 03_cvsrevcomp_cmp_typo.patch 04_build_setup_paths.patch 05_417780_gcc4.3_ftbfs.patch 08_516143_xml_is_text.patch 11_spelling.patch 12_hardening.patch

Patches not applied:

10_fix-privacy-breach.patch

I need these links in order to serve the documents from my website. I'll
have to find some other solution, maybe host the image locally.
Unfortunately, this affects all my other projects so it's a lot more work to
fix than it appears.

06_user_commands_menu.patch

This didn't compile. I'd like to merge it eventually, but I need to spend some
time looking at it. Time is short right now.

13_install-all-scripts.patch

termdiff should not be installed. It's simply not ready yet.

blais avatar Jan 03 '16 16:01 blais

Original comment by Florian Schlichting (Bitbucket: fschlich, GitHub: fschlich).


Hi Martin,

thanks for applying those. There are two more that I'd like to draw your attention to:

  • https://anonscm.debian.org/cgit/collab-maint/xxdiff.git/tree/debian/patches/14_spelling.patch - the Debian QA tool now finds even more typos...

  • https://anonscm.debian.org/cgit/collab-maint/xxdiff.git/tree/debian/patches/c++11.patch - building against Qt5 seems to require at least C++11 (verbose error messages insist and the internet seems to confirm this, although I haven't come across a formal announcement that would explain from what version of Qt5 or the like...)

Florian

blais avatar Sep 18 '17 19:09 blais

Debian moved to a self-hosted gitlab instance, the patches can now be viewed here: https://salsa.debian.org/debian/xxdiff/-/tree/master/debian/patches

of these, 14_spelling.patch is PR #14 and 15_python2_interpreter.patch is really only relevant for the upcoming Debian release, which leaves 06_user_commands_menu.patch which is an interesting enhancement but needs some work as you wrote above.

fschlich avatar Nov 25 '20 16:11 fschlich