[neon/neon-packaging/vector-blf/Neon/unstable] debian/patches: split into two patches

[Carlos De Maine]

Git commit d737b69515c979f723d0a7cfad01497b11b28811 by Carlos De Maine.
Committed on 01/04/2023 at 02:20.
Pushed by carlosdem into branch 'Neon/unstable'.

split into two patches

M  +0    -75   debian/patches/0001_labplot_patches
C  +1    -26   debian/patches/0002_labplot_patches [from: debian/patches/0001_labplot_patches - 076% similarity]
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/neon-packaging/vector-blf/commit/d737b69515c979f723d0a7cfad01497b11b28811

diff --git a/debian/patches/0001_labplot_patches b/debian/patches/0001_labplot_patches
index ef60bb9..de3e467 100644
--- a/debian/patches/0001_labplot_patches
+++ b/debian/patches/0001_labplot_patches
@@ -22,78 +22,3 @@ index b028ea11..590715a1 100644
  install(
      FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
-From b7a419c4d8edbf495ab309b57a380a2444ee2730 Mon Sep 17 00:00:00 2001
-From: Martin Marmsoler <martin.marmsoler at gmail.com>
-Date: Thu, 2 Mar 2023 19:34:58 +0100
-Subject: [PATCH 2/2] Install files only if not FETCH_CONTENT_INCLUSION,
- because when including the project into another project with FecthContent the
- headers are only needed during build but not after installation
-
----
- CMakeLists.txt                |  2 ++
- src/Vector/BLF/CMakeLists.txt | 21 ++++++++++++---------
- src/Vector/CMakeLists.txt     |  8 +++++---
- 3 files changed, 19 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3bb50c75..16a7920f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,8 @@ option(OPTION_BUILD_TESTS "Build tests" OFF)
- option(OPTION_USE_GCOV "Build with gcov to generate coverage data on execution" OFF)
- option(OPTION_USE_GPROF "Build with gprof" OFF)
- option(OPTION_ADD_LCOV "Add lcov targets to generate HTML coverage report" OFF)
-+# Turn OFF, if you are using FetchContent to include it to your project
-+option(FETCH_CONTENT_INCLUSION "Include project with FetchContent_Declare in another project. In this case the headers and the cmake files are not needed, only the library" OFF)
- 
- # directories
- include(GNUInstallDirs)
-diff --git a/src/Vector/BLF/CMakeLists.txt b/src/Vector/BLF/CMakeLists.txt
-index 590715a1..71cd1d71 100644
---- a/src/Vector/BLF/CMakeLists.txt
-+++ b/src/Vector/BLF/CMakeLists.txt
-@@ -342,15 +342,18 @@ endif()
- # install
- install(
-     TARGETS ${PROJECT_NAME})
--install(
--    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
--install(
--    FILES
--        ${CMAKE_CURRENT_BINARY_DIR}/vector_blf_export.h
--        ${CMAKE_CURRENT_BINARY_DIR}/config.h
--        $<TARGET_PROPERTY:${PROJECT_NAME},INTERFACE_SOURCES>
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vector/BLF)
-+
-+if (NOT FETCH_CONTENT_INCLUSION)
-+    install(
-+        FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+    install(
-+        FILES
-+            ${CMAKE_CURRENT_BINARY_DIR}/vector_blf_export.h
-+            ${CMAKE_CURRENT_BINARY_DIR}/config.h
-+            $<TARGET_PROPERTY:${PROJECT_NAME},INTERFACE_SOURCES>
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vector/BLF)
-+endif()
- 
- # sub directories
- add_subdirectory(docs)
-diff --git a/src/Vector/CMakeLists.txt b/src/Vector/CMakeLists.txt
-index d321b47d..e3cca81e 100644
---- a/src/Vector/CMakeLists.txt
-+++ b/src/Vector/CMakeLists.txt
-@@ -4,6 +4,8 @@
- 
- add_subdirectory(BLF)
- 
--install(
--    FILES BLF.h
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vector)
-+if (NOT FETCH_CONTENT_INCLUSION)
-+    install(
-+        FILES BLF.h
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vector)
-+endif()
\ No newline at end of file
diff --git a/debian/patches/0001_labplot_patches b/debian/patches/0002_labplot_patches
similarity index 76%
copy from debian/patches/0001_labplot_patches
copy to debian/patches/0002_labplot_patches
index ef60bb9..c501b95 100644
--- a/debian/patches/0001_labplot_patches
+++ b/debian/patches/0002_labplot_patches
@@ -1,28 +1,3 @@
-From 8e6cf6460c8c8959d5a89c4c7fe02145698c4e91 Mon Sep 17 00:00:00 2001
-From: Martin Marmsoler <martin.marmsoler at gmail.com>
-Date: Tue, 31 Jan 2023 17:32:05 +0100
-Subject: [PATCH 1/2] do not change install destination, because dlls are
- stored then also in libdir instead in the default runtime dir "bin"
-
----
- src/Vector/BLF/CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/Vector/BLF/CMakeLists.txt b/src/Vector/BLF/CMakeLists.txt
-index b028ea11..590715a1 100644
---- a/src/Vector/BLF/CMakeLists.txt
-+++ b/src/Vector/BLF/CMakeLists.txt
-@@ -341,8 +341,7 @@ endif()
- 
- # install
- install(
--    TARGETS ${PROJECT_NAME}
--    DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+    TARGETS ${PROJECT_NAME})
- install(
-     FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
-     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
 From b7a419c4d8edbf495ab309b57a380a2444ee2730 Mon Sep 17 00:00:00 2001
 From: Martin Marmsoler <martin.marmsoler at gmail.com>
 Date: Thu, 2 Mar 2023 19:34:58 +0100
@@ -96,4 +71,4 @@ index d321b47d..e3cca81e 100644
 +    install(
 +        FILES BLF.h
 +        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vector)
-+endif()
\ No newline at end of file
++endif()
diff --git a/debian/patches/series b/debian/patches/series
index 2771d7c..adf7292 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001_labplot_patches
+0002_labplot_patches
\ No newline at end of file