Date: Tuesday, February 14, 2023 @ 16:01:41
Author: arojas
Revision: 1400459
archrelease: copy trunk to community-staging-x86_64
Added:
ukui-control-center/repos/community-staging-x86_64/
ukui-control-center/repos/community-staging-x86_64/6.patch
(from rev 1400458, ukui-control-center/trunk/6.patch)
ukui-control-center/repos/community-staging-x86_64/PKGBUILD
(from rev 1400458, ukui-control-center/trunk/PKGBUILD)
ukui-control-center/repos/community-staging-x86_64/libkscreen-5.27.patch
(from rev 1400458, ukui-control-center/trunk/libkscreen-5.27.patch)
-----------------------+
6.patch | 23 ++++++++++++++
PKGBUILD | 53 ++++++++++++++++++++++++++++++++++
libkscreen-5.27.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 150 insertions(+)
Copied: ukui-control-center/repos/community-staging-x86_64/6.patch (from rev
1400458, ukui-control-center/trunk/6.patch)
===================================================================
--- community-staging-x86_64/6.patch (rev 0)
+++ community-staging-x86_64/6.patch 2023-02-14 16:01:41 UTC (rev 1400459)
@@ -0,0 +1,23 @@
+From d827d4850e405f098ed0967f02ef3034dbddd661 Mon Sep 17 00:00:00 2001
+From: Xeonacid <[email protected]>
+Date: Wed, 19 Jan 2022 23:19:35 +0800
+Subject: [PATCH] fix(changeUserPwd/run-passwd.cpp): format security
+
+Add "%s" format to g_error_new, to fix the format string security issue.
+---
+ changeUserPwd/run-passwd.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/changeUserPwd/run-passwd.cpp b/changeUserPwd/run-passwd.cpp
+index 59a76501..aca032f1 100644
+--- a/changeUserPwd/run-passwd.cpp
++++ b/changeUserPwd/run-passwd.cpp
+@@ -377,7 +377,7 @@ static gboolean io_watch_stdout (GIOChannel *source,
GIOCondition condition, Pas
+ "Your password has been changed
after you verify!");
+ } */else {
+ error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_UNKNOWN,
+- str->str);
++ "%s", str->str);
+ }
+
+ /* At this point, passwd might have exited, in which case
Copied: ukui-control-center/repos/community-staging-x86_64/PKGBUILD (from rev
1400458, ukui-control-center/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2023-02-14 16:01:41 UTC (rev 1400459)
@@ -0,0 +1,53 @@
+# Maintainer: Felix Yan <[email protected]>
+
+pkgname=ukui-control-center
+pkgver=3.0.4
+pkgrel=5
+pkgdesc="Utilities to configure the UKUI desktop"
+arch=('x86_64')
+license=('GPL')
+url="https://github.com/ukui/ukui-control-center";
+groups=('ukui')
+depends=('bluez-qt' 'boost-libs' 'ddcutil' 'kconfig' 'kconfigwidgets' 'ki18n'
'kscreen'
+ 'kwidgetsaddons' 'libpwquality' 'lsb-release' 'peony'
'qt5-quickcontrols' 'ukui-interface'
+ 'ukui-panel' 'ukui-media' 'ukui-menus' 'ukui-power-manager'
'ukui-screensaver'
+ '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
+ libkscreen-5.27.patch)
+sha512sums=('f751502d66a36d8a6fe0199ec4408c3c371923c9a9b1e722f75bff66090f3b6eac18df2c8fd5b7c4d223a7938f491e4b89a91636cf15944574ecdeb43b995f4c'
+
'b15fc2f32fac0fbae3bf30d9cc19c78375bd50c35815d540c79ac9a7ba561b52ca599c0385826529603146f7a368045f1a861b5173f2538b226376e9f4cd9129'
+
'cadf51c25f2cfdb236507366b644f6b1ea371b812664190f09f3e0ac2c9f76c29759cdb01492b9847a3327d123f711ab383dc2967c926c8637a043d8b76d1037')
+
+prepare() {
+ cd ukui-control-center-$pkgver
+
+ # Fix format-security
+ # https://github.com/ukui/ukui-control-center/pull/6
+ patch -Np1 -i ../6.patch
+
+ # QSysInfo::productVersion() returns "unknown" on Arch
+ #TODO: sed -i 's/productVersion/prettyProductName/'
plugins/messages-task/about/about.cpp
+
+ 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() {
+ cd ukui-control-center-$pkgver
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd ukui-control-center-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+
+ install -Dm644 registeredQDbus/conf/com.control.center.qt.systemdbus.service
-t "$pkgdir"/usr/share/dbus-1/system-services/
+ install -Dm644 registeredQDbus/conf/com.control.center.qt.systemdbus.conf -t
"$pkgdir"/usr/share/dbus-1/system.d/
+}
Copied:
ukui-control-center/repos/community-staging-x86_64/libkscreen-5.27.patch (from
rev 1400458, ukui-control-center/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 16:01:41 UTC
(rev 1400459)
@@ -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>
