rebuilt with libkscreen 5.27.0 [release 1.2.0-2mamba;Mon Feb 20 2023]

This commit is contained in:
Silvan Calarco 2024-01-06 06:35:33 +01:00
parent 0bcc5b44ed
commit 70922ab3b8
2 changed files with 87 additions and 1 deletions

View File

@ -0,0 +1,80 @@
From 6add4e4f0040693e7c4242fbae48c9d32007686c Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Fri, 3 Feb 2023 08:11:04 +0900
Subject: [PATCH] lxqt-config-monitor: add more header file inclusion for
libkscreen 5.26.90 (#915)
With https://github.com/KDE/libkscreen/commit/94f330959b0eda775418aef7faee80ce69144e63 ,
`#include <KScreen/Output>` no longer includes "mode.h" implicitly.
So in lxqt-config-monitor, files using `class KScreen::Mode` should include
`#include <KScreen/Mode>` explicitly.
Related: #903 .
---
lxqt-config-monitor/kscreenutils.cpp | 1 +
lxqt-config-monitor/loadsettings.cpp | 1 +
lxqt-config-monitor/monitorpicture.cpp | 1 +
lxqt-config-monitor/monitorsettingsdialog.cpp | 1 +
lxqt-config-monitor/monitorwidget.cpp | 1 +
5 files changed, 5 insertions(+)
diff --git a/lxqt-config-monitor/kscreenutils.cpp b/lxqt-config-monitor/kscreenutils.cpp
index 9515e789..be2634d7 100644
--- a/lxqt-config-monitor/kscreenutils.cpp
+++ b/lxqt-config-monitor/kscreenutils.cpp
@@ -2,6 +2,7 @@
#include "timeoutdialog.h"
#include <KScreen/Output>
+#include <KScreen/Mode>
#include <KScreen/Config>
#include <KScreen/GetConfigOperation>
#include <KScreen/SetConfigOperation>
diff --git a/lxqt-config-monitor/loadsettings.cpp b/lxqt-config-monitor/loadsettings.cpp
index 0c7bd73c..4e9331ba 100644
--- a/lxqt-config-monitor/loadsettings.cpp
+++ b/lxqt-config-monitor/loadsettings.cpp
@@ -23,6 +23,7 @@
#include "kscreenutils.h"
#include <KScreen/Output>
#include <KScreen/Config>
+#include <KScreen/Mode>
#include <KScreen/GetConfigOperation>
#include <KScreen/SetConfigOperation>
#include <LXQt/Settings>
diff --git a/lxqt-config-monitor/monitorpicture.cpp b/lxqt-config-monitor/monitorpicture.cpp
index 0d06ab82..4cb14894 100644
--- a/lxqt-config-monitor/monitorpicture.cpp
+++ b/lxqt-config-monitor/monitorpicture.cpp
@@ -24,6 +24,7 @@
#include <QDebug>
#include <QVector2D>
#include <QRectF>
+#include <KScreen/Mode>
#include <QScrollBar>
#include "configure.h"
diff --git a/lxqt-config-monitor/monitorsettingsdialog.cpp b/lxqt-config-monitor/monitorsettingsdialog.cpp
index 6172019f..bfd8c1dd 100644
--- a/lxqt-config-monitor/monitorsettingsdialog.cpp
+++ b/lxqt-config-monitor/monitorsettingsdialog.cpp
@@ -28,6 +28,7 @@
#include "kscreenutils.h"
#include <KScreen/Output>
+#include <KScreen/Mode>
#include <QJsonObject>
#include <QJsonArray>
#include <LXQt/Settings>
diff --git a/lxqt-config-monitor/monitorwidget.cpp b/lxqt-config-monitor/monitorwidget.cpp
index e0fcf0a8..41883c25 100644
--- a/lxqt-config-monitor/monitorwidget.cpp
+++ b/lxqt-config-monitor/monitorwidget.cpp
@@ -22,6 +22,7 @@
#include <QComboBox>
#include <QStringBuilder>
#include <QDialogButtonBox>
+#include <KScreen/Mode>
#include <KScreen/EDID>
#include <algorithm>

View File

@ -1,6 +1,6 @@
Name: lxqt-config Name: lxqt-config
Version: 1.2.0 Version: 1.2.0
Release: 1mamba Release: 2mamba
Summary: Several tools involved in the configuration of both LXQt and the underlying operating system Summary: Several tools involved in the configuration of both LXQt and the underlying operating system
Group: Graphical Desktop/Applications/Configuration Group: Graphical Desktop/Applications/Configuration
Vendor: openmamba Vendor: openmamba
@ -8,6 +8,7 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://github.com/lxqt/lxqt-config URL: https://github.com/lxqt/lxqt-config
Source: https://github.com/lxqt/lxqt-config.git/%{version}/lxqt-config-%{version}.tar.bz2 Source: https://github.com/lxqt/lxqt-config.git/%{version}/lxqt-config-%{version}.tar.bz2
Patch0: lxqt-config-1.2.0-libkscreen-5.27.0.patch
License: LGPL License: LGPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -34,6 +35,7 @@ BuildRequires: qt5-qtbase-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: cmake BuildRequires: cmake
BuildRequires: xf86-input-libinput BuildRequires: xf86-input-libinput
BuildRequires: libkscreen-devel >= 5.27.0
%description %description
Several tools involved in the configuration of both LXQt and the underlying operating system. Several tools involved in the configuration of both LXQt and the underlying operating system.
@ -42,6 +44,7 @@ Several tools involved in the configuration of both LXQt and the underlying oper
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .libkscreen-5.27.0
%build %build
%cmake -d build %cmake -d build
@ -81,6 +84,9 @@ done
%doc AUTHORS LICENSE %doc AUTHORS LICENSE
%changelog %changelog
* Mon Feb 20 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.0-2mamba
- rebuilt with libkscreen 5.27.0
* Thu Nov 10 2022 Automatic Build System <autodist@mambasoft.it> 1.2.0-1mamba * Thu Nov 10 2022 Automatic Build System <autodist@mambasoft.it> 1.2.0-1mamba
- automatic version update by autodist - automatic version update by autodist