From fe88a741f7d6cc241b6d1038d380a1038d50b134d1d06be17f34cc45ff4e8cb2 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Wed, 30 Mar 2022 10:40:42 +0000
Subject: [PATCH] Plasma 5.24.4 - untested

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/libksysguard5?expand=0&rev=327
---
 libksysguard-5.24.3.tar.xz     |  3 ---
 libksysguard-5.24.3.tar.xz.sig | 16 ----------------
 libksysguard-5.24.4.tar.xz     |  3 +++
 libksysguard-5.24.4.tar.xz.sig | 16 ++++++++++++++++
 libksysguard5.changes          | 14 ++++++++++++++
 libksysguard5.spec             | 12 +++++++++---
 6 files changed, 42 insertions(+), 22 deletions(-)
 delete mode 100644 libksysguard-5.24.3.tar.xz
 delete mode 100644 libksysguard-5.24.3.tar.xz.sig
 create mode 100644 libksysguard-5.24.4.tar.xz
 create mode 100644 libksysguard-5.24.4.tar.xz.sig

diff --git a/libksysguard-5.24.3.tar.xz b/libksysguard-5.24.3.tar.xz
deleted file mode 100644
index 4099c1a..0000000
--- a/libksysguard-5.24.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:148651cf33c7400d7a0df507d0bb75a6924e1ae80f5a46eefeaeb44c848ff1a2
-size 766304
diff --git a/libksysguard-5.24.3.tar.xz.sig b/libksysguard-5.24.3.tar.xz.sig
deleted file mode 100644
index 888f2e2..0000000
--- a/libksysguard-5.24.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmInPQwACgkQ11dEg7tX
-sY3nLg/9F85GzIJbwUXAn3lA2485LCMe4kxBng1pSJYZBP+94v5jvYlgF4GuCyQ4
-7fsCaQPdXjJnQM8y3rfGVWY4okZ4sTXckxLmLKRLQENcCeCUBMcIWnOHF0IpeWkK
-mk2Bwa4w3y8E7ohcq0F+2UaXAzGL96qWPfZSfOSm02UWWRSRkpOjAyKvROJRnym5
-2VWaULO3HsbuWVpzp6p8U8C2nmvoAgQStfrIgSqa16u+6dHfndx8BILYlHq+maph
-g1w46AgiVP/LGe6rfJgyXG/iuZaCEXh/eFUoHEnB+NLIHEGh8egWOPb3CGZVvys1
-6kJ6fy9TAk/4s2Fz1naTPRHLsj3kg5gxyRekZaeVFn4+lmXqGhfzYWoDgI1GexAB
-kxYQgCZqCAanmpu7YxvmQz1xDFAzkhMTclyYiCcf/Qzjez3/RsZY9e83E7TFCafa
-qmvdgbHAe6jrpGGZ42kT6Pa7t0EZf7INPObBd2HlINjcFXO2l92hH+WXU5WmTBud
-4DoEYQ2Fg4dVUq9ENWwgkzS0dBGTT3uu82ivDs7A5Is3rjhvEioO6JfLYyc76Ssg
-Vpr/DKgkNOiBIfij/4gLm7IwnsJG0XObprZd8+domeor6xhq25qHKjIYIGtok0lO
-aN34bL6taDlRRQLMErE4ayYHdE6nbgx7qcTn3o+kdIdFxxeJhck=
-=8jPL
------END PGP SIGNATURE-----
diff --git a/libksysguard-5.24.4.tar.xz b/libksysguard-5.24.4.tar.xz
new file mode 100644
index 0000000..14f9054
--- /dev/null
+++ b/libksysguard-5.24.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76da2a7fb7f760c55111db756d91dd3041721baa8a1f8863ad9e0bc0a6a02402
+size 767300
diff --git a/libksysguard-5.24.4.tar.xz.sig b/libksysguard-5.24.4.tar.xz.sig
new file mode 100644
index 0000000..dbd4273
--- /dev/null
+++ b/libksysguard-5.24.4.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmJC7NkACgkQ11dEg7tX
+sY2pnhAAl0zguISiiIpmyDrI3JM3/wtAdaNTtS5k3xUwLkxRxh0ERFKg9xUpQvsf
+fwvZ90ZZJYZNACeTVdAXXRlQHrz3+XSF2UH5VDn6GssnIRDVbXpyZa2jMuEELdd4
+OqcPCr3F8VtC6HZXkHZgZp8j9o7f0fvaXGJ45A1MaUOAHLzfJakYAO/FRlsGzGd3
+VCE7EoCgBoAS5SaPlgB5mUFIAAr9HEPo2nyeXwJGoxuxFWyFWbWTPG2BCUURj6PX
+V3rPxC9KHYV5wGXjTXALu99B+vj1j349QMME9vDlSgzR0X3QGEiKEyDpAoOQB53x
+Eo5CkWUPbwX+L6CWfMZoopTA7sDRcyfclAQIVS9dqD0vaj3vnhQrqMdqi4NbH4GP
+55jf6ANMi/Ua1XJolCXEYTIl9wi7EAdem84LTIBLCfKDQLgiS81zb3SuueFgGVVn
+HJZLWx09dvHak8uyDyUxr7TbE3LqvhyxX0HSd7bbMe4oLpyvfPnyqDzOixBOhjcu
+0hH96dk99P/1ilFnKJIEhj89X8OiklGOZVR6D/aggyJQOa4KvwRacQDoyqCycOiH
+4BhnzPDuxWvf8BGQ8uCwlRBNF9WtyX9LiC+7fDiOJVvwEA/VRoZyu1Np43cUeoc7
+ll0qA/YXtzY08Zh6nCtcFEJQzJlf93/kwht2uuOkdiuUhwGFMwM=
+=++Du
+-----END PGP SIGNATURE-----
diff --git a/libksysguard5.changes b/libksysguard5.changes
index abe64dd..e5ac623 100644
--- a/libksysguard5.changes
+++ b/libksysguard5.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Mar 29 16:04:38 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.24.4
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/plasma/5/5.24.4
+- No code changes since 5.24.3
+
+-------------------------------------------------------------------
+Tue Mar 29 11:20:44 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Force PIE when building with gcc-10 (boo#1195628, boo#1197641)
+
 -------------------------------------------------------------------
 Tue Mar  8 18:09:59 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libksysguard5.spec b/libksysguard5.spec
index ed44578..86e601e 100644
--- a/libksysguard5.spec
+++ b/libksysguard5.spec
@@ -19,7 +19,7 @@
 %bcond_without released
 %global systemstatssover 1
 Name:           libksysguard5
-Version:        5.24.3
+Version:        5.24.4
 Release:        0
 # Full Plasma 5 version (e.g. 5.8.95)
 %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}}
@@ -145,10 +145,16 @@ QML applications.
 %autosetup -p1 -n libksysguard-%{version}
 
 %build
-  %if 0%{?suse_version} <= 1500
+%if 0%{?suse_version} <= 1500
     export CC=gcc-10 CXX=g++-10
-  %endif
+  # gcc-PIE only sets the default for gcc-7, get cmake to do it for us (boo#1195628)
+  # Set CMAKE_CXX_LINK_PIE_SUPPORTED to work without "check_pie_supported()"...
+  %{cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} \
+      -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_LINK_PIE_SUPPORTED=ON}
+%else
   %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
+%endif
+
   %cmake_build
 
 %install