diff --git a/0001-Fix-the-version-number-showing-none-problem.patch b/0001-Fix-the-version-number-showing-none-problem.patch deleted file mode 100644 index d19d60fe230e8afdfd28c1909039f91729a404bd..0000000000000000000000000000000000000000 --- a/0001-Fix-the-version-number-showing-none-problem.patch +++ /dev/null @@ -1,230 +0,0 @@ -From 3fa9efa1ec6ae9853b023279934177e1b8f0e3f1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= -Date: Mon, 27 May 2024 17:17:27 +0800 -Subject: [PATCH] Fix the version number showing "none" problem -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: 侯红勋 ---- - libukcc/interface/common.cpp | 33 +++++++++------------------- - libukcc/interface/ukcccommon.cpp | 33 +++++++++------------------- - shell/ukccabout.cpp | 37 +++++++++++--------------------- - shell/utils/utils.cpp | 33 +++++++++------------------- - 4 files changed, 42 insertions(+), 94 deletions(-) - -diff --git a/libukcc/interface/common.cpp b/libukcc/interface/common.cpp -index fcdf5aa..d56ebf2 100644 ---- a/libukcc/interface/common.cpp -+++ b/libukcc/interface/common.cpp -@@ -331,34 +331,21 @@ QString Common::boolToString(bool b) - - QString Common::getUkccVersion() - { -- FILE *pp = NULL; -- char *line = NULL; -- size_t len = 0; -- ssize_t read; -- char *q = NULL; -- QString version = "none"; -+ QProcess v_p; -+ v_p.start("rpm", QStringList() << "-q" << "ukui-control-center"); - -- pp = popen("dpkg -l ukui-control-center | grep ukui-control-center", "r"); -- if(NULL == pp) -- return version; -+ if (!v_p.waitForFinished()) -+ return "none"; - -- while((read = getline(&line, &len, pp)) != -1){ -- q = strrchr(line, '\n'); -- *q = '\0'; -+ QByteArray ba = v_p.readAllStandardOutput(); - -- QString content = line; -- QStringList list = content.split(" "); -+ QRegularExpression qe("-([^-]+)-[^-]+\n$"); - -- list.removeAll(""); -- -- if (list.size() >= 3) -- version = list.at(2); -+ QRegularExpressionMatch qem = qe.match(ba); -+ if (qem.hasMatch()) { -+ return qem.captured(1); - } -- -- free(line); -- line = NULL; -- pclose(pp); -- return version; -+ return "none"; - } - - QString Common::getProductName() -diff --git a/libukcc/interface/ukcccommon.cpp b/libukcc/interface/ukcccommon.cpp -index 00d03ac..e299962 100644 ---- a/libukcc/interface/ukcccommon.cpp -+++ b/libukcc/interface/ukcccommon.cpp -@@ -339,34 +339,21 @@ QString UkccCommon::boolToString(bool b) - - QString UkccCommon::getUkccVersion() - { -- FILE *pp = NULL; -- char *line = NULL; -- size_t len = 0; -- ssize_t read; -- char *q = NULL; -- QString version = "none"; -+ QProcess v_p; -+ v_p.start("rpm", QStringList() << "-q" << "ukui-control-center"); - -- pp = popen("dpkg -l ukui-control-center | grep ukui-control-center", "r"); -- if(NULL == pp) -- return version; -+ if (!v_p.waitForFinished()) -+ return "none"; - -- while((read = getline(&line, &len, pp)) != -1){ -- q = strrchr(line, '\n'); -- *q = '\0'; -+ QByteArray ba = v_p.readAllStandardOutput(); - -- QString content = line; -- QStringList list = content.split(" "); -+ QRegularExpression qe("-([^-]+)-[^-]+\n$"); - -- list.removeAll(""); -- -- if (list.size() >= 3) -- version = list.at(2); -+ QRegularExpressionMatch qem = qe.match(ba); -+ if (qem.hasMatch()) { -+ return qem.captured(1); - } -- -- free(line); -- line = NULL; -- pclose(pp); -- return version; -+ return "none"; - } - - QString UkccCommon::getProductName() -diff --git a/shell/ukccabout.cpp b/shell/ukccabout.cpp -index e9c5482..5a174a9 100644 ---- a/shell/ukccabout.cpp -+++ b/shell/ukccabout.cpp -@@ -20,16 +20,16 @@ - #include "ukccabout.h" - #include "xatom-helper.h" - #include "interface/ukcccommon.h" -- - #include - #include - #include - #include - #include -+#include -+#include - - UkccAbout::UkccAbout(QWidget *parent) - : QDialog(parent) { -- - setFixedSize(420, 344); - setWindowTitle(tr("Settings")); - initUI(); -@@ -100,32 +100,19 @@ void UkccAbout::hideComponent() - } - - QString UkccAbout::getUkccVersion() { -- FILE *pp = NULL; -- char *line = NULL; -- size_t len = 0; -- ssize_t read; -- char *q = NULL; -- QString version = "none"; -+ QProcess v_p; -+ v_p.start("rpm", QStringList() << "-q" << "ukui-control-center"); - -- pp = popen("dpkg -l ukui-control-center | grep ukui-control-center", "r"); -- if(NULL == pp) -- return version; -+ if (!v_p.waitForFinished()) -+ return "none"; - -- while((read = getline(&line, &len, pp)) != -1){ -- q = strrchr(line, '\n'); -- *q = '\0'; -+ QByteArray ba = v_p.readAllStandardOutput(); - -- QString content = line; -- QStringList list = content.split(" "); -+ QRegularExpression qe("-([^-]+)-[^-]+\n$"); - -- list.removeAll(""); -- -- if (list.size() >= 3) -- version = list.at(2); -+ QRegularExpressionMatch qem = qe.match(ba); -+ if (qem.hasMatch()) { -+ return qem.captured(1); - } -- -- free(line); -- line = NULL; -- pclose(pp); -- return version; -+ return "none"; - } -diff --git a/shell/utils/utils.cpp b/shell/utils/utils.cpp -index 27d7fa1..33a5938 100644 ---- a/shell/utils/utils.cpp -+++ b/shell/utils/utils.cpp -@@ -267,32 +267,19 @@ bool Utils::isZJY() - - QString Utils::getUkccVersion() - { -- FILE *pp = NULL; -- char *line = NULL; -- size_t len = 0; -- ssize_t read; -- char *q = NULL; -- QString version = "none"; -+ QProcess v_p; -+ v_p.start("rpm", QStringList() << "-q" << "ukui-control-center"); - -- pp = popen("dpkg -l ukui-control-center | grep ukui-control-center", "r"); -- if(NULL == pp) -- return version; -+ if (!v_p.waitForFinished()) -+ return "none"; - -- while((read = getline(&line, &len, pp)) != -1){ -- q = strrchr(line, '\n'); -- *q = '\0'; -+ QByteArray ba = v_p.readAllStandardOutput(); - -- QString content = line; -- QStringList list = content.split(" "); -+ QRegularExpression qe("-([^-]+)-[^-]+\n$"); - -- list.removeAll(""); -- -- if (list.size() >= 3) -- version = list.at(2); -+ QRegularExpressionMatch qem = qe.match(ba); -+ if (qem.hasMatch()) { -+ return qem.captured(1); - } -- -- free(line); -- line = NULL; -- pclose(pp); -- return version; -+ return "none"; - } --- -2.33.0 - diff --git a/0001-fix-ukui-control-center-3.22.1.25-open-theme-SEGV.patch b/0001-fix-ukui-control-center-3.22.1.25-open-theme-SEGV.patch deleted file mode 100644 index 748637c244453ad25631f49f6298aefde88a4395..0000000000000000000000000000000000000000 --- a/0001-fix-ukui-control-center-3.22.1.25-open-theme-SEGV.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c0f4dc52d5a06e286f5fecbc7c967994b2b1fb2c Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Tue, 3 Sep 2024 15:16:48 +0800 -Subject: [PATCH] fix ukui-control-center 3.22.1.25 open theme SEGV - ---- - plugins/personalized/theme/theme.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/personalized/theme/theme.cpp b/plugins/personalized/theme/theme.cpp -index ec5672e..fc36911 100644 ---- a/plugins/personalized/theme/theme.cpp -+++ b/plugins/personalized/theme/theme.cpp -@@ -1033,6 +1033,7 @@ bool Theme::isUpgrade() - version_t ver= kdk_system_get_version_detaile(); - QString version = QString(ver.update_version); - mIsUpgrade = (version != "2303"); -+ return mIsUpgrade; - } - - --- -2.25.1 - diff --git a/0001-ukui-control-center-3.22.1.25-fix-compilation-errors.patch b/0001-ukui-control-center-3.22.1.25-fix-compilation-errors.patch deleted file mode 100644 index f6fddac066453f90e85d967856350ba67d06c090..0000000000000000000000000000000000000000 --- a/0001-ukui-control-center-3.22.1.25-fix-compilation-errors.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 7bbfb9750bf700724366730ccbdf3d05e73caba8 Mon Sep 17 00:00:00 2001 -From: huayadong -Date: Fri, 17 May 2024 11:23:31 +0800 -Subject: [PATCH] ukui-control-center-3.22.1.25-fix-compilation-errors - ---- - changeUserPwd/run-passwd.cpp | 4 ++-- - registeredQDbus/sysdbusregister.cpp | 2 +- - translate_generation.sh | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/changeUserPwd/run-passwd.cpp b/changeUserPwd/run-passwd.cpp -index 6b74b43..4d79e46 100644 ---- a/changeUserPwd/run-passwd.cpp -+++ b/changeUserPwd/run-passwd.cpp -@@ -399,8 +399,8 @@ static gboolean io_watch_stdout (GIOChannel *source, GIOCondition condition, Pas - error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_AUTH_FAILED, - "Your password has been changed after you verify!"); - } */else { -- error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_UNKNOWN, -- str->str); -+ //error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_UNKNOWN, -+ // str->str); - } - - /* At this point, passwd might have exited, in which case -diff --git a/registeredQDbus/sysdbusregister.cpp b/registeredQDbus/sysdbusregister.cpp -index a1681b3..a36246b 100644 ---- a/registeredQDbus/sysdbusregister.cpp -+++ b/registeredQDbus/sysdbusregister.cpp -@@ -857,7 +857,7 @@ void SysdbusRegister::_getDisplayInfoThread() - display.edidHash = edidHash; - display.I2C_busType = QString::number(dlist_loc->info[i].path.path.i2c_busno); - ddca_create_edid_display_identifier(dlist_loc->info[i].edid_bytes,&did); -- ddca_create_display_ref(did,&ddca_dref); -+ ddca_get_display_ref(did,&ddca_dref); - ddca_open_display2(ddca_dref,false,&display.ddca_dh_loc); - displayInfo_V.append(display); - } -diff --git a/translate_generation.sh b/translate_generation.sh -index 7bf4000..d940f33 100755 ---- a/translate_generation.sh -+++ b/translate_generation.sh -@@ -7,7 +7,7 @@ version=(`echo $ID`) - for ts in "${ts_list[@]}" - do - printf "\nprocess ${ts}\n" -- if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ];then -+ if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ] || [ "$version" == "openEuler" ] || [ "$version" == "Kylin Linux Advanced Server" ];then - lrelease-qt5 "${ts}" - else - lrelease "${ts}" --- -2.33.0 - diff --git a/0002-change-c++11-to-c++17.patch b/ukui-control-center-4.10.0.0-kylin-change-c++11-to-c++17.patch similarity index 83% rename from 0002-change-c++11-to-c++17.patch rename to ukui-control-center-4.10.0.0-kylin-change-c++11-to-c++17.patch index 041f95b738037ae464e70bf11043aee2b2cfeadf..040982ef528b8710d628ef03c6dc6aebc1ded184 100644 --- a/0002-change-c++11-to-c++17.patch +++ b/ukui-control-center-4.10.0.0-kylin-change-c++11-to-c++17.patch @@ -1,11 +1,12 @@ -From ebbfebe4a9111ee055e49d94daa297b92b2d2916 Mon Sep 17 00:00:00 2001 -From: huayadong -Date: Fri, 17 May 2024 11:39:53 +0800 +From 6e253254f3e62b0a9a139e63a0a2e20e44fb4478 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Sun, 20 Oct 2024 16:28:07 +0800 Subject: [PATCH] change c++11 to c++17 --- changeOtherUserPwd/changeOtherUserPwd.pro | 2 +- changeUserPwd/changeUserPwd.pro | 2 +- + changeUserPwd/run-passwd.cpp | 2 +- checkUserPwdWithPAM/checkUserPwd/checkUserPwd.pro | 2 +- .../childCheckPwdWithPAM/childCheckPwdWithPAM.pro | 2 +- group-manager-server/group-manager-server.pro | 2 +- @@ -20,10 +21,11 @@ Subject: [PATCH] change c++11 to c++17 plugins/system/notice/notice.pro | 2 +- plugins/system/power/power.pro | 2 +- registeredQDbus/registeredQDbus.pro | 2 +- + registeredQDbus/sysdbusregister.cpp | 2 +- registeredSession/registeredSession.pro | 2 +- tastenbrett/tastenbrett.pro | 2 +- tests/area/area.pro | 2 +- - 19 files changed, 19 insertions(+), 19 deletions(-) + 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/changeOtherUserPwd/changeOtherUserPwd.pro b/changeOtherUserPwd/changeOtherUserPwd.pro index f0e3f54..6282529 100644 @@ -51,6 +53,19 @@ index 7d80db4..4d5cf6e 100644 CONFIG -= app_bundle # The following define makes your compiler emit warnings if you use +diff --git a/changeUserPwd/run-passwd.cpp b/changeUserPwd/run-passwd.cpp +index 6b74b43..6b3764e 100644 +--- a/changeUserPwd/run-passwd.cpp ++++ b/changeUserPwd/run-passwd.cpp +@@ -399,7 +399,7 @@ static gboolean io_watch_stdout (GIOChannel *source, GIOCondition condition, Pas + error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_AUTH_FAILED, + "Your password has been changed after you verify!"); + } */else { +- error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_UNKNOWN, ++ error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_UNKNOWN, "Error: %s", + str->str); + } + diff --git a/checkUserPwdWithPAM/checkUserPwd/checkUserPwd.pro b/checkUserPwdWithPAM/checkUserPwd/checkUserPwd.pro index 8037587..8a47940 100644 --- a/checkUserPwdWithPAM/checkUserPwd/checkUserPwd.pro @@ -233,8 +248,21 @@ index 7e294cf..3f10105 100644 CONFIG -= app_bundle PKGCONFIG += gio-2.0 \ +diff --git a/registeredQDbus/sysdbusregister.cpp b/registeredQDbus/sysdbusregister.cpp +index a1681b3..a36246b 100644 +--- a/registeredQDbus/sysdbusregister.cpp ++++ b/registeredQDbus/sysdbusregister.cpp +@@ -857,7 +857,7 @@ void SysdbusRegister::_getDisplayInfoThread() + display.edidHash = edidHash; + display.I2C_busType = QString::number(dlist_loc->info[i].path.path.i2c_busno); + ddca_create_edid_display_identifier(dlist_loc->info[i].edid_bytes,&did); +- ddca_create_display_ref(did,&ddca_dref); ++ ddca_get_display_ref(did,&ddca_dref); + ddca_open_display2(ddca_dref,false,&display.ddca_dh_loc); + displayInfo_V.append(display); + } diff --git a/registeredSession/registeredSession.pro b/registeredSession/registeredSession.pro -index db3fb01..2909b63 100644 +index 262acfe..3d4ed71 100644 --- a/registeredSession/registeredSession.pro +++ b/registeredSession/registeredSession.pro @@ -5,7 +5,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets concurrent sql xml @@ -273,5 +301,5 @@ index 5e83e76..286def6 100644 TEMPLATE = app -- -2.33.0 +2.43.0 diff --git a/ukui-control-center-4.10.0.0-kylin-chnage-lrelease-to-lrelease-qt5.patch b/ukui-control-center-4.10.0.0-kylin-chnage-lrelease-to-lrelease-qt5.patch new file mode 100644 index 0000000000000000000000000000000000000000..3cca85a022b60be95db9a344db7fbca210e88f39 --- /dev/null +++ b/ukui-control-center-4.10.0.0-kylin-chnage-lrelease-to-lrelease-qt5.patch @@ -0,0 +1,37 @@ +From 1c479c16c31fff994df9b5bafc982b731defaa86 Mon Sep 17 00:00:00 2001 +From: huayadong +Date: Sun, 27 Oct 2024 11:09:39 +0800 +Subject: [PATCH] change lrelease to lrelease-qt5 + +--- + libukcc/plugin-test/translate_generation.sh | 2 +- + translate_generation.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libukcc/plugin-test/translate_generation.sh b/libukcc/plugin-test/translate_generation.sh +index 72f748b..024bd8a 100755 +--- a/libukcc/plugin-test/translate_generation.sh ++++ b/libukcc/plugin-test/translate_generation.sh +@@ -10,6 +10,6 @@ do + if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ];then + lrelease-qt5 "${ts}" + else +- lrelease "${ts}" ++ lrelease-qt5 "${ts}" + fi + done +diff --git a/translate_generation.sh b/translate_generation.sh +index 7bf4000..1f10d6a 100755 +--- a/translate_generation.sh ++++ b/translate_generation.sh +@@ -10,6 +10,6 @@ do + if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ];then + lrelease-qt5 "${ts}" + else +- lrelease "${ts}" ++ lrelease-qt5 "${ts}" + fi + done +-- +2.43.0 + diff --git a/ukui-control-center-3.22.1.25.tar.gz b/ukui-control-center-4.10.0.0.tar.gz similarity index 71% rename from ukui-control-center-3.22.1.25.tar.gz rename to ukui-control-center-4.10.0.0.tar.gz index 25e9b9d19d257ab33b63efe605eb60e89686b45e..d1ab240911e61382959ad9445d7fe5dd25de70c1 100644 Binary files a/ukui-control-center-3.22.1.25.tar.gz and b/ukui-control-center-4.10.0.0.tar.gz differ diff --git a/ukui-control-center.spec b/ukui-control-center.spec index 8d95e3f893e148494e88e12405cf9d9b4c83b2a3..84c8983efc73f0e574cce211707b9ab3ef8e13ce 100644 --- a/ukui-control-center.spec +++ b/ukui-control-center.spec @@ -1,157 +1,177 @@ -Name: ukui-control-center -Version: 3.22.1.25 -Release: 3 -Summary: utilities to configure the UKUI desktop -License: GPL-2+ -URL: http://www.ukui.org -Source0: %{name}-%{version}.tar.gz -Patch01: 0001-ukui-control-center-3.22.1.25-fix-compilation-errors.patch -Patch02: 0002-change-c++11-to-c++17.patch -Patch03: 0001-Fix-the-version-number-showing-none-problem.patch -Patch04: 0001-fix-ukui-control-center-3.22.1.25-open-theme-SEGV.patch - -BuildRequires: qt5-qtsvg-devel -BuildRequires: gsettings-qt-devel -BuildRequires: glib2-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: libxklavier-devel -BuildRequires: libkscreen-qt5-devel -BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: kf5-kxmlgui-devel -BuildRequires: kf5-kglobalaccel-devel +Summary: utilities to configure the UKUI desktop +Name: ukui-control-center +Version: 4.10.0.0 +Release: 1 +License: GPL-2+ +URL: https://github.com/ukui/ukui-control-center +Source0: %{name}-%{version}.tar.gz + +Patch0: ukui-control-center-4.10.0.0-kylin-change-c++11-to-c++17.patch +Patch1: ukui-control-center-4.10.0.0-kylin-chnage-lrelease-to-lrelease-qt5.patch + +BuildRequires: qt5-qtsvg-devel +BuildRequires: gsettings-qt-devel +BuildRequires: glib2-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: libxklavier-devel +BuildRequires: libkscreen-qt5-devel +BuildRequires: libkscreen-qt5 +BuildRequires: kf5-ki18n-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: kf5-kxmlgui-devel +BuildRequires: kf5-kglobalaccel-devel BuildRequires: qt5-qtdeclarative-devel -BuildRequires: dconf-devel -BuildRequires: libmatemixer-devel -BuildRequires: libxml2-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: libX11-devel -BuildRequires: libxkbfile-devel -BuildRequires: boost-devel -BuildRequires: qt5-qttools-devel -BuildRequires: libxcb-devel -BuildRequires: polkit-qt5-1-devel -BuildRequires: pulseaudio-libs-devel -BuildRequires: libpwquality-devel -BuildRequires: xorg-x11-server-devel -BuildRequires: upower-devel -BuildRequires: pam-devel -BuildRequires: ukui-interface -BuildRequires: libddcutil-devel -BuildRequires: cups-devel -BuildRequires: kf5-kservice-devel -BuildRequires: libkysdk-qtwidgets-devel >= 2.2.3.5 -BuildRequires: libkysdk-sysinfo-devel >= 2.2.3.5 -BuildRequires: libkysdk-waylandhelper-devel >= 2.2.3.5 -BuildRequires: libkysdk-diagnostics-devel >= 2.2.0 -BuildRequires: libkysdk-systime-devel >= 2.2.3.5 -BuildRequires: libXcursor-devel - - -#compile need but control is not exist - +BuildRequires: dconf-devel +BuildRequires: libxml2-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: libX11-devel +BuildRequires: libXcursor-devel +BuildRequires: libxkbfile-devel +BuildRequires: boost-devel +BuildRequires: qt5-qttools-devel +BuildRequires: libxcb-devel +BuildRequires: polkit-qt5-1-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: libpwquality-devel +BuildRequires: xorg-x11-server-devel +BuildRequires: upower-devel +BuildRequires: pam-devel +BuildRequires: libukui-log4qt-devel +BuildRequires: libddcutil-devel >= 0.9.9 +BuildRequires: libkylin-chkname-devel +BuildRequires: cups-devel +BuildRequires: libkysdk-qtwidgets-devel >= 1.0.0kylin12+0429 +BuildRequires: libkysdk-sysinfo-devel +BuildRequires: libkysdk-waylandhelper-devel +BuildRequires: libkysdk-diagnostics-devel +BuildRequires: kf5-kservice-devel +BuildRequires: libkysdk-systime-devel +BuildRequires: libkysdk-conf2-devel + +Requires: qt5-qtgraphicaleffects +Requires: qt5-qtquickcontrols +Requires: qt5-qtimageformats Requires: dconf -Requires: ukui-search -Requires: ukui-media -Requires: ukui-themes -#install need but control is not exist -Requires: libkylin-chkname1 -Requires: lightdm - -Suggests: gsettings-desktop-schemas -Suggests: mate-common -Suggests: ukui-power-manager -Suggests: ukui-session-manager -Suggests: ukui-screensaver -Suggests: ukui-settings-daemon - - +Requires: ukui-search >= 0.6.0 +Requires: kylin-nm >= 3.1.1 +Requires: ukui-bluetooth >= 1.0.0 +Requires: ukui-media >= 3.0.0 +Requires: ukui-biometric-manager >= 1.0.1 +Requires: kylin-theme +Recommends: gsettings-desktop-schemas +Recommends: ukui-power-manager >= 2.1.29 +Recommends: ukui-session-manager +Recommends: ukui-screensaver +Recommends: ukui-settings-daemon + + +Recommends: gsettings-desktop-schemas %description - The UKUI control center contains configuration applets for the UKUI desktop, - allowing to set accessibility configuration, desktop fonts, keyboard - and mouse properties, sound setup, desktop theme and background, user - interface properties, screen resolution, and other UKUI parameters. - -%package -n libukcc-devel -Summary: libukcc -%description -n libukcc-devel -The UKUI control center contains configuration applets for the UKUI des allowing to set accessibility configuration, desktop fonts, keyboard and mouse properties, sound setup, desktop theme and background, user interface properties, screen resolution, and other UKUI parameters. - + The UKUI control center contains configuration applets for the UKUI desktop, allowing to set accessibility configuration, desktop fonts, keyboard and mouse properties, sound setup, desktop theme and background, user interface properties, screen resolution, and other UKUI parameters. %package -n libukcc3 -Summary: libs +Summary: The UKUI control center contains configuration applets for the UKUI desktop, %description -n libukcc3 - allowing to set accessibility configuration, desktop fonts, keyboard - and mouse properties, sound setup, desktop theme and background, user - interface properties, screen resolution, and other UKUI parameters. + allowing to set accessibility configuration, desktop fonts, keyboard and mouse properties, sound setup, desktop theme and background, user interface properties, screen resolution, and other UKUI parameters. + +%package -n libukcc-devel +Summary: The UKUI control center contains configuration applets for the UKUI desktop, +Requires: libukcc3 >= 4.10.0.0 +Requires: libkysdk-diagnostics-devel +%description -n libukcc-devel + allowing to set accessibility configuration, desktop fonts, keyboard and mouse properties, sound setup, desktop theme and background, user interface properties, screen resolution, and other UKUI parameters. %prep %autosetup -n %{name}-%{version} -p1 + %build %{qmake_qt5} %{make_build} %install -rm -rf $RPM_BUILD_ROOT -%{make_install} INSTALL_ROOT=%{buildroot} +make INSTALL_ROOT=%{buildroot} install + + +#ukui-control-center +#libukcc3 +#libukcc-devel + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/man/man1/ +gzip -c man/group-manager-server.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/group-manager-server.1.gz +gzip -c man/ukui-control-center.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/ukui-control-center.1.gz +gzip -c man/launchSysDbus.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/launchSysDbus.1.gz +gzip -c man/ukui-control-center-session.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/ukui-control-center-session.1.gz +gzip -c man/changeotheruserpwd.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/changeotheruserpwd.1.gz +gzip -c man/changeuserpwd.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/changeuserpwd.1.gz +gzip -c man/checkUserPwd.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/checkUserPwd.1.gz +gzip -c man/childCheckpwdwithPAM.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/childCheckpwdwithPAM.1.gz + +%pre + -mkdir -p %{buildroot}/etc/xdg/autostart/ +%pre -n libukcc3 + %post +#!/bin/sh set -e -glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||: - +glib-compile-schemas /usr/share/glib-2.0/schemas/ chmod u+s /usr/bin/changeuserpwd - if [ -x /usr/share/kylin-system-updater/kylin-reboot-required ];then - /usr/share/kylin-system-updater/kylin-reboot-required + /usr/share/kylin-system-updater/kylin-reboot-required +fi +# 启动服务 +#systemctl enable ukui-group-manager.service +#systemctl start ukui-group-manager.service +#DEBHELPER# + +%post -n libukcc3 +is_hwe=$(cat /etc/kylin-build | grep "V10-SP1-hwe") +file_path="/usr/lib/x86_64-linux-gnu/libukcc.so.1.0.0.old" +if [ -f /usr/sbin/kysec_get ] && [ -n "${is_hwe}" ] && [ -f $file_path ];then + kysec_set -n exectl -v verified $file_path fi - -sed -i "1iauth sufficient pam_succeed_if.so user ingroup nopasswdlogin" /etc/pam.d/lightdm -groupadd nopasswdlogin &> /dev/null ||: - -%postun -sed -i "/auth sufficient pam_succeed_if.so user ingroup nopasswdlogin/d" /etc/pam.d/lightdm - -%preun -#systemctl disable ukui-group-manager.service -#systemctl stop ukui-group-manager.service - -%clean -rm -rf $RPM_BUILD_ROOT - %files +%license debian/copyright +%doc debian/changelog +%{_libdir}/ukui-control-center/* +%{_datadir}/man/man1/* +%{_datadir}/protocol/* %{_sysconfdir}/dbus-1/system.d/* %{_sysconfdir}/pam.d/* %{_bindir}/* %{_datadir}/applications/* -%{_datadir}/dbus-1/services/* -%{_datadir}/dbus-1/system-services/* -%{_datadir}/glib-2.0/schemas/* -%{_datadir}/kylin-user-guide/data/* +%{_datadir}/dbus-1/* +%{_datadir}/glib-2.0/* +%{_datadir}/kylin-user-guide/data/guide/* %{_datadir}/locale/zh_CN/LC_MESSAGES/* %{_datadir}/locale/bo_CN/LC_MESSAGES/* %{_datadir}/polkit-1/actions/* -%{_datadir}/ukui/faces/* -%{_datadir}/ukui-control-center/* -%{_libdir}/ukui-control-center/*.so -%{_datadir}/protocol/* +%{_datadir}/ukui/* %{_sysconfdir}/kylin-config/basic/* +%{_datadir}/ukui-control-center/shell/res/* +%{_datadir}/ukui-control-center/data/ukui-control-center-config.json +%files -n libukcc3 +%{_libdir}/libukcc.so.* %files -n libukcc-devel -%{_includedir}/ukcc/interface/*.h -%{_includedir}/ukcc/widgets/*.h -%{_libdir}/libukcc* +%{_includedir}/ukcc/interface/* +%{_includedir}/ukcc/widgets/* +%{_libdir}/libukcc.so -%files -n libukcc3 -%{_libdir}/libukcc.so.* %changelog +* Mon Aug 18 2025 huayadong - 4.10.0.0-1 +- Type: update +- ID : NA +- SUG : NA +- DESC: Update upstream version 4.10.0.0-ok4.46 + * Tue Sep 03 2024 peijiankang - 3.22.1.25-3 - Type:bugfix - ID:NA