diff --git a/0001-Find-qdbus-command-correctly.patch b/0001-Find-qdbus-command-correctly.patch deleted file mode 100644 index 7be4106..0000000 --- a/0001-Find-qdbus-command-correctly.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 0f19cb4254c5a4a197e5d25f34c4be8de207d6ed Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Sun, 18 Sep 2022 11:49:06 +0200 -Subject: [PATCH] Find qdbus command correctly - -qdbus is installed into Qt's own binaries dir and might not be in $PATH. ---- - CMakeLists.txt | 3 +++ - Modules/kwinsupportinfo/CMakeLists.txt | 2 ++ - .../{kcm_kwinsupportinfo.json => kcm_kwinsupportinfo.json.in} | 2 +- - Modules/kwinsupportinfo/main.cpp | 3 ++- - 4 files changed, 8 insertions(+), 2 deletions(-) - rename Modules/kwinsupportinfo/{kcm_kwinsupportinfo.json => kcm_kwinsupportinfo.json.in} (98%) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c16af497..947688b4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,7 @@ include(KDEClangFormat) - include(ECMFindQmlModule) - include(KDEGitCommitHooks) - include(ECMSetupQtPluginMacroNames) -+include(ECMQueryQt) - - find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets) - -@@ -55,6 +56,8 @@ add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) - add_definitions(-DQT_NO_URL_CAST_FROM_STRING) - add_definitions(-DQT_USE_QSTRINGBUILDER) - -+ecm_query_qt(QtBinariesDir QT_INSTALL_BINS) -+ - add_subdirectory( Categories ) - add_subdirectory( kcontrol/menus ) - add_subdirectory( Modules ) -diff --git a/Modules/kwinsupportinfo/CMakeLists.txt b/Modules/kwinsupportinfo/CMakeLists.txt -index b5d8a90e..c354475a 100644 ---- a/Modules/kwinsupportinfo/CMakeLists.txt -+++ b/Modules/kwinsupportinfo/CMakeLists.txt -@@ -9,4 +9,6 @@ target_link_libraries(kcm_kwinsupportinfo KF5::CoreAddons KF5::QuickAddons KF5:: - - install(TARGETS kcm_kwinsupportinfo DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/kcms/kinfocenter) - -+configure_file(kcm_kwinsupportinfo.json.in ${CMAKE_CURRENT_BINARY_DIR}/kcm_kwinsupportinfo.json @ONLY) -+ - kpackage_install_package(package kcm_kwinsupportinfo kcms) -diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in -similarity index 98% -rename from Modules/kwinsupportinfo/kcm_kwinsupportinfo.json -rename to Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in -index 4a8dc422..7fd93ff2 100644 ---- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json -+++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in -@@ -35,6 +35,6 @@ - "Name[uk]": "Керування вікнами", - "Name[x-test]": "xxWindow Managerxx" - }, -- "TryExec": "qdbus", -+ "TryExec": "@QtBinariesDir@/qdbus", - "X-KDE-KInfoCenter-Category": "graphical_information" - } -diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp -index e1ca10e9..667c079f 100644 ---- a/Modules/kwinsupportinfo/main.cpp -+++ b/Modules/kwinsupportinfo/main.cpp -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - #include - -@@ -18,7 +19,7 @@ public: - explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data, const QVariantList &args) - : ConfigModule(parent, data, args) - { -- auto outputContext = new CommandOutputContext(QStringLiteral("qdbus"), -+ auto outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"), - {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")}, - parent); - qmlRegisterSingletonInstance("org.kde.kinfocenter.kwinsupportinfo.private", 1, 0, "InfoOutputContext", outputContext); --- -2.37.3 - diff --git a/kinfocenter-5.25.90.tar.xz b/kinfocenter-5.25.90.tar.xz deleted file mode 100644 index 873a2fd..0000000 --- a/kinfocenter-5.25.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ba73dd3ce667e62a2a2b5917515b10b6a410969da01da02060f6d2827f8d8d9 -size 728784 diff --git a/kinfocenter-5.25.90.tar.xz.sig b/kinfocenter-5.25.90.tar.xz.sig deleted file mode 100644 index 91b0f4e..0000000 --- a/kinfocenter-5.25.90.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmMjDVwACgkQ11dEg7tX -sY3asg//Wb8aiq192RI3ciqfUwZgv/VN13LV2DNFBR57gpxAF+98x57Q3WClMBfK -jZ+wGM6M/obtUvufA9Xji4YuJTfJxTdP9ZPLsuHxerjy1vXrMG02oAak3ZXA9k2Z -QlubTFT5nb8PtFfPaPtQ6OaUtS38/wmN6OzU416PMNU3SISSIJI4j+Slxvbpchr1 -+UzdIyaUKjbgTwAq6VnPS/GoA7ruL4jf42vfAm6ANRbp7DHcWjPqXUEyzuqFm1Sg -Tk9dtULx70uRpkG9ysohIiDq/je/ZF3/Wf1raZv9FkXNJ0a4bvBFhmPUwsLKi6xX -BdJuV75BKeFc/Qn9Qjq0eKfhbg3/j8fXzHPcwXHsZW1rRY+be/D0FoonAl+4tEr9 -bWQdCXndCgZc3pCPROmPsmymM4e50opmw2XQX97vZoHj8MpMEh+IxY0mtyB/ymaP -OLUoHRxY+K66AyJyNAmd8XODwtbWzpLWmL33xoMpE4O2Pz09axZqqpgiQJZDQhpv -22vWDqMkNBE8NWrJfN0jztRZh+a+0+nSs8zB0OSHyWn3UEMotmieBm6DBtkpAKPT -FV4VAmite4QtXE8ChfVkOSCssB/EmYzGHQ7Y5ayKXeRUEK0LzmN43iC9SSEmjJBK -xMATMfhuIBDu5qWDHGb9DRkyp3XAxnl5BMkT77s1qpp8WL2U2xo= -=2X/1 ------END PGP SIGNATURE----- diff --git a/kinfocenter-5.26.0.tar.xz b/kinfocenter-5.26.0.tar.xz new file mode 100644 index 0000000..6284c96 --- /dev/null +++ b/kinfocenter-5.26.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02c11b6bae2c00d095c5ef3b846647884fbfc7dfca8636967fd51ea7bb012e5a +size 729728 diff --git a/kinfocenter-5.26.0.tar.xz.sig b/kinfocenter-5.26.0.tar.xz.sig new file mode 100644 index 0000000..dd7a64e --- /dev/null +++ b/kinfocenter-5.26.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmM+x1oACgkQ11dEg7tX +sY37sA//QnLTGPj89eBtEjbK1ehw10D5ZBcBAcz4XRA7WKDKeyQ6HEErObasfVax +PNAsca+JgsHcnxma1BSkPtsERDlMUwpo6JJQpvgsFBxttUJvmfQTTkz6pSsIs2pE +Mq2UPJngHvqIIjRe6KiIyWTm+TS8y1RdGEgTe6/QpqJ/R3+nH5JjlQOav6KDnX+R +JOCJNrXcCF4+3IWlMSb1MBmsLvsJAWmxM3JFJzYvOrSR3p8Hyobo89fhYuqUX4Yt +MIBNBDJXDT6dmy+uI+H/+8hJ56VLqUNKCR/D3F6GgULzTheYAfgcLmRmc4aHUII9 +lhiV3jPTLJpet97Jh56+m+yHxj79YJyT6Evb+KDwkkVnvk1y9hR1OZSxoDNWBAE4 +s4kGo2WTkgpbfSdRXyvmYuCjDzHN2w0e7Tliv9uL3Wm5FvQuZAu8xzeeLKTSYdI6 +WQdPSvgV8lpKBX2QH+V/y2RT3/dD3pn/ApMFlZnzSUZMkiDUIASoHR9aNBIryxzl +3FOSvyyQU+RRkVdVG3ploZmmdhwavX60Mq9yJNZhgWM42KAw6tShCKhi1+KA1Za7 +hamwOBVAS9AIWXsmSVt200TSe9UY/Z9i2DO/oDlbd0mC7WDglV24cBkF7GPaFJR3 +5eBoeK4rzDsY/JaKUCKmgd9m9dlgtyvgNFJ4s+zWMz2wc0BEvV0= +=g3hy +-----END PGP SIGNATURE----- diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 805d4ce..8e4430e 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Oct 6 14:48:41 UTC 2022 - Fabian Vogt + +- Update to 5.26.0 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.26.0 +- Changes since 5.25.90: + * Install po folder + * Find qdbus command correctly +- Drop patches, now upstream: + * 0001-Find-qdbus-command-correctly.patch + ------------------------------------------------------------------- Sun Sep 18 10:01:21 UTC 2022 - Fabian Vogt diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 81b0721..99519eb 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -23,7 +23,7 @@ %bcond_without released Name: kinfocenter5 -Version: 5.25.90 +Version: 5.26.0 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} @@ -33,13 +33,11 @@ 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-UPSTREAM -Patch1: 0001-Find-qdbus-command-correctly.patch # PATCH-FIX-OPENSUSE Patch100: 0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch BuildRequires: extra-cmake-modules >= %{kf5_version}