Date: Tuesday, February 14, 2023 @ 17:06:00
Author: arojas
Revision: 1400467
archrelease: copy trunk to community-staging-x86_64
Added:
ukui-settings-daemon/repos/community-staging-x86_64/
ukui-settings-daemon/repos/community-staging-x86_64/PKGBUILD
(from rev 1400466, ukui-settings-daemon/trunk/PKGBUILD)
ukui-settings-daemon/repos/community-staging-x86_64/libkscreen-5.27.patch
(from rev 1400466, ukui-settings-daemon/trunk/libkscreen-5.27.patch)
-----------------------+
PKGBUILD | 39 ++++++++++++++++++++++++
libkscreen-5.27.patch | 76 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 115 insertions(+)
Copied: ukui-settings-daemon/repos/community-staging-x86_64/PKGBUILD (from rev
1400466, ukui-settings-daemon/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2023-02-14 17:06:00 UTC (rev 1400467)
@@ -0,0 +1,39 @@
+# Maintainer: Felix Yan <[email protected]>
+
+pkgname=ukui-settings-daemon
+pkgver=3.1.1.1
+pkgrel=3
+pkgdesc="Daemon handling the UKUI session settings"
+arch=('x86_64')
+license=('GPL')
+url="https://github.com/ukui/ukui-settings-daemon";
+groups=('ukui')
+depends=('geoclue' 'gnome-desktop' 'gsettings-qt' 'gtk3' 'kconfig'
'kglobalaccel' 'kwindowsystem'
+ 'imlib2' 'libcanberra' 'libkscreen' 'libmatekbd' 'libmatemixer'
'libnotify' 'libxklavier'
+ 'mate-desktop' 'qt5-sensors' 'qt5-svg' 'qt5-x11extras'
'ukui-interface')
+makedepends=('qt5-tools' 'xorg-server-devel')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/ukui/ukui-settings-daemon/archive/v$pkgver.tar.gz";
+ libkscreen-5.27.patch)
+sha512sums=('451cca8c153764c497d502eb6159db44bbdf0fce63c5ee38d3f347ee8c1d84d726f7026b1b02b463c6c7a8b9a15a84ad5df8f27b5afe0e06d2b6a81481839fe4'
+
'e99ae6572322d727b67cafe83559c98dc0f93e29a2c982ab9b34a74c6bf9afa241aa8fdf90ed5b04b464c46d08ef90ecabbe99fcb93e2e8ce711db59597183cc')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's|#include <ukuisdk/kylin-com4cxx.h>|#include <kylin-com4cxx.h>|'
common/usd_base_class.h
+ sed -i 's|udev.path = /lib/udev/rules.d/|udev.path =
/usr/lib/udev/rules.d/|' plugins/mouse/mouse.pro
+
+ # Fix build with libkscreen 5.27
+ sed -e 's|c++11||' -i plugins/xrandr/xrandr.pro -i common/common.pri
+ patch -p1 -i ../libkscreen-5.27.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+}
Copied:
ukui-settings-daemon/repos/community-staging-x86_64/libkscreen-5.27.patch (from
rev 1400466, ukui-settings-daemon/trunk/libkscreen-5.27.patch)
===================================================================
--- community-staging-x86_64/libkscreen-5.27.patch
(rev 0)
+++ community-staging-x86_64/libkscreen-5.27.patch 2023-02-14 17:06:00 UTC
(rev 1400467)
@@ -0,0 +1,76 @@
+diff --git a/plugins/save-param/xrandr-output.cpp
b/plugins/save-param/xrandr-output.cpp
+index 3497bf4..7ee0a89 100644
+--- a/plugins/save-param/xrandr-output.cpp
++++ b/plugins/save-param/xrandr-output.cpp
+@@ -30,6 +30,7 @@
+ #include <QRect>
+ #include <QStandardPaths>
+ #include <QtXml>
++#include <KF5/KScreen/kscreen/mode.h>
+ #include <KF5/KScreen/kscreen/output.h>
+ #include <KF5/KScreen/kscreen/edid.h>
+ #include "xrandr-config.h"
+diff --git a/plugins/xrandr/xrandr-manager.cpp
b/plugins/xrandr/xrandr-manager.cpp
+index bbf12b5..b294c19 100644
+--- a/plugins/xrandr/xrandr-manager.cpp
++++ b/plugins/xrandr/xrandr-manager.cpp
+@@ -950,7 +950,7 @@ void XrandrManager::outputRemoved(int outputId)
+
+ }
+
+-void XrandrManager::primaryOutputChanged(const KScreen::OutputPtr &output)
++void XrandrManager::primaryOutputChanged()
+ {
+ // USD_LOG(LOG_DEBUG,".");
+ }
+@@ -1197,7 +1197,7 @@ void XrandrManager::monitorsInit()
+ mSaveConfigTimer->start(SAVE_CONFIG_TIME);
+ });
+
+- connect(output.data(), &KScreen::Output::isPrimaryChanged, this,
[this](){
++ connect(output.data(), &KScreen::Output::priorityChanged, this,
[this](){
+ KScreen::Output *senderOutput = static_cast<KScreen::Output*>
(sender());
+
USD_LOG(LOG_DEBUG,"PrimaryChanged:%s",senderOutput->name().toLatin1().data());
+
+@@ -1289,7 +1289,7 @@ void XrandrManager::monitorsInit()
+ this, &XrandrManager::outputRemoved,
+ static_cast<Qt::ConnectionType>(Qt::QueuedConnection |
Qt::UniqueConnection));
+
+- connect(mConfig.data(), &KScreen::Config::primaryOutputChanged,
++ connect(mConfig.data(), &KScreen::Config::prioritiesChanged,
+ this, &XrandrManager::primaryOutputChanged);
+
+ if (mMonitoredConfig->fileExists()) {
+diff --git a/plugins/xrandr/xrandr-manager.h b/plugins/xrandr/xrandr-manager.h
+index 33d0b60..c91c37c 100644
+--- a/plugins/xrandr/xrandr-manager.h
++++ b/plugins/xrandr/xrandr-manager.h
+@@ -36,6 +36,7 @@
+
+
+ #include <KF5/KScreen/kscreen/config.h>
++#include <KF5/KScreen/kscreen/mode.h>
+ #include <KF5/KScreen/kscreen/log.h>
+ #include <KF5/KScreen/kscreen/output.h>
+ #include <KF5/KScreen/kscreen/edid.h>
+@@ -130,7 +131,7 @@ public Q_SLOTS:
+ void RotationChangedEvent(const QString &rotation);
+ void outputAddedHandle(const KScreen::OutputPtr &output);
+ void outputRemoved(int outputId);
+- void primaryOutputChanged(const KScreen::OutputPtr &output);
++ void primaryOutputChanged();
+ // void applyConfigTimerHandle();
+ void setScreenMode(QString modeName);
+ void setScreensParam(QString screensParam);
+diff --git a/plugins/xrandr/xrandr-output.cpp
b/plugins/xrandr/xrandr-output.cpp
+index d18cf4f..4e125b8 100644
+--- a/plugins/xrandr/xrandr-output.cpp
++++ b/plugins/xrandr/xrandr-output.cpp
+@@ -30,6 +30,7 @@
+ #include <QRect>
+ #include <QStandardPaths>
+ #include <QtXml>
++#include <KF5/KScreen/kscreen/mode.h>
+ #include <KF5/KScreen/kscreen/output.h>
+ #include <KF5/KScreen/kscreen/edid.h>
+ #include "xrandr-config.h"
