mirror of
https://github.com/terrapkg/packages.git
synced 2026-05-31 09:01:55 +00:00
chore: Deprecate Terra KF6-KIO (#8365)
Switcheroo patches were upstreamed, the rest of the patches are from Fedora. Signed-off-by: Gilver <rockgrub@disroot.org>
This commit is contained in:
Gilver
-30
@@ -1,30 +0,0 @@
|
||||
From 0cc287336b32e601e70b26d60d9335abde538a18 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Mon, 16 Oct 2023 17:57:16 -0700
|
||||
Subject: [PATCH] Give the kuriikwsfiltereng_private a VERSION and SOVERSION
|
||||
(#26)
|
||||
|
||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||||
---
|
||||
src/urifilters/ikws/CMakeLists.txt | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/urifilters/ikws/CMakeLists.txt b/src/urifilters/ikws/CMakeLists.txt
|
||||
index 7d42584c3..393588993 100644
|
||||
--- a/src/urifilters/ikws/CMakeLists.txt
|
||||
+++ b/src/urifilters/ikws/CMakeLists.txt
|
||||
@@ -1,6 +1,11 @@
|
||||
add_subdirectory(searchproviders)
|
||||
|
||||
add_library(kuriikwsfiltereng_private kuriikwsfiltereng.cpp searchprovider.cpp searchproviderregistry.cpp)
|
||||
+set_target_properties(kuriikwsfiltereng_private PROPERTIES
|
||||
+ VERSION ${KIO_VERSION}
|
||||
+ SOVERSION ${KIO_SOVERSION}
|
||||
+ EXPORT_NAME kuriikwsfiltereng_private
|
||||
+)
|
||||
generate_export_header(kuriikwsfiltereng_private) # We need this to be a shared lib, because otherwise we have duplicate Q_GLOBAL_STATICs
|
||||
target_link_libraries(kuriikwsfiltereng_private PUBLIC KF6::KIOGui)
|
||||
install(TARGETS kuriikwsfiltereng_private ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@@ -1,290 +0,0 @@
|
||||
From 7b1154d235f752b9fd1797f87861f11ef89d5d7a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= <sentrycraft123@gmail.com>
|
||||
Date: Thu, 15 Feb 2024 14:38:21 +0100
|
||||
Subject: [PATCH 1/7] Improve discrete GPU detection using switcheroo-control
|
||||
|
||||
---
|
||||
src/gui/gpudetection.cpp | 34 ++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 34 insertions(+)
|
||||
|
||||
diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp
|
||||
index ef246d3936..695bf27a1e 100644
|
||||
--- a/src/gui/gpudetection.cpp
|
||||
+++ b/src/gui/gpudetection.cpp
|
||||
@@ -62,6 +62,40 @@ static bool checkGpuWithSwitcheroo()
|
||||
QList<QVariantMap> gpus;
|
||||
arg >> gpus;
|
||||
|
||||
+ if (gpus.length() < 2) {
|
||||
+ // Skip checking for Default or Discrete GPUs when 1 or no GPU is available
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ // Check if the Default GPU is Discrete
|
||||
+ for (const auto &gpu : gpus) {
|
||||
+ bool defaultGpu = qvariant_cast<bool>(gpu[QStringLiteral("Default")]);
|
||||
+ if (defaultGpu) {
|
||||
+ bool discreteGpu = qvariant_cast<bool>(gpu.value(QStringLiteral("Discrete"), false));
|
||||
+ if (discreteGpu) {
|
||||
+ // If the default GPU is Discret there is no need to apply the env vars
|
||||
+ s_gpuCheck = GpuCheck::Present;
|
||||
+ return true;
|
||||
+ }
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // Find the first Discrete GPU
|
||||
+ for (const auto &gpu : gpus) {
|
||||
+ bool discreteGpu = qvariant_cast<bool>(gpu.value(QStringLiteral("Discrete"), false));
|
||||
+ if (!discreteGpu) {
|
||||
+ s_gpuCheck = GpuCheck::Present;
|
||||
+ QStringList envList = qvariant_cast<QStringList>(gpu[QStringLiteral("Environment")]);
|
||||
+ for (int i = 0; i + 1 < envList.size(); i += 2) {
|
||||
+ s_gpuEnv.insert(envList[i], envList[i + 1]);
|
||||
+ }
|
||||
+ return true;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // fallback to old behavior
|
||||
+ // find the first non-Default GPU
|
||||
for (const auto &gpu : gpus) {
|
||||
bool defaultGpu = qvariant_cast<bool>(gpu[QStringLiteral("Default")]);
|
||||
if (!defaultGpu) {
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 29c056a6a71b0de226369c03d02f47ab56a7877a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= <sentrycraft123@gmail.com>
|
||||
Date: Wed, 21 Feb 2024 15:57:28 +0100
|
||||
Subject: [PATCH 2/7] make gpus length comparison easier to reade
|
||||
|
||||
---
|
||||
src/gui/gpudetection.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp
|
||||
index 695bf27a1e..dfe6a9982b 100644
|
||||
--- a/src/gui/gpudetection.cpp
|
||||
+++ b/src/gui/gpudetection.cpp
|
||||
@@ -62,7 +62,7 @@ static bool checkGpuWithSwitcheroo()
|
||||
QList<QVariantMap> gpus;
|
||||
arg >> gpus;
|
||||
|
||||
- if (gpus.length() < 2) {
|
||||
+ if (gpus.length() <= 1) {
|
||||
// Skip checking for Default or Discrete GPUs when 1 or no GPU is available
|
||||
return false;
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From afc22129301ac2e33673ce9415b1e0d329a57c59 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= <sentrycraft123@gmail.com>
|
||||
Date: Wed, 21 Feb 2024 16:27:05 +0100
|
||||
Subject: [PATCH 3/7] lookup needed GPU entries in a single loop
|
||||
|
||||
---
|
||||
src/gui/gpudetection.cpp | 56 +++++++++++++++++-----------------------
|
||||
1 file changed, 23 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp
|
||||
index dfe6a9982b..57436e4789 100644
|
||||
--- a/src/gui/gpudetection.cpp
|
||||
+++ b/src/gui/gpudetection.cpp
|
||||
@@ -67,45 +67,35 @@ static bool checkGpuWithSwitcheroo()
|
||||
return false;
|
||||
}
|
||||
|
||||
- // Check if the Default GPU is Discrete
|
||||
- for (const auto &gpu : gpus) {
|
||||
- bool defaultGpu = qvariant_cast<bool>(gpu[QStringLiteral("Default")]);
|
||||
- if (defaultGpu) {
|
||||
- bool discreteGpu = qvariant_cast<bool>(gpu.value(QStringLiteral("Discrete"), false));
|
||||
- if (discreteGpu) {
|
||||
- // If the default GPU is Discret there is no need to apply the env vars
|
||||
- s_gpuCheck = GpuCheck::Present;
|
||||
- return true;
|
||||
- }
|
||||
- break;
|
||||
+ QVariantMap defaultGpu;
|
||||
+ QVariantMap firstDiscreteGpu;
|
||||
+ QVariantMap firstNonDefaultGpu;
|
||||
+
|
||||
+ for (const auto &gpu : std::as_const(gpus)) {
|
||||
+ if (defaultGpu.isEmpty() && qvariant_cast<bool>(gpu[QStringLiteral("Default")])) {
|
||||
+ defaultGpu = gpu;
|
||||
+ } else if (firstNonDefaultGpu.isEmpty()) {
|
||||
+ firstNonDefaultGpu = gpu;
|
||||
+ }
|
||||
+ if (firstDiscreteGpu.isEmpty() && qvariant_cast<bool>(gpu[QStringLiteral("Discrete")])) {
|
||||
+ firstDiscreteGpu = gpu;
|
||||
}
|
||||
}
|
||||
|
||||
- // Find the first Discrete GPU
|
||||
- for (const auto &gpu : gpus) {
|
||||
- bool discreteGpu = qvariant_cast<bool>(gpu.value(QStringLiteral("Discrete"), false));
|
||||
- if (!discreteGpu) {
|
||||
- s_gpuCheck = GpuCheck::Present;
|
||||
- QStringList envList = qvariant_cast<QStringList>(gpu[QStringLiteral("Environment")]);
|
||||
- for (int i = 0; i + 1 < envList.size(); i += 2) {
|
||||
- s_gpuEnv.insert(envList[i], envList[i + 1]);
|
||||
- }
|
||||
- return true;
|
||||
- }
|
||||
+ if (!defaultGpu.isEmpty() && defaultGpu[QStringLiteral("Discrete")].toBool()) {
|
||||
+ // If the default GPU is discrete we don't need to check for another device or apply special env vars
|
||||
+ s_gpuCheck = GpuCheck::Present;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
- // fallback to old behavior
|
||||
- // find the first non-Default GPU
|
||||
- for (const auto &gpu : gpus) {
|
||||
- bool defaultGpu = qvariant_cast<bool>(gpu[QStringLiteral("Default")]);
|
||||
- if (!defaultGpu) {
|
||||
- s_gpuCheck = GpuCheck::Present;
|
||||
- QStringList envList = qvariant_cast<QStringList>(gpu[QStringLiteral("Environment")]);
|
||||
- for (int i = 0; i + 1 < envList.size(); i += 2) {
|
||||
- s_gpuEnv.insert(envList[i], envList[i + 1]);
|
||||
- }
|
||||
- return true;
|
||||
+ // Otherwise prefer the discrete GPU over any other random non-default GPU (legacy behavior)
|
||||
+ for (const auto &gpu : {firstDiscreteGpu, firstNonDefaultGpu}) {
|
||||
+ s_gpuCheck = GpuCheck::Present;
|
||||
+ auto envList = qvariant_cast<QStringList>(gpu[QStringLiteral("Environment")]);
|
||||
+ for (int i = 0; i + 1 < envList.size(); i += 2) {
|
||||
+ s_gpuEnv.insert(envList[i], envList[i + 1]);
|
||||
}
|
||||
+ return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From d05cabb8e3e4aa60c8453edc0f6231d9bcb6d64e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= <sentrycraft123@gmail.com>
|
||||
Date: Wed, 21 Feb 2024 16:27:25 +0100
|
||||
Subject: [PATCH 4/7] correct absent gpu comment
|
||||
|
||||
---
|
||||
src/gui/gpudetection.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp
|
||||
index 57436e4789..bbef5ba8f2 100644
|
||||
--- a/src/gui/gpudetection.cpp
|
||||
+++ b/src/gui/gpudetection.cpp
|
||||
@@ -99,7 +99,7 @@ static bool checkGpuWithSwitcheroo()
|
||||
}
|
||||
#endif
|
||||
|
||||
- // No non-default GPU found
|
||||
+ // No discrete or non-default GPU found
|
||||
s_gpuCheck = GpuCheck::Absent;
|
||||
return true;
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 7f9f76ce9bb472b54bf7297b8b5c078eb0c194c9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= <sentrycraft123@gmail.com>
|
||||
Date: Thu, 22 Feb 2024 08:33:19 +0100
|
||||
Subject: [PATCH 5/7] check exact GPU count and fallback to solid when none are
|
||||
found
|
||||
|
||||
---
|
||||
src/gui/gpudetection.cpp | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp
|
||||
index bbef5ba8f2..d3bf895ea5 100644
|
||||
--- a/src/gui/gpudetection.cpp
|
||||
+++ b/src/gui/gpudetection.cpp
|
||||
@@ -62,9 +62,15 @@ static bool checkGpuWithSwitcheroo()
|
||||
QList<QVariantMap> gpus;
|
||||
arg >> gpus;
|
||||
|
||||
- if (gpus.length() <= 1) {
|
||||
- // Skip checking for Default or Discrete GPUs when 1 or no GPU is available
|
||||
+ auto gpu_count = gpus.length();
|
||||
+
|
||||
+ if (gpu_count == 0) {
|
||||
+ // No GPUs? Something might have gone wrong on the other end
|
||||
return false;
|
||||
+ } else if (gpu_count == 1) {
|
||||
+ // There is only one GPU, no need to check for others
|
||||
+ s_gpuCheck = GpuCheck::Absent;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
QVariantMap defaultGpu;
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 87ca7b125be15963c45867705f4b75e40b379437 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= <sentrycraft123@gmail.com>
|
||||
Date: Wed, 4 Sep 2024 23:58:18 +0000
|
||||
Subject: [PATCH 6/7] Simplify GPU count check
|
||||
|
||||
---
|
||||
src/gui/gpudetection.cpp | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp
|
||||
index d3bf895ea5..5e8450f2f9 100644
|
||||
--- a/src/gui/gpudetection.cpp
|
||||
+++ b/src/gui/gpudetection.cpp
|
||||
@@ -62,12 +62,10 @@ static bool checkGpuWithSwitcheroo()
|
||||
QList<QVariantMap> gpus;
|
||||
arg >> gpus;
|
||||
|
||||
- auto gpu_count = gpus.length();
|
||||
-
|
||||
- if (gpu_count == 0) {
|
||||
+ if (gpus.isEmpty()) {
|
||||
// No GPUs? Something might have gone wrong on the other end
|
||||
return false;
|
||||
- } else if (gpu_count == 1) {
|
||||
+ } else if (gpus.size() == 1) {
|
||||
// There is only one GPU, no need to check for others
|
||||
s_gpuCheck = GpuCheck::Absent;
|
||||
return true;
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 1920a2ea3b67331b419fc19a377b57a36466fb9f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jan=20Dr=C3=B6gehoff?= <sentrycraft123@gmail.com>
|
||||
Date: Thu, 5 Sep 2024 02:01:41 +0200
|
||||
Subject: [PATCH 7/7] Fix non default GPU fallback
|
||||
|
||||
---
|
||||
src/gui/gpudetection.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/gui/gpudetection.cpp b/src/gui/gpudetection.cpp
|
||||
index 5e8450f2f9..2f5547ab8f 100644
|
||||
--- a/src/gui/gpudetection.cpp
|
||||
+++ b/src/gui/gpudetection.cpp
|
||||
@@ -94,6 +94,9 @@ static bool checkGpuWithSwitcheroo()
|
||||
|
||||
// Otherwise prefer the discrete GPU over any other random non-default GPU (legacy behavior)
|
||||
for (const auto &gpu : {firstDiscreteGpu, firstNonDefaultGpu}) {
|
||||
+ if (gpu.isEmpty()) {
|
||||
+ continue;
|
||||
+ }
|
||||
s_gpuCheck = GpuCheck::Present;
|
||||
auto envList = qvariant_cast<QStringList>(gpu[QStringLiteral("Environment")]);
|
||||
for (int i = 0; i + 1 < envList.size(); i += 2) {
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From 6e7775d315f389df0a440ed62b842ce83dc9a27e Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Fella <nicolas.fella@gmx.de>
|
||||
Date: Fri, 1 Mar 2024 22:16:07 +0100
|
||||
Subject: [PATCH] [kterminallauncherjob] Inherit default process environment
|
||||
from parent
|
||||
|
||||
Before Qt 6.3, an empty (default constructed) QProcessEnvironment caused
|
||||
QProcess to incorrectly inherit the environment variables from the parent
|
||||
process. This was fixed in qtbase 5fc9c02a695.
|
||||
|
||||
CommandLauncherJob was adjusted for this in 916984940f64e07db9b4d152be9f2a87dda0cfb4,
|
||||
however here we are overriding its default env with our own default-constructed one
|
||||
|
||||
BUG: 482107
|
||||
---
|
||||
src/gui/kterminallauncherjob.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gui/kterminallauncherjob.cpp b/src/gui/kterminallauncherjob.cpp
|
||||
index c4e83fb11b..edd99327bd 100644
|
||||
--- a/src/gui/kterminallauncherjob.cpp
|
||||
+++ b/src/gui/kterminallauncherjob.cpp
|
||||
@@ -22,7 +22,7 @@ public:
|
||||
QString m_fullCommand; // "xterm -e ls"
|
||||
QString m_desktopName;
|
||||
QByteArray m_startupId;
|
||||
- QProcessEnvironment m_environment;
|
||||
+ QProcessEnvironment m_environment{QProcessEnvironment::InheritFromParent};
|
||||
};
|
||||
|
||||
KTerminalLauncherJob::KTerminalLauncherJob(const QString &command, QObject *parent)
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
project pkg {
|
||||
rpm {
|
||||
spec = "kf6-kio.spec"
|
||||
}
|
||||
labels {
|
||||
subrepo = "extras"
|
||||
updbranch = 1
|
||||
mock = 1
|
||||
}
|
||||
}
|
||||
@@ -1,369 +0,0 @@
|
||||
%global framework kio
|
||||
|
||||
%global stable_kf6 stable
|
||||
%global majmin_ver_kf6 6.21
|
||||
%global ecm_ver 6.21.0
|
||||
%global ecm_rel 1
|
||||
|
||||
Name: kf6-%{framework}
|
||||
Version: %{majmin_ver_kf6}.0
|
||||
Release: 1%{?dist}.switcheroo
|
||||
Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction
|
||||
|
||||
Obsoletes: kf6-%{framework}.switcheroo < 6.14.0-4
|
||||
|
||||
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
|
||||
URL: https://invent.kde.org/frameworks/%{framework}
|
||||
|
||||
Source0: https://download.kde.org/%{stable_kf6}/frameworks/%{majmin_ver_kf6}/%{framework}-%{version}.tar.xz
|
||||
Source1: https://download.kde.org/%{stable_kf6}/frameworks/%{majmin_ver_kf6}/%{framework}-%{version}.tar.xz.sig
|
||||
|
||||
# https://invent.kde.org/frameworks/kio/-/issues/26
|
||||
# I'm not sending this upstream because I'm not sure it's really
|
||||
# exactly what upstream will want, but it solves the practical
|
||||
# issue for us for now
|
||||
Patch0: 0001-Give-the-kuriikwsfiltereng_private-a-VERSION-and-SOV.patch
|
||||
|
||||
%if 0%{?flatpak}
|
||||
# Disable the help: and ghelp: protocol for Flatpak builds, to avoid depending
|
||||
# on the docbook stack.
|
||||
Patch101: kio-no-help-protocol.patch
|
||||
%endif
|
||||
|
||||
Provides: kf6-%{framework}
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: kf6-rpm-macros
|
||||
BuildRequires: cmake
|
||||
BuildRequires: cmake(KF6Archive)
|
||||
BuildRequires: cmake(KF6Crash)
|
||||
BuildRequires: cmake(KF6Solid)
|
||||
BuildRequires: switcheroo-control
|
||||
BuildRequires: cmake(KF6ColorScheme)
|
||||
BuildRequires: cmake(KF6Config)
|
||||
BuildRequires: cmake(KF6CoreAddons)
|
||||
BuildRequires: cmake(KF6DBusAddons)
|
||||
BuildRequires: cmake(KF6DocTools)
|
||||
BuildRequires: cmake(KF6GuiAddons)
|
||||
BuildRequires: cmake(KF6I18n)
|
||||
BuildRequires: cmake(KF6Service)
|
||||
BuildRequires: qt6-qtbase-private-devel
|
||||
BuildRequires: cmake(KF6Bookmarks)
|
||||
BuildRequires: cmake(KF6Completion)
|
||||
BuildRequires: cmake(KF6ConfigWidgets)
|
||||
BuildRequires: cmake(KF6IconThemes)
|
||||
BuildRequires: cmake(KF6ItemViews)
|
||||
BuildRequires: cmake(KF6JobWidgets)
|
||||
BuildRequires: cmake(KF6WindowSystem)
|
||||
BuildRequires: cmake(KF6Notifications)
|
||||
BuildRequires: cmake(KF6Wallet)
|
||||
BuildRequires: cmake(KF6WidgetsAddons)
|
||||
BuildRequires: cmake(KF6XmlGui)
|
||||
|
||||
BuildRequires: libacl-devel
|
||||
%if !0%{?flatpak}
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libxslt-devel
|
||||
%endif
|
||||
BuildRequires: pkgconfig(blkid)
|
||||
BuildRequires: pkgconfig(mount)
|
||||
BuildRequires: pkgconfig(xkbcommon)
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
BuildRequires: qt6-qtbase-devel
|
||||
BuildRequires: cmake(Qt6UiPlugin)
|
||||
BuildRequires: cmake(Qt6Qml)
|
||||
|
||||
BuildRequires: cmake(KF6KDED)
|
||||
BuildRequires: cmake(Qt6Core5Compat)
|
||||
|
||||
Requires: %{name}-core%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-widgets%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-file-widgets%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-gui%{?_isa} = %{version}-%{release}
|
||||
|
||||
Requires: kf6-kded
|
||||
|
||||
%description
|
||||
KDE Frameworks 6 Tier 3 solution for filesystem abstraction
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: kf6-kbookmarks-devel
|
||||
Requires: cmake(KF6Completion)
|
||||
Requires: cmake(KF6Config)
|
||||
Requires: cmake(KF6CoreAddons)
|
||||
Requires: cmake(KF6ItemViews)
|
||||
Requires: cmake(KF6JobWidgets)
|
||||
Requires: cmake(KF6Service)
|
||||
Requires: cmake(KF6Solid)
|
||||
Requires: cmake(KF6XmlGui)
|
||||
Requires: cmake(KF6WindowSystem)
|
||||
Requires: qt6-qtbase-devel
|
||||
Obsoletes: kf6-kio.switcheroo-devel < 6.14.0-4
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
%package doc
|
||||
Summary: Documentation files for %{name}
|
||||
Requires: %{name}-core = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
Obsoletes: kf6-kio.switcheroo-doc < 6.14.0-4
|
||||
%description doc
|
||||
Documentation for %{name}.
|
||||
|
||||
%package core
|
||||
Summary: Core components of the KIO Framework
|
||||
%{?kf6_kinit_requires}
|
||||
Requires: %{name}-core-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-doc = %{version}-%{release}
|
||||
Requires: kf6-filesystem
|
||||
Recommends: switcheroo-control
|
||||
Obsoletes: kf6-kio.switcheroo-core < 6.14.0-4
|
||||
%description core
|
||||
KIOCore library provides core non-GUI components for working with KIO.
|
||||
|
||||
%package core-libs
|
||||
Summary: Runtime libraries for KIO Core
|
||||
Requires: %{name}-core%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kf6-kio.switcheroo-core-libs < 6.14.0-4
|
||||
%description core-libs
|
||||
%{summary}.
|
||||
|
||||
%package widgets
|
||||
Summary: Widgets for KIO Framework
|
||||
## org.kde.klauncher6 service referenced from : widgets/krun.cpp
|
||||
## included here for completeness, even those -core already has a dependency.
|
||||
%{?kf6_kinit_requires}
|
||||
Requires: %{name}-core%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kf6-kio.switcheroo-widgets < 6.14.0-4
|
||||
%description widgets
|
||||
KIOWidgets contains classes that provide generic job control, progress
|
||||
reporting, etc.
|
||||
|
||||
%package widgets-libs
|
||||
Summary: Runtime libraries for KIO Widgets library
|
||||
Requires: %{name}-widgets%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kf6-kio.switcheroo-widgets-libs < 6.14.0-4
|
||||
%description widgets-libs
|
||||
%{summary}.
|
||||
|
||||
%package file-widgets
|
||||
Summary: Widgets for file-handling for KIO Framework
|
||||
Requires: %{name}-widgets%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kf6-kio.switcheroo-file-widgets < 6.14.0-4
|
||||
%description file-widgets
|
||||
The KIOFileWidgets library provides the file selection dialog and
|
||||
its components.
|
||||
|
||||
%package gui
|
||||
Summary: Gui components for the KIO Framework
|
||||
Requires: %{name}-core%{?_isa} = %{version}-%{release}
|
||||
Provides: kf6-kio-gui = %version-%release
|
||||
Obsoletes: kf6-kio.switcheroo-gui < 6.14.0-4
|
||||
%description gui
|
||||
%{summary}.
|
||||
|
||||
%package qch-doc
|
||||
Summary: Developer Documentation files for %{name}
|
||||
BuildArch: noarch
|
||||
Obsoletes: kf6-kio.switcheroo-qch-doc < 6.14.0-4
|
||||
%description qch-doc
|
||||
Developer Documentation files for %{name} for use with KDevelop or QtCreator.
|
||||
|
||||
%package html
|
||||
Summary: Developer Documentation files for %{name}
|
||||
BuildArch: noarch
|
||||
%description html
|
||||
Developer Documentation files for %{name} in HTML format
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{framework}-%{version} -p1
|
||||
|
||||
|
||||
%build
|
||||
%cmake_kf6
|
||||
%cmake_build_kf6
|
||||
|
||||
|
||||
%install
|
||||
%cmake_install_kf6
|
||||
%find_lang kf6-kio --all-name --with-man --with-html
|
||||
|
||||
%files
|
||||
%license LICENSES/*.txt
|
||||
%doc README.md
|
||||
|
||||
%files core
|
||||
%{_kf6_libexecdir}/kioexec
|
||||
%{_kf6_libexecdir}/kiod6
|
||||
%{_kf6_libexecdir}/kioworker
|
||||
%{_kf6_bindir}/ktelnetservice6
|
||||
%{_kf6_bindir}/ktrash6
|
||||
%{_kf6_plugindir}/kio/
|
||||
%{_kf6_plugindir}/kded/
|
||||
%{_kf6_plugindir}/kiod/
|
||||
%{_kf6_plugindir}/kio_dnd/
|
||||
%{_kf6_datadir}/kf6/searchproviders/*.desktop
|
||||
%{_kf6_datadir}/applications/*.desktop
|
||||
%{_datadir}/dbus-1/services/org.kde.*.service
|
||||
%{_kf6_datadir}/qlogging-categories6/*categories
|
||||
|
||||
%files core-libs
|
||||
%{_kf6_libdir}/libKF6KIOCore.so.*
|
||||
|
||||
%files doc -f kf6-kio.lang
|
||||
|
||||
%files gui
|
||||
%{_kf6_libdir}/libKF6KIOGui.so.*
|
||||
|
||||
%files widgets
|
||||
%dir %{_kf6_plugindir}/urifilters/
|
||||
%{_kf6_plugindir}/urifilters/*.so
|
||||
%{_kf6_libdir}/libkuriikwsfiltereng_private.so.*
|
||||
|
||||
%files widgets-libs
|
||||
%{_kf6_libdir}/libKF6KIOWidgets.so.*
|
||||
|
||||
%files file-widgets
|
||||
%{_kf6_libdir}/libKF6KIOFileWidgets.so.*
|
||||
|
||||
%files devel
|
||||
%{_kf6_includedir}/*
|
||||
%{_kf6_libdir}/*.so
|
||||
%{_kf6_libdir}/cmake/KF6KIO/
|
||||
%{_kf6_datadir}/kdevappwizard/templates/kioworker6.tar.bz2
|
||||
%{_kf6_qtplugindir}/designer/kio6widgets.so
|
||||
%{_qt6_docdir}/*/*.tags
|
||||
%{_qt6_docdir}/*/*.index
|
||||
|
||||
%files qch-doc
|
||||
%{_qt6_docdir}/*.qch
|
||||
|
||||
%files html
|
||||
%{_qt6_docdir}/*/*
|
||||
%exclude %{_qt6_docdir}/*/*.tags
|
||||
%exclude %{_qt6_docdir}/*/*.index
|
||||
|
||||
%changelog
|
||||
* Fri Feb 07 2025 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.11.0-1
|
||||
- 6.11.0
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.10.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Tue Jan 07 2025 Steve Cossette <farchord@gmail.com> - 6.10.0-2
|
||||
- File Picker: Fix 'All supported files' for more than 3
|
||||
filters
|
||||
|
||||
* Fri Jan 03 2025 Steve Cossette <farchord@gmail.com> - 6.10.0-1
|
||||
- 6.10.0
|
||||
|
||||
* Sat Dec 14 2024 Steve Cossette <farchord@gmail.com> - 6.9.0-1
|
||||
- 6.9.0
|
||||
|
||||
* Sat Nov 02 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.8.0-1
|
||||
- 6.8.0
|
||||
|
||||
* Mon Oct 14 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-2
|
||||
- Rebuild (qt6)
|
||||
|
||||
* Fri Oct 04 2024 Steve Cossette <farchord@gmail.com> - 6.7.0-1
|
||||
- 6.7.0
|
||||
|
||||
* Mon Sep 16 2024 Steve Cossette <farchord@gmail.com> - 6.6.0-1
|
||||
- 6.6.0
|
||||
|
||||
* Sat Aug 10 2024 Steve Cossette <farchord@gmail.com> - 6.5.0-1
|
||||
- 6.5.0
|
||||
|
||||
* Fri Jul 19 2024 Steve Cossette <farchord@gmail.com> - 6.4.1-1
|
||||
- 6.4.1
|
||||
|
||||
* Thu Jul 18 2024 Steve Cossette <farchord@gmail.com> - 6.4.0-3
|
||||
- Fix for a regression in Frameworks 6.4.0
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jul 06 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.4.0-1
|
||||
- 6.4.0
|
||||
|
||||
* Sat Jun 01 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.3.0-1
|
||||
- 6.3.0
|
||||
|
||||
* Sat May 04 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.2.0-1
|
||||
- 6.2.0
|
||||
|
||||
* Wed Apr 10 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.1.0-1
|
||||
- 6.1.0
|
||||
|
||||
* Thu Apr 04 2024 Jan Grulich <jgrulich@redhat.com> - 6.0.0-7
|
||||
- Re-enable docs
|
||||
|
||||
* Thu Apr 04 2024 Jan Grulich <jgrulich@redhat.com> - 6.0.0-6
|
||||
- Rebuild (qt6)
|
||||
|
||||
* Fri Mar 15 2024 Marie Loise Nolden <loise@kde.org> - 6.0.0-5
|
||||
- add 6e7775d315f389df0a440ed62b842ce83dc9a27e.patch
|
||||
[kterminallauncherjob] Inherit default process environment from parent
|
||||
|
||||
* Mon Mar 11 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 6.0.0-4
|
||||
- Soften switcheroo-control dependency
|
||||
|
||||
* Sat Mar 09 2024 Marie Loise Nolden <loise@kde.org> - 6.0.0-3
|
||||
- add missing BuildArch: noarch to -doc package
|
||||
|
||||
* Sat Mar 2 2024 Marie Loise Nolden <loise@kde.org> - 6.0.0-2
|
||||
- move qt designer plugin to -devel
|
||||
|
||||
* Wed Feb 21 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.0.0-1
|
||||
- 6.0.0
|
||||
|
||||
* Fri Feb 16 2024 Jan Grulich <jgrulich@redhat.com> - 5.249.0-2
|
||||
- Rebuild (qt6)
|
||||
|
||||
* Wed Jan 31 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.249.0-1
|
||||
- 5.249.0
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.248.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.248.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jan 10 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.248.0-1
|
||||
- 5.248.0
|
||||
|
||||
* Tue Jan 09 2024 Marie Loise Nolden <loise@kde.org> - 5.247.0-2
|
||||
- add doc package for KF6 API
|
||||
|
||||
* Wed Dec 20 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.247.0-1
|
||||
- 5.247.0
|
||||
|
||||
* Sat Dec 02 2023 Justin Zobel <justin.zobel@gmail.com> - 5.246.0-1
|
||||
- Update to 5.246.0
|
||||
|
||||
* Wed Nov 29 2023 Jan Grulich <jgrulich@redhat.com> - 5.245.0-3
|
||||
- Rebuild (qt6)
|
||||
|
||||
* Mon Nov 20 2023 Alessandro Astone <ales.astone@gmail.com> - 5.245.0-2
|
||||
- Add back kuriikwsfiltereng SOVERSION patch
|
||||
|
||||
* Thu Nov 09 2023 Steve Cossette <farchord@gmail.com> - 5.245.0-1
|
||||
- 5.245.0
|
||||
|
||||
* Tue Oct 17 2023 Jan Grulich <jgrulich@redhat.com> - 5.240.0^20231010.060359.1c34fd4-4
|
||||
- Rebuild (qt6)
|
||||
|
||||
* Mon Oct 16 2023 Adam Williamson <awilliam@redhat.com> - 5.240.0^20231010.060359.1c34fd4-3
|
||||
- Give kuriikwsfiltereng_private library a proper soname to fix deps
|
||||
|
||||
* Mon Oct 09 2023 Steve Cossette <farchord@gmail.com> - 5.240.0^20231010.060359.1c34fd4-2
|
||||
- Fixed a problem with the -doc subpackage building differently on different arches.
|
||||
|
||||
* Mon Oct 09 2023 Steve Cossette <farchord@gmail.com> - 5.240.0^20231010.060359.1c34fd4-1
|
||||
- Initial Release
|
||||
@@ -1,20 +0,0 @@
|
||||
import "andax/bump_extras.rhai" as bump;
|
||||
|
||||
let pkg = "kf6-kio";
|
||||
let branch = bump::as_bodhi_ver(labels.branch);
|
||||
|
||||
let url = `https://bodhi.fedoraproject.org/updates/?search=${pkg}&status=stable&releases=${branch}&rows_per_page=1&page=1`;
|
||||
|
||||
for entry in get(url).json().updates[0].title.split(' ') {
|
||||
let matches = find_all(`${pkg}-([\d.]+)-(\d+)\.[\w\d]+$`, entry);
|
||||
if matches.len() == 0 { continue; }
|
||||
if matches[0][1].ends_with(".0") {
|
||||
rpm.global("majmin_ver_kf6", matches[0][1][0..matches[0][1].len()-2]);
|
||||
rpm.f = sub(`Release: (.+?)\n`, "Release: " + matches[0][2] + "%{?dist}.switcheroo\n", rpm.f);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
let vr = bump::bodhi_vr("extra-cmake-modules", branch);
|
||||
rpm.global("ecm_ver", vr[1]);
|
||||
rpm.global("ecm_rel", vr[2]);
|
||||
Reference in New Issue
Block a user