[neon/qt/qtcreator/Neon/release] debian: update the patches

Pino Toscano null at kde.org
Thu May 5 12:51:58 BST 2022


Git commit a9d6444d18213b7db3648cd6f2c873582a3b6016 by Pino Toscano.
Committed on 16/12/2021 at 19:35.
Pushed by jriddell into branch 'Neon/release'.

update the patches

- yaml-cpp_empty_includedir.diff: drop, fixed upstream

M  +2    -0    debian/changelog
M  +0    -1    debian/patches/series
D  +0    -19   debian/patches/yaml-cpp_empty_includedir.diff

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

diff --git a/debian/changelog b/debian/changelog
index 67d5214..2e4a06f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtcreator (6.0.1-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - yaml-cpp_empty_includedir.diff: drop, fixed upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 16 Dec 2021 20:32:18 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 8a54103..860a57d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 
 # 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
deleted file mode 100644
index 366ee70..0000000
--- a/debian/patches/yaml-cpp_empty_includedir.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-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)



More information about the Neon-commits mailing list