[neon/extras/calamares/Neon/release] debian/patches: https://github.com/calamares/calamares/issues/2075 workaround

Jonathan Esk-Riddell null at kde.org
Thu Nov 17 14:46:05 GMT 2022


Git commit d9c6f50894a803acb37dbe8b5b558eaf8ecafadd by Jonathan Esk-Riddell.
Committed on 17/11/2022 at 14:46.
Pushed by jriddell into branch 'Neon/release'.

https://github.com/calamares/calamares/issues/2075 workaround

A  +1    -0    debian/patches/series
A  +17   -0    debian/patches/settings.conf.diff

https://invent.kde.org/neon/extras/calamares/commit/d9c6f50894a803acb37dbe8b5b558eaf8ecafadd

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..718ef9e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+settings.conf.diff
diff --git a/debian/patches/settings.conf.diff b/debian/patches/settings.conf.diff
new file mode 100644
index 0000000..e2fe297
--- /dev/null
+++ b/debian/patches/settings.conf.diff
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 289aab268..abc89af8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -585,9 +585,9 @@ install(
+ ### Miscellaneous installs
+ #
+ #
+-if( settings.conf IS_NEWER_THAN ${CMAKE_BINARY_DIR}/settings.conf )
+-    install(FILES settings.conf DESTINATION ${CMAKE_BINARY_DIR})
+-endif()
++#if( settings.conf IS_NEWER_THAN ${CMAKE_BINARY_DIR}/settings.conf )
++#    install(FILES settings.conf DESTINATION ${CMAKE_BINARY_DIR})
++#endif()
+ 
+ if(INSTALL_POLKIT)
+     install(FILES com.github.calamares.calamares.policy DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}")


More information about the Neon-commits mailing list