[neon/extras/calamares/Neon/unstable] debian/patches: go back to static

[Scarlett Moore]

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

go back to static

M  +39   -26   debian/patches/upstream_shared.patch

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

diff --git a/debian/patches/upstream_shared.patch b/debian/patches/upstream_shared.patch
index 55831c4..8ac0b99 100644
--- a/debian/patches/upstream_shared.patch
+++ b/debian/patches/upstream_shared.patch
@@ -1,49 +1,62 @@
-From 0500eb54daa1f39b37f05e3f61e38411237cd98c Mon Sep 17 00:00:00 2001
-From: Adriaan de Groot <groot at kde.org>
-Date: Sat, 9 Sep 2023 01:27:13 +0200
-Subject: [PATCH] users: workaround build failure
-
-x86_64-suse-linux/bin/ld: libusers_internal.a(mocs_compilation.cpp.o):
-  relocation R_X86_64_32 against symbol `_ZN6Config16staticMetaObjectE'
-  can not be used when making a shared object; recompile with -fPIC
-x86_64-suse-linux/bin/ld: failed to set dynamic section sizes: bad value
-collect2: error: ld returned 1 exit status
----
- src/modules/users/CMakeLists.txt | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
-index dced10179d..8f9ee88bdb 100644
---- a/src/modules/users/CMakeLists.txt
-+++ b/src/modules/users/CMakeLists.txt
-@@ -7,7 +7,11 @@ find_package(${qtname} ${QT_VERSION} CONFIG REQUIRED Core DBus Network)
+--- src/modules/users/CMakeLists2.txt	2023-09-20 11:01:46.192864134 -0700
++++ 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)
 -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")
-@@ -44,15 +48,13 @@ set(_users_src
+-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 STATIC
 -    TARGET_TYPE OBJECT
++    TARGET_TYPE STATIC
      NO_INSTALL
      NO_VERSION
      SOURCES
          ${_users_src}
      LINK_LIBRARIES
-+        ${kfname}::CoreAddons
-+        ${qtname}::DBus
-+        ${CRYPT_LIBRARIES}
 -        ${USER_EXTRA_LIB}
++        Qt5::DBus
++        ${CRYPT_LIBRARIES}
  )
  
  calamares_add_plugin(users