[neon/kf6/kf6-kuserfeedback/Neon/stable] debian/patches: redo patch
Carlos De Maine
null at kde.org
Mon Jan 15 01:55:27 GMT 2024
Git commit 8726fc43d3541ebcddd807164b857a0a0b111b15 by Carlos De Maine.
Committed on 15/01/2024 at 02:55.
Pushed by carlosdem into branch 'Neon/stable'.
redo patch
(cherry picked from commit 61ba134bb72eb5dd7a90d26e9d69c2d799f8a2db)
M +15 -13 debian/patches/kf6_qch.diff
https://invent.kde.org/neon/kf6/kf6-kuserfeedback/-/commit/8726fc43d3541ebcddd807164b857a0a0b111b15
diff --git a/debian/patches/kf6_qch.diff b/debian/patches/kf6_qch.diff
index 423745b..467551d 100644
--- a/debian/patches/kf6_qch.diff
+++ b/debian/patches/kf6_qch.diff
@@ -1,18 +1,20 @@
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 9e23bd23ef2c0ff60ccbb93c9ac311c3dcf8e71e..045b0bf6377dc14cc0cb8657d0131cd416a547f0 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -50,7 +50,7 @@ else()
- DEPENDS ${_qdoc_output_dir}/user-feedback-manual.qhp
- )
- add_custom_target(user_feedback_manual_qch ALL DEPENDS ${_qdoc_output_dir}/user-feedback-manual.qch)
- install(FILES ${_qdoc_output_dir}/user-feedback-manual.qch DESTINATION ${KDE_INSTALL_DATAROOTDIR}/KDE/UserFeedbackConsole)
- install(FILES ${_qdoc_output_dir}/user-feedback-manual.qch DESTINATION ${KDE_INSTALL_QCHDIR}/kf6-kuserfeedback/)
-endif()
+ DEPENDS ${_qdoc_output_dir}/user-feedback-manual.qhp
+ )
+ add_custom_target(user_feedback_manual_qch ALL DEPENDS ${_qdoc_output_dir}/user-feedback-manual.qch)
+- install(FILES ${_qdoc_output_dir}/user-feedback-manual.qch DESTINATION ${KDE_INSTALL_DATAROOTDIR}/KDE/UserFeedbackConsole)
++ install(FILES ${_qdoc_output_dir}/user-feedback-manual.qch DESTINATION ${KDE_INSTALL_QCHDIR}/KF6UserFeedbackConsole)
+ endif()
+
+ # If qcollectiongenerator is found build .qhc
@@ -76,5 +76,5 @@ else()
-# If qcollectiongenerator is found build .qhc
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- )
- add_custom_target(user_feedback_qhc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user-feedback.qhc)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/user-feedback.qhc DESTINATION ${KDE_INSTALL_DATAROOTDIR}/KDE/UserFeedbackConsole)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/user-feedback.qhc DESTINATION ${KDE_INSTALL_QCHDIR}/kf6-kuserfeedback/)
-endif()
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ add_custom_target(user_feedback_qhc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user-feedback.qhc)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/user-feedback.qhc DESTINATION ${KDE_INSTALL_DATAROOTDIR}/KDE/UserFeedbackConsole)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/user-feedback.qhc DESTINATION ${KDE_INSTALL_QCHDIR}/KF6KUserFeedbackConsole)
+ endif()
More information about the Neon-commits
mailing list