[neon/extras/calamares/Neon/unstable] debian/patches: Delete upstream_shared.patch

Carlos De Maine null at kde.org
Sun Oct 1 02:02:59 BST 2023


Git commit 4b11b863c2496f0dc8852a5ec8a3e1f091b7bcce by Carlos De Maine.
Committed on 01/10/2023 at 03:02.
Pushed by carlosdem into branch 'Neon/unstable'.

Delete upstream_shared.patch

D  +0    -62   debian/patches/upstream_shared.patch

https://invent.kde.org/neon/extras/calamares/-/commit/4b11b863c2496f0dc8852a5ec8a3e1f091b7bcce

diff --git a/debian/patches/upstream_shared.patch b/debian/patches/upstream_shared.patch
deleted file mode 100644
index 5679597..0000000
--- a/debian/patches/upstream_shared.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/src/modules/users/CMakeLists.txt	2023-09-20 11:01:46.192864134 -0700
-+++ b/src/modules/users/CMakeLists.txt	2023-04-24 13:33:41.000000000 -0700
-@@ -3,18 +3,18 @@
- #   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot at kde.org>
- #   SPDX-License-Identifier: BSD-2-Clause
- #
--find_package(${qtname} ${QT_VERSION} CONFIG REQUIRED Core DBus Network)
-+find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus Network)
- find_package(Crypt REQUIRED)
- 
- # Add optional libraries here
--set(USER_EXTRA_LIB
--    ${kfname}::CoreAddons
--    ${qtname}::DBus
--    ${CRYPT_LIBRARIES}
--)
-+set(USER_EXTRA_LIB)
- 
- find_package(LibPWQuality)
--set_package_properties(LibPWQuality PROPERTIES PURPOSE "Extra checks of password quality")
-+set_package_properties(
-+    LibPWQuality
-+    PROPERTIES
-+    PURPOSE "Extra checks of password quality"
-+)
- 
- if(LibPWQuality_FOUND)
-     list(APPEND USER_EXTRA_LIB ${LibPWQuality_LIBRARIES})
-@@ -23,7 +23,11 @@
- endif()
- 
- find_package(ICU COMPONENTS uc i18n)
--set_package_properties(ICU PROPERTIES PURPOSE "Transliteration support for full name to username conversion")
-+set_package_properties(
-+    ICU
-+    PROPERTIES
-+    PURPOSE "Transliteration support for full name to username conversion"
-+)
- 
- if(ICU_FOUND)
-     list(APPEND USER_EXTRA_LIB ICU::uc ICU::i18n)
-@@ -44,17 +48,17 @@
-     Config.cpp
- )
- 
--# This part of the code is shared with the usersq module
- calamares_add_library(
-     users_internal
-     EXPORT_MACRO PLUGINDLLEXPORT_PRO
--    TARGET_TYPE OBJECT
-+    TARGET_TYPE STATIC
-     NO_INSTALL
-     NO_VERSION
-     SOURCES
-         ${_users_src}
-     LINK_LIBRARIES
--        ${USER_EXTRA_LIB}
-+        Qt5::DBus
-+        ${CRYPT_LIBRARIES}
- )
- 
- calamares_add_plugin(users


More information about the Neon-commits mailing list