[neon/kde/kconfig/Neon/unstable] debian/patches: refresh patch

Jonathan Riddell null at kde.org
Mon Jan 17 14:24:38 GMT 2022


Git commit 8f8390d99d6102eb4ca1d4f10dd251d5aeb12569 by Jonathan Riddell.
Committed on 17/01/2022 at 14:24.
Pushed by jriddell into branch 'Neon/unstable'.

refresh patch

M  +13   -13   debian/patches/Allow-packagers-set-kconfig_compiler-install-dir.patch

https://invent.kde.org/neon/kde/kconfig/commit/8f8390d99d6102eb4ca1d4f10dd251d5aeb12569

diff --git a/debian/patches/Allow-packagers-set-kconfig_compiler-install-dir.patch b/debian/patches/Allow-packagers-set-kconfig_compiler-install-dir.patch
index 47bdd0b..221f487 100644
--- a/debian/patches/Allow-packagers-set-kconfig_compiler-install-dir.patch
+++ b/debian/patches/Allow-packagers-set-kconfig_compiler-install-dir.patch
@@ -10,13 +10,13 @@ Last-Update: 2018-01-25
  src/kconfig_compiler/CMakeLists.txt | 2 +-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e06332d..05ffb9c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,6 +46,9 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-    ecm_install_po_files_as_qm(po)
- endif()
+Index: kconfig/CMakeLists.txt
+===================================================================
+--- kconfig.orig/CMakeLists.txt
++++ kconfig/CMakeLists.txt
+@@ -64,6 +64,9 @@ endif()
+ include (ECMPoQmTools)
+ ecm_install_po_files_as_qm(po)
  
 +# allow kconfig_compiler install dir to be set as a configure argument
 +set(KCONFIG_COMPILER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR_KF5}" CACHE STRING
@@ -24,13 +24,13 @@ index e06332d..05ffb9c 100644
  
  # create a Config.cmake and a ConfigVersion.cmake file and install them
  set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Config")
-diff --git a/src/kconfig_compiler/CMakeLists.txt b/src/kconfig_compiler/CMakeLists.txt
-index dc0a08d..ee6394b 100644
---- a/src/kconfig_compiler/CMakeLists.txt
-+++ b/src/kconfig_compiler/CMakeLists.txt
-@@ -20,4 +20,4 @@ target_link_libraries(kconfig_compiler Qt5::Xml)
+Index: kconfig/src/kconfig_compiler/CMakeLists.txt
+===================================================================
+--- kconfig.orig/src/kconfig_compiler/CMakeLists.txt
++++ kconfig/src/kconfig_compiler/CMakeLists.txt
+@@ -25,4 +25,4 @@ target_link_libraries(kconfig_compiler Q
  
  ecm_mark_nongui_executable(kconfig_compiler)
  
--install(TARGETS kconfig_compiler EXPORT KF5ConfigCompilerTargets DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5})
+-install(TARGETS kconfig_compiler EXPORT KF5ConfigCompilerTargets DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF})
 +install(TARGETS kconfig_compiler EXPORT KF5ConfigCompilerTargets DESTINATION ${KCONFIG_COMPILER_INSTALL_DIR})


More information about the Neon-commits mailing list