[neon/qt/qtcreator/Neon/release] debian: fix yaml-cpp with empty ${YAML_CPP_INCLUDE_DIR} in cmake config

[Pino Toscano]

Git commit c50bc9e92001aa356190ffc79c45dfacde2b0357 by Pino Toscano.
Committed on 12/11/2021 at 06:38.
Pushed by jriddell into branch 'Neon/release'.

fix yaml-cpp with empty ${YAML_CPP_INCLUDE_DIR} in cmake config

M  +3    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +19   -0    debian/patches/yaml-cpp_empty_includedir.diff

https://invent.kde.org/neon/qt/qtcreator/commit/c50bc9e92001aa356190ffc79c45dfacde2b0357

diff --git a/debian/changelog b/debian/changelog
index bae1ab1..3973b0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtcreator (5.0.3-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Do not assume that ${YAML_CPP_INCLUDE_DIR} (from the CMake config files of
+    yaml-cpp) is not empty; patch yaml-cpp_empty_includedir.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 12 Nov 2021 06:58:24 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 860a57d..8a54103 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 
 # Debian patches.
 debian_paths.diff
+yaml-cpp_empty_includedir.diff
diff --git a/debian/patches/yaml-cpp_empty_includedir.diff b/debian/patches/yaml-cpp_empty_includedir.diff
new file mode 100644
index 0000000..366ee70
--- /dev/null
+++ b/debian/patches/yaml-cpp_empty_includedir.diff
@@ -0,0 +1,19 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Do not assume that ${YAML_CPP_INCLUDE_DIR} is not empty
+ It may be empty, in case the CMake config files of yaml-cpp specify no
+ particular include path needed (or it is set directly for the "yaml-cpp"
+ target).
+Forwarded: no
+Last-Update: 2021-11-12
+
+--- a/cmake/Findyaml-cpp.cmake
++++ b/cmake/Findyaml-cpp.cmake
+@@ -9,7 +9,7 @@
+ find_package(yaml-cpp 0.5 QUIET NO_MODULE)
+ if (yaml-cpp_FOUND)
+   # target doesn't set include directory for some reason
+-  get_filename_component(yaml_cpp_include_dir ${YAML_CPP_INCLUDE_DIR} ABSOLUTE)
++  get_filename_component(yaml_cpp_include_dir "${YAML_CPP_INCLUDE_DIR}" ABSOLUTE)
+   if (NOT EXISTS yaml_cpp_include_dir)
+     unset(yaml_cpp_include_dir)
+     unset(yaml_cpp_include_dir CACHE)