diff -pruN 1.4.3+ds-1/debian/changelog 1.4.3+ds-2/debian/changelog
--- 1.4.3+ds-1/debian/changelog	2022-07-27 09:19:08.000000000 +0000
+++ 1.4.3+ds-2/debian/changelog	2022-08-01 16:17:42.000000000 +0000
@@ -1,3 +1,9 @@
+nanoflann (1.4.3+ds-2) unstable; urgency=medium
+
+  * Avoid conflicts with None macro from X11.h (Closes: #1016245)
+
+ -- Timo Röhling <roehling@debian.org>  Mon, 01 Aug 2022 18:17:42 +0200
+
 nanoflann (1.4.3+ds-1) unstable; urgency=medium
 
   * New upstream version 1.4.3+ds
diff -pruN 1.4.3+ds-1/debian/patches/0003-Avoid-conflicts-when-included-together-with-X11.h.patch 1.4.3+ds-2/debian/patches/0003-Avoid-conflicts-when-included-together-with-X11.h.patch
--- 1.4.3+ds-1/debian/patches/0003-Avoid-conflicts-when-included-together-with-X11.h.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.4.3+ds-2/debian/patches/0003-Avoid-conflicts-when-included-together-with-X11.h.patch	2022-08-01 16:16:55.000000000 +0000
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
+Date: Mon, 1 Aug 2022 18:16:53 +0200
+Subject: Avoid conflicts when included together with X11.h
+
+Backported from commit b62267612bd9e0480e81ba03471300d25a28c22c
+---
+ include/nanoflann.hpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/nanoflann.hpp b/include/nanoflann.hpp
+index e8c6da6..d59b528 100644
+--- a/include/nanoflann.hpp
++++ b/include/nanoflann.hpp
+@@ -69,6 +69,10 @@
+ #undef min
+ #endif
+ #endif
++// Avoid conflicts with X11 headers
++#ifdef None
++#undef None
++#endif
+ 
+ namespace nanoflann
+ {
diff -pruN 1.4.3+ds-1/debian/patches/series 1.4.3+ds-2/debian/patches/series
--- 1.4.3+ds-1/debian/patches/series	2022-07-27 09:12:16.000000000 +0000
+++ 1.4.3+ds-2/debian/patches/series	2022-08-01 16:16:55.000000000 +0000
@@ -1,2 +1,3 @@
 0001-Use-system-gtest.patch
 0002-Make-example-CMake-script-stand-alone.patch
+0003-Avoid-conflicts-when-included-together-with-X11.h.patch