[neon/extras/calamares/Neon/unstable] debian/patches: Reverse it!

Scarlett Moore null at kde.org
Wed Sep 20 18:20:05 BST 2023


Git commit 41dcbfaffb208d71ab5fe12ae948b77e8e3ffddb by Scarlett Moore.
Committed on 20/09/2023 at 19:19.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Reverse it!

M  +12   -12   debian/patches/upstream_shared.patch

https://invent.kde.org/neon/extras/calamares/-/commit/41dcbfaffb208d71ab5fe12ae948b77e8e3ffddb

diff --git a/debian/patches/upstream_shared.patch b/debian/patches/upstream_shared.patch
index c6a24de..55831c4 100644
--- a/debian/patches/upstream_shared.patch
+++ b/debian/patches/upstream_shared.patch
@@ -20,12 +20,12 @@ index dced10179d..8f9ee88bdb 100644
  find_package(Crypt REQUIRED)
  
  # Add optional libraries here
--set(USER_EXTRA_LIB)
-+set(USER_EXTRA_LIB
-+    ${kfname}::CoreAddons
-+    ${qtname}::DBus
-+    ${CRYPT_LIBRARIES}
-+)
++set(USER_EXTRA_LIB)
+-set(USER_EXTRA_LIB
+-    ${kfname}::CoreAddons
+-    ${qtname}::DBus
+-    ${CRYPT_LIBRARIES}
+-)
  
  find_package(LibPWQuality)
  set_package_properties(LibPWQuality PROPERTIES PURPOSE "Extra checks of password quality")
@@ -33,17 +33,17 @@ index dced10179d..8f9ee88bdb 100644
  calamares_add_library(
      users_internal
      EXPORT_MACRO PLUGINDLLEXPORT_PRO
--    TARGET_TYPE STATIC
-+    TARGET_TYPE OBJECT
++    TARGET_TYPE STATIC
+-    TARGET_TYPE OBJECT
      NO_INSTALL
      NO_VERSION
      SOURCES
          ${_users_src}
      LINK_LIBRARIES
--        ${kfname}::CoreAddons
--        ${qtname}::DBus
--        ${CRYPT_LIBRARIES}
-+        ${USER_EXTRA_LIB}
++        ${kfname}::CoreAddons
++        ${qtname}::DBus
++        ${CRYPT_LIBRARIES}
+-        ${USER_EXTRA_LIB}
  )
  
  calamares_add_plugin(users


More information about the Neon-commits mailing list