diff options
| -rw-r--r-- | lxqt-base/lxqt-config/files/kscreen.patch | 80 | ||||
| -rw-r--r-- | lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild (renamed from lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild) | 3 | ||||
| -rw-r--r-- | metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r2 (renamed from metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1) | 2 | ||||
| -rw-r--r-- | metadata/pkg_desc_index | 2 |
4 files changed, 85 insertions, 2 deletions
diff --git a/lxqt-base/lxqt-config/files/kscreen.patch b/lxqt-base/lxqt-config/files/kscreen.patch new file mode 100644 index 00000000..be6c0164 --- /dev/null +++ b/lxqt-base/lxqt-config/files/kscreen.patch @@ -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> diff --git a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild index ced25d45..936fe47f 100644 --- a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild +++ b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild @@ -50,6 +50,9 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { + if has_version ">=kde-plasma/libkscreen-5.26.90" ; then + eapply "${FILESDIR}"/kscreen.patch + fi if use gtk; then eapply "${FILESDIR}"/qgtk2.patch cmake_src_prepare diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1 b/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r2 index 32551881..da54c1c0 100644 --- a/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1 +++ b/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r2 @@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/libqtxdg-3.9.0 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 > SLOT=0 SRC_URI=https://github.com/lxqt/lxqt-config/releases/download/1.2.0/lxqt-config-1.2.0.tar.xz _eclasses_=cmake 449b4785acace35308fe747fc939bde1 flag-o-matic 69394e25812406faa1f90edaf4969395 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 38c85b725d0467e51954ea921b6c104b toolchain-funcs 9a610728b9bcca1919234cceb35a1027 xdg-utils ac0e315a3688929e34ac75b139e7349a -_md5_=00dcf67e7f2e59a4e650d0b3b79c02c2 +_md5_=38bc9976df482e2b42714d75bba73610 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 3c9936f4..b2484ec7 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -25,7 +25,7 @@ dev-util/lxqt-build-tools 0.12.0-r1: LXQt Build Tools gui-libs/display-manager-init 1.1.2-r1: RC init files for starting display and login managers kde-plasma/kinfocenter 5.27.0-r5: Utility providing information about the computer hardware lxde-base/lxappearance 0.6.3-r5: LXDE GTK+ theme switcher -lxqt-base/lxqt-config 1.2.0-r1: LXQt system configuration control center +lxqt-base/lxqt-config 1.2.0-r2: LXQt system configuration control center lxqt-base/lxqt-meta 1.2.0-r1: Meta ebuild for LXQt, the Lightweight Desktop Environment lxqt-base/lxqt-session 1.2.0-r1: LXQt Session Manager mail-client/mailspring 1.9.2-r1: A beautiful fast and maintained fork of Nylas Mail |