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

Jonathan Esk-Riddell null at kde.org
Thu Feb 16 12:30:29 GMT 2023


Git commit 77a74052e54b69ba062e58b9fa2fe3533a7c27c8 by Jonathan Esk-Riddell.
Committed on 16/02/2023 at 12:30.
Pushed by jriddell into branch 'Neon/unstable'.

refresh patch

M  +5    -5    debian/patches/Allow-packagers-set-kconfig_compiler-install-dir.patch
M  +1    -1    debian/patches/series

https://invent.kde.org/neon/kf6/kf6-kconfig/commit/77a74052e54b69ba062e58b9fa2fe3533a7c27c8

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 221f487..b9884c2 100644
--- a/debian/patches/Allow-packagers-set-kconfig_compiler-install-dir.patch
+++ b/debian/patches/Allow-packagers-set-kconfig_compiler-install-dir.patch
@@ -14,16 +14,16 @@ Index: kconfig/CMakeLists.txt
 ===================================================================
 --- kconfig.orig/CMakeLists.txt
 +++ kconfig/CMakeLists.txt
-@@ -64,6 +64,9 @@ endif()
+@@ -73,6 +73,9 @@ endif()
  include (ECMPoQmTools)
- ecm_install_po_files_as_qm(po)
+ ecm_install_po_files_as_qm(poqm)
  
 +# allow kconfig_compiler install dir to be set as a configure argument
 +set(KCONFIG_COMPILER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR_KF5}" CACHE STRING
 +   "Set directory for kconfig compiler tool")
  
  # create a Config.cmake and a ConfigVersion.cmake file and install them
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Config")
+ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF6Config")
 Index: kconfig/src/kconfig_compiler/CMakeLists.txt
 ===================================================================
 --- kconfig.orig/src/kconfig_compiler/CMakeLists.txt
@@ -32,5 +32,5 @@ Index: kconfig/src/kconfig_compiler/CMakeLists.txt
  
  ecm_mark_nongui_executable(kconfig_compiler)
  
--install(TARGETS kconfig_compiler EXPORT KF5ConfigCompilerTargets DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF})
-+install(TARGETS kconfig_compiler EXPORT KF5ConfigCompilerTargets DESTINATION ${KCONFIG_COMPILER_INSTALL_DIR})
+-install(TARGETS kconfig_compiler EXPORT KF6ConfigCompilerTargets DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF})
++install(TARGETS kconfig_compiler EXPORT KF6ConfigCompilerTargets DESTINATION ${KCONFIG_COMPILER_INSTALL_DIR})
diff --git a/debian/patches/series b/debian/patches/series
index 12201f7..f89e86a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-Allow-packagers-set-kconfig_compiler-install-dir.patch
+#Allow-packagers-set-kconfig_compiler-install-dir.patch


More information about the Neon-commits mailing list