From 65ea48bf963cabd99ff6719a2e5668660c711130ad7e996441328be3dabebe3b Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 9 Jun 2022 20:02:27 +0000 Subject: [PATCH] -m OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=347 --- ...-binaries-in-Mesa-demos-path-as-well.patch | 25 +++++++++++-------- kinfocenter-5.24.90.tar.xz | 3 --- kinfocenter-5.24.90.tar.xz.sig | 16 ------------ kinfocenter-5.25.0.tar.xz | 3 +++ kinfocenter-5.25.0.tar.xz.sig | 16 ++++++++++++ kinfocenter5.changes | 11 ++++++++ kinfocenter5.spec | 6 ++--- 7 files changed, 47 insertions(+), 33 deletions(-) delete mode 100644 kinfocenter-5.24.90.tar.xz delete mode 100644 kinfocenter-5.24.90.tar.xz.sig create mode 100644 kinfocenter-5.25.0.tar.xz create mode 100644 kinfocenter-5.25.0.tar.xz.sig diff --git a/0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch b/0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch index 7fa67c1..7e97ebc 100644 --- a/0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch +++ b/0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch @@ -1,19 +1,19 @@ -From 63940ad9bb5eb3bd8c0eefcf20c4b14d68f9c5c2 Mon Sep 17 00:00:00 2001 +From 0836341c590dc14626e3e1856fb1917ba07fcb84 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 8 Feb 2022 19:06:23 +0100 -Subject: [PATCH 2/2] Look for binaries in Mesa-demos path as well +Subject: [PATCH] Look for binaries in Mesa-demos path as well eglinfo is not in $PATH (yet, boo#1195695) --- src/CommandOutputContext.cpp | 7 +++++++ 1 file changed, 7 insertions(+) -Index: kinfocenter-5.17.80git.20220304T103340~f38dd817/src/CommandOutputContext.cpp -=================================================================== ---- kinfocenter-5.17.80git.20220304T103340~f38dd817.orig/src/CommandOutputContext.cpp 2022-03-04 18:33:40.000000000 +0100 -+++ kinfocenter-5.17.80git.20220304T103340~f38dd817/src/CommandOutputContext.cpp 2022-03-05 08:49:12.679438248 +0100 -@@ -30,6 +30,13 @@ - m_foundExecutablePaths[findExecutable] = QStandardPaths::findExecutable(findExecutable); +diff --git a/src/CommandOutputContext.cpp b/src/CommandOutputContext.cpp +index dad54a5e..30554499 100644 +--- a/src/CommandOutputContext.cpp ++++ b/src/CommandOutputContext.cpp +@@ -27,6 +27,13 @@ CommandOutputContext::CommandOutputContext(const QStringList &findExecutables, c + QStandardPaths::findExecutable(m_executableName, {QStringLiteral("/usr/local/sbin"), QStringLiteral("/usr/sbin"), QStringLiteral("/sbin")}); } + // boo#1195695 @@ -23,6 +23,9 @@ Index: kinfocenter-5.17.80git.20220304T103340~f38dd817/src/CommandOutputContext. + {QStringLiteral("/usr/lib64/mesa-demos/egl/opengl"), QStringLiteral("/usr/lib/mesa-demos/egl/opengl")}); + } + - metaObject()->invokeMethod(this, &CommandOutputContext::load); - } - + m_foundExecutablePaths[executable] = m_executablePath; + for (const QString &findExecutable : findExecutables) { + m_foundExecutablePaths[findExecutable] = QStandardPaths::findExecutable(findExecutable); +-- +2.36.1 + diff --git a/kinfocenter-5.24.90.tar.xz b/kinfocenter-5.24.90.tar.xz deleted file mode 100644 index a91606e..0000000 --- a/kinfocenter-5.24.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ad738babb55b132c216fd1c5790660aef53b3da6261fcdcfe2edc15ee82ab56 -size 730508 diff --git a/kinfocenter-5.24.90.tar.xz.sig b/kinfocenter-5.24.90.tar.xz.sig deleted file mode 100644 index e5ff1c3..0000000 --- a/kinfocenter-5.24.90.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmKGGkAACgkQ11dEg7tX -sY2t6g/8CBY4l664t9BZqn0QlcbGfjiidhNUqWLE7QVrKY5Q/2YVHqjWComJ8h1u -jJeu5XpVnQpmZ1RZA2QNspqCj6/GUteGl18z1W98jsqjgTNCUg/7iK0VKsrzTqSr -S1eukqFz6qS7tC36QJGXnmPyJcK1mt+Vm+SbMnvXaN4UH/9O6hrr1uitoIbebcGv -Go2Mj/3sqDaHSXmu/gqEvjOQ/CdMDLdJ+oOYSLZ9ybSnoDxP4ZkPZjZAdLimVU/y -+bXd0BFhgzvs3sSfqFps0fwh7nfMWXt0m3tqKTkNxAqWGv7UdyVOUrDE0N59jkvp -MhLlmTX0QsNcup6oUcZzWN0M+YmF4CyTJIZgacPyqbdqblbThU1k74A1VXCxKhUv -j630LsC4TiTwsxXgyT9/ovBrIbr0jqsvzsdvy3k2gIbgJprdn4J2YiRBj01AGybX -HT7XjTEZH+2spb2/nCBxkiTgQs0ZXGUOK6LMvT9RhJI0V+H7+D3+GayWXpTEh/TO -oS29ErjBxt9vjlBrCvD1wOOU61Ck6UXYV4hZxMvmM5GRyNU2ejyESOKd19x82CGz -bzDaPiIIYblEZgrqz6mQUiBh/uMWte+MiJX5ayuTk9M1+oVO5bt7z4UiHcdpwOxC -DW+5Vuzei5XfPKEQY/y6W9B0FNdPbn5lqxhG2sglxLJ0HfC5f20= -=7HKP ------END PGP SIGNATURE----- diff --git a/kinfocenter-5.25.0.tar.xz b/kinfocenter-5.25.0.tar.xz new file mode 100644 index 0000000..92876f2 --- /dev/null +++ b/kinfocenter-5.25.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6422131e6a7e9d08db2c076498f9349dca78ec3ce206aca86f313791706f4f3 +size 731260 diff --git a/kinfocenter-5.25.0.tar.xz.sig b/kinfocenter-5.25.0.tar.xz.sig new file mode 100644 index 0000000..2a43049 --- /dev/null +++ b/kinfocenter-5.25.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmKhuJgACgkQ11dEg7tX +sY3TDRAAjN+hkt0rtqTgI1mSfIZIPgIfhPa5ucauhlKteLF+nRPIews0YHcJ74WH +rFQ4hwPx9kCBfHAG8iNDtkvddDhUiuoUXWmzGvzjnP1nehGkYfUX/78ULrDcM0wN +8z6x29yGXkJ9HUwaYOuvxwDKpFZXTJP4dIi5i9Jypa59BkMIVtnQ2btrkUVu32Cp +jEAmcB5iUalbXsVhEIkl1udeLQBmqTsezFDjjhyHO7DJa2t8YPK+1gyKhQ61mpbE +FjiVKko+G71CKMaOGLkXv00jeRtPONqXp62eOBp/zr6GMY8MnOQBueNTOcMJwltv +42E955oYCqMb6VPe22w76h2Kvt8Twt3VHDdFNM2g0S9Q5g6HkrXgNaN+XRim98yR +/oPLvMKfZeKdgraf+PCDb8murAn+kCM1ufFUxX0EgF89Om9z/hSwLrWr1Jo/K/lf +cT+XpH8uSrjAwf3KhFCAj8Gl+xro6/pkRveXyp79v9SAIaXyHV/aMK/AnDpwBIea +MmOc/1kPD+Vk4xlH0mVrhUxRuhb9tejK7GhpdZabvLvsII53F+noArwI9OqfJjxW +Ak3FyCYNys90mjzrhGF/7ffwB6NoTat5FUYHBPrpe0VaoMg65IRqzWf1q+o1Tupg +geXf4El2aZd9csZXr6gko4WLPwWZvvM2iM7xM5MqW4LqmJUbXxw= +=JpxW +-----END PGP SIGNATURE----- diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 996764f..ff114b9 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jun 9 11:14:58 UTC 2022 - Fabian Vogt + +- Update to 5.25.0 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.25.0 +- Changes since 5.24.90: + * redirect stderr to stdout (kde#454197) +- Fix 0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch (boo#1199975) + ------------------------------------------------------------------- Thu May 19 19:45:29 UTC 2022 - Fabian Vogt diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 01bf84b..b2abfeb 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -23,7 +23,7 @@ %bcond_without released Name: kinfocenter5 -Version: 5.24.90 +Version: 5.25.0 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} @@ -33,9 +33,9 @@ Summary: Utility that provides information about a computer system License: GPL-2.0-or-later Group: System/GUI/KDE URL: http://www.kde.org/ -Source: https://download.kde.org/unstable/plasma/%{version}/kinfocenter-%{version}.tar.xz +Source: kinfocenter-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/unstable/plasma/%{version}/kinfocenter-%{version}.tar.xz.sig +Source1: kinfocenter-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE