[neon/extras/calamares/Neon/unstable] debian/patches: Try workaround. At a loss.

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


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

Try workaround. At a loss.

A  +1    -0    debian/patches/series
A  +49   -0    debian/patches/upstream_shared.patch

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

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bccd3a1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_shared.patch
diff --git a/debian/patches/upstream_shared.patch b/debian/patches/upstream_shared.patch
new file mode 100644
index 0000000..c6a24de
--- /dev/null
+++ b/debian/patches/upstream_shared.patch
@@ -0,0 +1,49 @@
+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)
+ find_package(Crypt REQUIRED)
+ 
+ # Add optional libraries here
+-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")
+@@ -44,15 +48,13 @@ set(_users_src
+ calamares_add_library(
+     users_internal
+     EXPORT_MACRO PLUGINDLLEXPORT_PRO
+-    TARGET_TYPE STATIC
++    TARGET_TYPE OBJECT
+     NO_INSTALL
+     NO_VERSION
+     SOURCES
+         ${_users_src}
+     LINK_LIBRARIES
+-        ${kfname}::CoreAddons
+-        ${qtname}::DBus
+-        ${CRYPT_LIBRARIES}
++        ${USER_EXTRA_LIB}
+ )
+ 
+ calamares_add_plugin(users


More information about the Neon-commits mailing list