diff -Nru xxdiff-5.1+git20220924+dfsg/debian/changelog xxdiff-5.1+git20220924+dfsg/debian/changelog
--- xxdiff-5.1+git20220924+dfsg/debian/changelog	2024-04-08 15:52:10.000000000 +0100
+++ xxdiff-5.1+git20220924+dfsg/debian/changelog	2024-05-03 20:25:08.000000000 +0100
@@ -1,3 +1,9 @@
+xxdiff (1:5.1+git20220924+dfsg-1ubuntu0.24.04.1) noble; urgency=medium
+
+  * Fix compatibility with Python3. (LP: #2061637)
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Fri, 03 May 2024 20:25:08 +0100
+
 xxdiff (1:5.1+git20220924+dfsg-1build3) noble; urgency=high
 
   * No change rebuild against libqt5core5t64, libqt5gui5t64,
diff -Nru xxdiff-5.1+git20220924+dfsg/debian/patches/0001-Fix-Python3-incompatibility.patch xxdiff-5.1+git20220924+dfsg/debian/patches/0001-Fix-Python3-incompatibility.patch
--- xxdiff-5.1+git20220924+dfsg/debian/patches/0001-Fix-Python3-incompatibility.patch	1970-01-01 01:00:00.000000000 +0100
+++ xxdiff-5.1+git20220924+dfsg/debian/patches/0001-Fix-Python3-incompatibility.patch	2024-05-03 20:25:00.000000000 +0100
@@ -0,0 +1,63 @@
+From b9d18e48c6d8e01942af61829e952788fc25a658 Mon Sep 17 00:00:00 2001
+From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Date: Tue, 16 Apr 2024 19:17:32 +0100
+Subject: [PATCH] Fix Python3 incompatibility
+
+Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+
+Origin: upstream, https://github.com/blais/xxdiff/commit/b9d18e48c6d8e01942af61829e952788fc25a658
+Bug-Ubuntu: https://launchpad.net/bugs/2061637
+Last-Update: 2024-04-16
+---
+ bin/xx-p4-unmerge |  7 ++++++-
+ bin/xx-svn-review | 13 +++++++++++--
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/bin/xx-p4-unmerge b/bin/xx-p4-unmerge
+index 21c9d7e..3dd9199 100755
+--- a/bin/xx-p4-unmerge
++++ b/bin/xx-p4-unmerge
+@@ -5,7 +5,12 @@ files and invoke xxdiff on it.
+ """
+ 
+ # stdlib imports
+-import sys, os, shutil, re, StringIO, tempfile
++import sys, os, shutil, re, tempfile
++
++try:
++    from StringIO import StringIO ## for Python 2
++except ImportError:
++    from io import StringIO ## for Python 3
+ 
+ # xxdiff imports
+ from xxdiff import invoke
+diff --git a/bin/xx-svn-review b/bin/xx-svn-review
+index 3b1b395..6f94f59 100755
+--- a/bin/xx-svn-review
++++ b/bin/xx-svn-review
+@@ -4,11 +4,20 @@ Usage: REV1 REV2
+ Export two SVN revisions and review them.
+ """
+ import sys, os, tempfile, logging, re, shutil
+-from StringIO import StringIO
++
++try:
++    from StringIO import StringIO ## for Python 2
++except ImportError:
++    from io import StringIO ## for Python 3
++
+ from subprocess import *
+ from os.path import *
+ from xml.etree import ElementTree
+-from urlparse import urljoin
++
++try:
++    from urllib.parse import urljoin
++except ImportError:
++    from urlparse import urljoin
+ 
+ 
+ 
+-- 
+2.39.2
+
diff -Nru xxdiff-5.1+git20220924+dfsg/debian/patches/series xxdiff-5.1+git20220924+dfsg/debian/patches/series
--- xxdiff-5.1+git20220924+dfsg/debian/patches/series	2022-12-27 19:44:38.000000000 +0000
+++ xxdiff-5.1+git20220924+dfsg/debian/patches/series	2024-05-03 20:23:00.000000000 +0100
@@ -1,2 +1,3 @@
 # this one needs to be ported
 #06_user_commands_menu.patch
+0001-Fix-Python3-incompatibility.patch