Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
ad30441c16
!31 sync form 5.27.6
From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2024-01-29 09:43:24 +00:00
peijiankang
b921df0c03 sync form 5.27.6 2024-01-29 17:34:12 +08:00
openeuler-ci-bot
c27949792c
!30 update to upstream version 5.27.10
From: @zhangxianting 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2024-01-10 00:29:36 +00:00
zhangxianting
e3c31d7235 update: update to version 5.27.10 2024-01-08 11:24:05 +08:00
openeuler-ci-bot
ae0cf7e6bc
!28 sync master to 2309
From: @peijiankang 
Reviewed-by: @hua_yadong 
Signed-off-by: @hua_yadong
2023-08-17 11:34:28 +00:00
peijiankang
ff01ac24a6 sync master to 2309 2023-08-17 10:43:47 +08:00
openeuler-ci-bot
edd92cdde9
!27 fix build error of 5.27.6
From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2023-08-17 01:41:05 +00:00
peijiankang
ff041ebcc0 fix build error of 5.27.6 2023-08-16 17:07:12 +08:00
openeuler-ci-bot
58bab5996d
!25 upstream version 5.27.6
From: @jackwike 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2023-08-08 08:47:11 +00:00
Jackwike
1f44b37202 upstream version 5.27.6 2023-08-08 16:34:33 +08:00
4 changed files with 86 additions and 17 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

Binary file not shown.

BIN
libkscreen-5.27.10.tar.xz Normal file

Binary file not shown.

View File

@ -2,21 +2,16 @@
Name: libkscreen-qt5
Summary: KDE display configuration library
Version: 5.26.4
Release: 1
Version: 5.27.10
Release: 2
License: GPLv2+
URL: https://invent.kde.org/plasma/%{base_name}
%global revision %(echo %{version} | cut -d. -f3)
%if %{revision} >= 50
%global stable unstable
%else
%global stable stable
%endif
%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)$
@ -33,6 +28,7 @@ BuildRequires: qt5-qtwayland-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: wayland-devel
BuildRequires: kf5-kconfig-devel
BuildRequires: qt5-qtbase-private-devel
Requires: kf5-filesystem
@ -57,8 +53,7 @@ developing applications that use %{name}.
%prep
%setup -q -n %{base_name}-%{version}
%autosetup -n %{base_name}-%{version} -p1
%build
@ -73,31 +68,45 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang_kf5 libkscreen5_qt
%ldconfig_scriptlets
%files
%files -f libkscreen5_qt.lang
%license LICENSES/*
%{_kf5_bindir}/kscreen-doctor
%{_kf5_libexecdir}/kscreen_backend_launcher
%{_kf5_libdir}/libKF5Screen.so.5.*
%{_kf5_libdir}/libKF5Screen.so.7*
%{_kf5_libdir}/libKF5Screen.so.8*
%{_kf5_libdir}/libKF5ScreenDpms.so.5.*
%{_kf5_libdir}/libKF5ScreenDpms.so.8*
%{_kf5_plugindir}/kscreen/
%{_datadir}/dbus-1/services/org.kde.kscreen.service
%{_kf5_datadir}/qlogging-categories5/libkscreen.categories
%{_kf5_datadir}/zsh/site-functions/_kscreen-doctor
%{_userunitdir}/plasma-kscreen.service
%{_kf5_datadir}/locale/*
%files devel
%{_kf5_includedir}/KScreen/
%{_kf5_includedir}/kscreen_version.h
%{_kf5_libdir}/libKF5Screen.so
%{_kf5_libdir}/libKF5ScreenDpms.so
%{_kf5_libdir}/cmake/KF5Screen/
%{_libdir}/pkgconfig/kscreen2.pc
%{_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
* Tue Aug 15 2023 peijiankang<peijiankang@kylinos.cn> - 5.27.6-2
- add 0001-fix-build-error-of-5.27.6.patch
* Fri Aug 04 2023 yajun<yajun@kylinos.cn> - 5.27.6-1
- update to upstream version 5.27.6
* Tue Dec 13 2022 lijian <lijian2@kylinos.cn> - 5.26.4-1
- update to upstream version 5.26.4