sync form 5.27.6

This commit is contained in:
peijiankang 2024-01-29 15:13:08 +08:00
parent c27949792c
commit b921df0c03
2 changed files with 65 additions and 1 deletions

View File

@ -0,0 +1,60 @@
From 313e1a6cff0c2e4950457b1672e135b4ac7467b3 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Wed, 16 Aug 2023 16:47:08 +0800
Subject: [PATCH] fix build error of 5.27.6
---
src/config.cpp | 11 +++++++++++
src/config.h | 1 +
src/output.h | 1 +
3 files changed, 13 insertions(+)
diff --git a/src/config.cpp b/src/config.cpp
index 6e6c9f1..f116f61 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -43,6 +43,17 @@ public:
return iter == outputs.constEnd() ? KScreen::OutputPtr() : iter.value();
}
+ void onPrimaryOutputChanged()
+ {
+ const KScreen::OutputPtr output(qobject_cast<KScreen::Output *>(sender()), [](void *) {});
+ Q_ASSERT(output);
+ if (output->isPrimary()) {
+ q->setPrimaryOutput(output);
+ } else {
+ q->setPrimaryOutput(findPrimaryOutput());
+ }
+ }
+
// output priorities may be inconsistent after this call
OutputList::Iterator removeOutput(OutputList::Iterator iter)
{
diff --git a/src/config.h b/src/config.h
index 396b6cc..9346153 100644
--- a/src/config.h
+++ b/src/config.h
@@ -264,6 +264,7 @@ public:
Q_SIGNALS:
void outputAdded(const KScreen::OutputPtr &output);
void outputRemoved(int outputId);
+ void primaryOutputChanged(const KScreen::OutputPtr &output);
void prioritiesChanged();
private:
diff --git a/src/output.h b/src/output.h
index 72b14ee..29b3138 100755
--- a/src/output.h
+++ b/src/output.h
@@ -10,6 +10,7 @@
#include "kscreen_export.h"
#include "types.h"
+#include "mode.h"
#include <QDebug>
#include <QMetaType>
--
2.33.0

View File

@ -3,7 +3,7 @@
Name: libkscreen-qt5
Summary: KDE display configuration library
Version: 5.27.10
Release: 1
Release: 2
License: GPLv2+
URL: https://invent.kde.org/plasma/%{base_name}
@ -11,6 +11,7 @@ URL: https://invent.kde.org/plasma/%{base_name}
%global majmin %majmin_ver_kf5
%global stable %stable_kf5
Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{base_name}-%{version}.tar.xz
Patch01: 0001-fix-build-error-of-5.27.6.patch
# filter plugin provides
%global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$
@ -94,6 +95,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%{_kf5_archdatadir}/mkspecs/modules/qt_KScreen.pri
%changelog
* Mon Jan 29 2024 peijiankang<peijiankang@kylinos.cn> - 5.27.10-2
- add 0001-fix-build-error-of-5.27.6.patch(sync from 5.27.6-2)
* Mon Jan 08 2024 zhangxianting <zhangxianting@unintech.com> - 5.27.10-1
- update to upstream version 5.27.10