[neon/backports-focal/assimp/Neon/unstable] debian/patches: Revert "Drop patch applied upstream."

[Jonathan Riddell]

Git commit 95653e15f80938fd90555d58e609b5032a50985e by Jonathan Riddell.
Committed on 16/12/2021 at 13:23.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "Drop patch applied upstream."

This reverts commit 12f35be546f6636bee11798ac5a3ef56b4cd59e6.

A  +19   -0    debian/patches/fix_x3d_detection.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/backports-focal/assimp/commit/95653e15f80938fd90555d58e609b5032a50985e

diff --git a/debian/patches/fix_x3d_detection.patch b/debian/patches/fix_x3d_detection.patch
new file mode 100644
index 0000000..4ecb66a
--- /dev/null
+++ b/debian/patches/fix_x3d_detection.patch
@@ -0,0 +1,19 @@
+Description: disable X3D importer
+ by assuming it can never open the file
+ the file extension code is bogus (but even if we fix it,
+ it still crashes on valid X3D files)
+Author: IOhannes m zmölnig
+Bug: https://github.com/assimp/assimp/issues/4201
+Last-Update: 2021-11-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- assimp.orig/code/AssetLib/X3D/X3DImporter.cpp
++++ assimp/code/AssetLib/X3D/X3DImporter.cpp
+@@ -234,6 +234,7 @@
+ }
+ 
+ bool X3DImporter::CanRead(const std::string &pFile, IOSystem * /*pIOHandler*/, bool checkSig) const {
++    return false;
+     if (checkSig) {
+         std::string::size_type pos = pFile.find_last_of(".x3d");
+         if (pos != std::string::npos) {
diff --git a/debian/patches/series b/debian/patches/series
index 6a91ea6..281c1f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,5 @@ use-system-stb_image.patch
 use-system-libdraco.patch
 pyassimp.patch
 pyassimp_faces.patch
+fix_x3d_detection.patch
 doxygen.patch