[neon/neon-packaging/vector-blf/Neon/release] debian/patches: refresh patches

Carlos De Maine null at kde.org
Fri Jul 19 12:19:50 BST 2024


Git commit 3f82e9226a6b8290f6307c346b8ae16c931383c1 by Carlos De Maine.
Committed on 19/07/2024 at 11:19.
Pushed by carlosdem into branch 'Neon/release'.

refresh patches

M  +81   -4    debian/patches/0001_labplot_patches
D  +0    -54   debian/patches/0002_labplot_patches
D  +0    -61   debian/patches/0002_labplot_patches_master
M  +0    -1    debian/patches/series

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

diff --git a/debian/patches/0001_labplot_patches b/debian/patches/0001_labplot_patches
index 734c4d9..dbdc4a3 100644
--- a/debian/patches/0001_labplot_patches
+++ b/debian/patches/0001_labplot_patches
@@ -1,12 +1,89 @@
+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 b028ea11..71cd1d71 100644
 --- a/src/Vector/BLF/CMakeLists.txt
 +++ b/src/Vector/BLF/CMakeLists.txt
-@@ -328,8 +328,7 @@
+@@ -341,17 +341,19 @@ endif()
  
  # install
  install(
 -    TARGETS ${PROJECT_NAME}
 -    DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-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)
 +    TARGETS ${PROJECT_NAME})
- install(
-     FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
-     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++
++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/BLF/ObjectHeaderBase.h b/src/Vector/BLF/ObjectHeaderBase.h
+index 4fb9407e..4d666b05 100644
+--- a/src/Vector/BLF/ObjectHeaderBase.h
++++ b/src/Vector/BLF/ObjectHeaderBase.h
+@@ -6,6 +6,8 @@
+ 
+ #include <Vector/BLF/platform.h>
+ 
++#include <cstdint>
++
+ #include <Vector/BLF/AbstractFile.h>
+ 
+ #include <Vector/BLF/vector_blf_export.h>
+diff --git a/src/Vector/BLF/platform.h b/src/Vector/BLF/platform.h
+index 3b07b24d..c5844c05 100644
+--- a/src/Vector/BLF/platform.h
++++ b/src/Vector/BLF/platform.h
+@@ -9,6 +9,7 @@
+ #pragma once
+ 
+ #include <Vector/BLF/config.h>
++#include <cstdint>
+ 
+ /* GCC */
+ #ifdef __GNUC__
+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/0002_labplot_patches b/debian/patches/0002_labplot_patches
deleted file mode 100644
index 9ec0bb5..0000000
--- a/debian/patches/0002_labplot_patches
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,6 +20,8 @@
- 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)
---- a/src/Vector/BLF/CMakeLists.txt
-+++ b/src/Vector/BLF/CMakeLists.txt
-@@ -329,15 +329,18 @@
- # 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)
---- a/src/Vector/CMakeLists.txt
-+++ b/src/Vector/CMakeLists.txt
-@@ -1,5 +1,7 @@
- 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()
diff --git a/debian/patches/0002_labplot_patches_master b/debian/patches/0002_labplot_patches_master
deleted file mode 100644
index fd15845..0000000
--- a/debian/patches/0002_labplot_patches_master
+++ /dev/null
@@ -1,61 +0,0 @@
-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()
diff --git a/debian/patches/series b/debian/patches/series
index 95d6749..2771d7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001_labplot_patches
-0002_labplot_patches


More information about the Neon-commits mailing list