Date: Tuesday, February 14, 2023 @ 16:01:30
Author: arojas
Revision: 1400458
upgpkg: ukui-control-center 3.0.4-5: Plasma 5.27 rebuild
Added:
ukui-control-center/trunk/libkscreen-5.27.patch
Modified:
ukui-control-center/trunk/PKGBUILD
-----------------------+
PKGBUILD | 12 +++++--
libkscreen-5.27.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-02-14 15:50:41 UTC (rev 1400457)
+++ PKGBUILD 2023-02-14 16:01:30 UTC (rev 1400458)
@@ -2,7 +2,7 @@
pkgname=ukui-control-center
pkgver=3.0.4
-pkgrel=4
+pkgrel=5
pkgdesc="Utilities to configure the UKUI desktop"
arch=('x86_64')
license=('GPL')
@@ -14,9 +14,11 @@
'ukui-settings-daemon' 'upower' 'libcanberra')
makedepends=('boost' 'qt5-tools')
source=("$pkgname-$pkgver.tar.gz::https://github.com/ukui/ukui-control-center/archive/v$pkgver.tar.gz";
- 6.patch)
+ 6.patch
+ libkscreen-5.27.patch)
sha512sums=('f751502d66a36d8a6fe0199ec4408c3c371923c9a9b1e722f75bff66090f3b6eac18df2c8fd5b7c4d223a7938f491e4b89a91636cf15944574ecdeb43b995f4c'
-
'b15fc2f32fac0fbae3bf30d9cc19c78375bd50c35815d540c79ac9a7ba561b52ca599c0385826529603146f7a368045f1a861b5173f2538b226376e9f4cd9129')
+
'b15fc2f32fac0fbae3bf30d9cc19c78375bd50c35815d540c79ac9a7ba561b52ca599c0385826529603146f7a368045f1a861b5173f2538b226376e9f4cd9129'
+
'cadf51c25f2cfdb236507366b644f6b1ea371b812664190f09f3e0ac2c9f76c29759cdb01492b9847a3327d123f711ab383dc2967c926c8637a043d8b76d1037')
prepare() {
cd ukui-control-center-$pkgver
@@ -30,6 +32,10 @@
sed -i 's|systemd_service.path = /lib/systemd/system|systemd_service.path =
/usr/lib/systemd/system|' group-manager-server/group-manager-server.pro
sed -i 's|gio-unix-2.0|glib-2.0|' plugins/account/userinfo/giodbus.cpp
+
+ # Fix build with libkscreen 5.27
+ sed -e 's|c++11||' -i plugins/system/display/display.pro -i
plugins/system/touchscreen/touchscreen.pro
+ patch -p1 -i ../libkscreen-5.27.patch
}
build() {
Added: libkscreen-5.27.patch
===================================================================
--- libkscreen-5.27.patch (rev 0)
+++ libkscreen-5.27.patch 2023-02-14 16:01:30 UTC (rev 1400458)
@@ -0,0 +1,74 @@
+diff --git a/plugins/system/display/outputconfig.h
b/plugins/system/display/outputconfig.h
+index 89d61f0b..afe86424 100644
+--- a/plugins/system/display/outputconfig.h
++++ b/plugins/system/display/outputconfig.h
+@@ -23,6 +23,7 @@
+ #include <QComboBox>
+ #include <QWidget>
+
++#include <KF5/KScreen/kscreen/mode.h>
+ #include <KF5/KScreen/kscreen/output.h>
+
+ #include <QGSettings>
+diff --git a/plugins/system/display/resolutionslider.cpp
b/plugins/system/display/resolutionslider.cpp
+index e0bd3d36..3a9b88fa 100644
+--- a/plugins/system/display/resolutionslider.cpp
++++ b/plugins/system/display/resolutionslider.cpp
+@@ -29,6 +29,7 @@
+
+ #include <QDBusInterface>
+
++#include <KF5/KScreen/kscreen/mode.h>
+ #include <KF5/KScreen/kscreen/output.h>
+
+ static bool sizeLessThan(const QSize &sizeA, const QSize &sizeB)
+diff --git a/plugins/system/display/widget.cpp
b/plugins/system/display/widget.cpp
+index 6bfc22c9..a4bb8f17 100644
+--- a/plugins/system/display/widget.cpp
++++ b/plugins/system/display/widget.cpp
+@@ -219,7 +219,7 @@ void Widget::setConfig(const KScreen::ConfigPtr &config,
bool showBrightnessFram
+ outputRemoved(outputId, false);
+ });
+
+- connect(mConfig.data(), &KScreen::Config::primaryOutputChanged,
++ connect(mConfig.data(), &KScreen::Config::prioritiesChanged,
+ this, &Widget::primaryOutputChanged);
+
+ for (const KScreen::OutputPtr &output : mConfig->outputs()) {
+@@ -1026,9 +1026,10 @@ void Widget::primaryOutputSelected(int index)
+ }
+
+ // 主输出
+-void Widget::primaryOutputChanged(const KScreen::OutputPtr &output)
++void Widget::primaryOutputChanged()
+ {
+ Q_ASSERT(mConfig);
++ const KScreen::OutputPtr &output = mConfig->primaryOutput();
+ int index = output.isNull() ? 0 :
ui->primaryCombo->findData(output->id());
+ if (index == -1 || index == ui->primaryCombo->currentIndex()) {
+ return;
+diff --git a/plugins/system/display/widget.h b/plugins/system/display/widget.h
+index 9790c59c..83c6351c 100644
+--- a/plugins/system/display/widget.h
++++ b/plugins/system/display/widget.h
+@@ -131,7 +131,7 @@ private Q_SLOTS:
+ void outputAdded(const KScreen::OutputPtr &output, bool connectChanged);
+ void outputRemoved(int outputId, bool connectChanged);
+ void primaryOutputSelected(int index);
+- void primaryOutputChanged(const KScreen::OutputPtr &output);
++ void primaryOutputChanged();
+
+ void showNightWidget(bool judge);
+ void showCustomWiget(int index);
+diff --git a/plugins/system/touchscreen/touchscreen.cpp
b/plugins/system/touchscreen/touchscreen.cpp
+index b318d296..307c616b 100644
+--- a/plugins/system/touchscreen/touchscreen.cpp
++++ b/plugins/system/touchscreen/touchscreen.cpp
+@@ -21,6 +21,7 @@
+
+
+ #include <KF5/KScreen/kscreen/getconfigoperation.h>
++#include <KF5/KScreen/kscreen/mode.h>
+ #include <KF5/KScreen/kscreen/output.h>
+ #include <QDebug>
+ #include <QThread>
