diff --git a/0001-fix-compile-error-of-ukui-control-center.patch b/0001-fix-compile-error-of-ukui-control-center.patch new file mode 100644 index 0000000..7859d8d --- /dev/null +++ b/0001-fix-compile-error-of-ukui-control-center.patch @@ -0,0 +1,24 @@ +From 3cc51117c8b83ae24abf530a88b61c43cf6e59bd Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Tue, 1 Nov 2022 12:41:24 +0800 +Subject: [PATCH] fix compile error of ukui-control-center + +--- + translate_generation.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/translate_generation.sh b/translate_generation.sh +index 7bf4000..cb0c65c 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.36.1 + diff --git a/Add-dependency-ddcutil.patch b/Add-dependency-ddcutil.patch deleted file mode 100644 index 52c9338..0000000 --- a/Add-dependency-ddcutil.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a16a9dfc376d0bd23b25627084fccb2c87b9fe58 Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -Date: Thu, 28 Jul 2022 16:51:41 +0800 -Subject: [PATCH] add dependency ddcutil - ---- - debian/control | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/debian/control b/debian/control -index c9b3f2e..3d1a8bc 100644 ---- a/debian/control -+++ b/debian/control -@@ -56,6 +56,7 @@ Depends: ${shlibs:Depends}, - qml-module-qtquick-controls, - qt5-image-formats-plugins, - dconf-cli, -+ ddcutil, - kylin-software-properties(>=0.0.1-55), - kylin-update-manager(>=5.4.6kord~rc5), - language-selector-gnome, --- -2.33.0 - diff --git a/Modify-the-icon-displayed-on-the-tray.patch b/Modify-the-icon-displayed-on-the-tray.patch deleted file mode 100644 index db2afd2..0000000 --- a/Modify-the-icon-displayed-on-the-tray.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ce40f1bbe8632e58600a388c38a05f4cbdf4d081 Mon Sep 17 00:00:00 2001 -From: Z-bin <1134636325@qq.com> -Date: Mon, 22 Feb 2021 11:18:46 +0800 -Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E5=9C=A8?= - =?UTF-8?q?=E6=89=98=E7=9B=98=E4=B8=8A=E7=9A=84=E5=9B=BE=E6=A0=87=E9=97=AE?= - =?UTF-8?q?=E9=A2=98?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - plugins/personalized/desktop/desktop.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/personalized/desktop/desktop.cpp b/plugins/personalized/desktop/desktop.cpp -index 7cc9dac3..ceca6aec 100644 ---- a/plugins/personalized/desktop/desktop.cpp -+++ b/plugins/personalized/desktop/desktop.cpp -@@ -496,6 +496,7 @@ void Desktop::removeTrayItem(QString itemName) { - for (int i = 0; i < nameList.length(); i++) { - if (nameList.at(i) == itemName) { - nameList.removeAt(i); -+ ui->listWidget->setFixedHeight(ui->listWidget->height() - 55); - break; - } - } -@@ -514,6 +515,7 @@ void Desktop::addTrayItem(QGSettings * trayGSetting) { - icon = QIcon::fromTheme("application-x-desktop"); - } - initTrayStatus(name, icon, trayGSetting); -+ ui->listWidget->setFixedHeight(ui->listWidget->height() + 55); - } - } - --- -2.33.0 - diff --git a/fix-and-update-translation.patch b/fix-and-update-translation.patch deleted file mode 100644 index 91bd1d0..0000000 --- a/fix-and-update-translation.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8a4cd15110db4e68e94a5446fa110e87e8158b1d Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -Date: Thu, 4 Aug 2022 11:09:33 +0800 -Subject: [PATCH] fix and update translation - ---- - plugins/account/networkaccount/maindialog.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/account/networkaccount/maindialog.cpp b/plugins/account/networkaccount/maindialog.cpp -index e422635..7c826cb 100644 ---- a/plugins/account/networkaccount/maindialog.cpp -+++ b/plugins/account/networkaccount/maindialog.cpp -@@ -378,7 +378,7 @@ QString MainDialog::messagebox(const int &code) const { - case 500:ret = tr("Failed due to server error!");break; - case 501:ret = tr("Please check your information!");break; - case 502:ret = tr("User existing!");break; -- case 503:ret = tr("User doesn't exist!");break; -+ case 503:ret = tr("Account or password error");break; - case 504:ret = tr("Network can not reach!");break; - case 511:ret = tr("Account or password error!");break; - case 610:ret = tr("Phone number already in used!");break; -@@ -386,7 +386,7 @@ QString MainDialog::messagebox(const int &code) const { - case 612:ret = tr("Your are reach the limit!");break; - case 613:ret = tr("Please check your phone number!");break; - case 614:ret = tr("Please check your code!");break; -- case 615:ret = tr("Account doesn't exist!");break; -+ case 615:ret = tr("Account or password error");break; - case 616:ret = tr("User has bound the phone!");break; - case 619:ret = tr("Sending code error occurred!");break; - case 632:ret = tr("Phone code is expired!");break; --- -2.33.0 - diff --git a/modify-displayed-size-after-the-installation-and-download-of-system-update.patch b/modify-displayed-size-after-the-installation-and-download-of-system-update.patch deleted file mode 100644 index 30a9c7d..0000000 --- a/modify-displayed-size-after-the-installation-and-download-of-system-update.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e896e60bb4e3eae9fa72cd33d8659b7962883379 Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -Date: Fri, 29 Jul 2022 10:44:19 +0800 -Subject: [PATCH] modify displayed size after the installation and download of - system update completed - ---- - plugins/security-updates/upgrade/src/appupdate.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/security-updates/upgrade/src/appupdate.cpp b/plugins/security-updates/upgrade/src/appupdate.cpp -index 14734b0..ad4153e 100644 ---- a/plugins/security-updates/upgrade/src/appupdate.cpp -+++ b/plugins/security-updates/upgrade/src/appupdate.cpp -@@ -393,7 +393,7 @@ void AppUpdateWid::updateAppUi(QString name) - QFontMetrics fontWidth(someInfoEdit->font());//得到每个字符的宽度 - QString StrMsg = fontWidth.elidedText(chlog, Qt::ElideRight,600);//最大宽度 - someInfoEdit->append(StrMsg); -- if(appAllMsg.msg.allSize == 0) -+ if(appAllMsg.msg.allSize == 0 || appAllMsg.packageSize == 0) - { - someInfoEdit->append(tr("Download size:")+QString(modifySizeUnit(appAllMsg.packageSize))); - // someInfoEdit->append(tr("下载大小：")+QString(modifySizeUnit(appAllMsg.packageSize))); --- -2.33.0 - diff --git a/ukui-control-center-3.0.1.tar.gz b/ukui-control-center-3.0.1.tar.gz deleted file mode 100644 index 8806306..0000000 Binary files a/ukui-control-center-3.0.1.tar.gz and /dev/null differ diff --git a/ukui-control-center-3.1.2.tar.gz b/ukui-control-center-3.1.2.tar.gz new file mode 100644 index 0000000..84c6c83 Binary files /dev/null and b/ukui-control-center-3.1.2.tar.gz differ diff --git a/ukui-control-center.spec b/ukui-control-center.spec index d3ded6d..cee95c1 100644 --- a/ukui-control-center.spec +++ b/ukui-control-center.spec @@ -1,91 +1,55 @@ %define debug_package %{nil} Name: ukui-control-center -Version: 3.0.1 -Release: 29 +Version: 3.1.2 +Release: 1 Summary: utilities to configure the UKUI desktop License: GPL-2+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz +Patch01: 0001-fix-compile-error-of-ukui-control-center.patch BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qtbase-devel BuildRequires: gsettings-qt-devel BuildRequires: glib2-devel BuildRequires: libmatekbd-devel BuildRequires: qt5-qtx11extras-devel BuildRequires: libxklavier-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: kf5-kwidgetsaddons-devel -BuildRequires: kf5-kconfig-devel -BuildRequires: kf5-kconfigwidgets-devel -BuildRequires: kf5-ki18n-devel BuildRequires: libkscreen-qt5-devel -BuildRequires: qt5-qtdeclarative-devel -BuildRequires: dconf-devel -BuildRequires: edid-decode -BuildRequires: redshift -BuildRequires: libmatemixer-devel -BuildRequires: libqtxdg-devel -BuildRequires: qt5-qtmultimedia-devel -BuildRequires: libxml2-devel -BuildRequires: libcanberra-devel -BuildRequires: kf5-kcoreaddons-devel -BuildRequires: kf5-kguiaddons-devel -BuildRequires: mate-desktop-devel -BuildRequires: libX11-devel -BuildRequires: libxkbcommon-devel -BuildRequires: libxkbfile-devel -BuildRequires: boost-devel -BuildRequires: libxcb-devel -BuildRequires: qt5-linguist -BuildRequires: polkit-qt5-1-devel -BuildRequires: pam-devel -BuildRequires: systemd-devel - +BuildRequires: kf5-ki18n-devel +BuildRequires: kf5-kwindowsystem-devel BuildRequires: kf5-kxmlgui-devel BuildRequires: kf5-kglobalaccel-devel -BuildRequires: kf5-bluez-qt-devel -BuildRequires: opencv -BuildRequires: libddcutil-devel -BuildRequires: upower-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: mate-desktop-devel +BuildRequires: libddcutil-devel +BuildRequires: libkylin-chkname-devel +BuildRequires: cups-devel +#compile need but control is not exist +BuildRequires: kf5-kguiaddons-devel Requires: dconf -Requires: qt5-qtimageformats -Requires: qt5-qtsvg-devel -Requires: gsettings-qt-devel -Requires: glib2-devel -Requires: libmatekbd-devel -Requires: qt5-qtx11extras-devel -Requires: libxklavier-devel -Requires: kf5-kwindowsystem-devel -Requires: kf5-kwidgetsaddons-devel -Requires: kf5-kconfig-devel -Requires: kf5-kconfigwidgets-devel -Requires: kf5-ki18n-devel -Requires: libkscreen-qt5-devel -Requires: qt5-qtdeclarative-devel -Requires: dconf-devel -Requires: edid-decode -Requires: redshift -Requires: libmatemixer-devel -Requires: libqtxdg-devel -Requires: qt5-qtmultimedia-devel -Requires: libxml2-devel -Requires: network-manager-applet -Requires: libcanberra-devel -Requires: qt5-qtgraphicaleffects -Requires: qt5-qtquickcontrols +Requires: ukui-search +Requires: kylin-nm +Requires: ukui-bluetooth +Requires: ukui-media +Requires: ukui-themes -Requires: ddcutil -Requires: glib2 -Requires: systemd-pam - - -Recommends: qt5-qtquickcontrols Suggests: gsettings-desktop-schemas Suggests: mate-common @@ -93,13 +57,7 @@ Suggests: ukui-power-manager Suggests: ukui-session-manager Suggests: ukui-screensaver Suggests: ukui-settings-daemon -#Suggests: qt5-qtgraphicaleffects -Patch01:Modify-the-icon-displayed-on-the-tray.patch -Patch02:Add-dependency-ddcutil.patch -Patch03:modify-displayed-size-after-the-installation-and-download-of-system-update.patch -Patch04:fix-and-update-translation.patch -Patch05:update-and-modify-translations.patch %description The UKUI control center contains configuration applets for the UKUI desktop, @@ -107,13 +65,14 @@ Patch05:update-and-modify-translations.patch 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. + %prep %setup -q %patch01 -p1 -%patch02 -p1 -%patch03 -p1 -%patch04 -p1 -%patch05 -p1 %build qmake-qt5 @@ -129,38 +88,38 @@ mkdir -p %{buildroot}/etc/xdg/autostart/ set -e glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||: -chown root:root /usr/bin/checkuserpwd -chmod u+s /usr/bin/checkuserpwd +chown root:root /usr/bin/checkUserPwd +chmod u+s /usr/bin/checkUserPwd %clean rm -rf $RPM_BUILD_ROOT %files %{_sysconfdir}/dbus-1/system.d/* -%{_bindir}/launchSysDbus -%{_bindir}/ukui-control-center -%{_libdir}/ukui-control-center/* +%{_sysconfdir}/pam.d/* +/lib/systemd/system/* +%{_bindir}/* %{_datadir}/applications/* %{_datadir}/dbus-1/system-services/* +%{_datadir}/dbus-1/services/* %{_datadir}/glib-2.0/schemas/* -%{_datadir}/locale/zh_CN/LC_MESSAGES/* -%{_datadir}/ukui/faces/* -%{_datadir}/ukui-control-center/shell/res/i18n -%{_bindir}/group-manager-server -%{_bindir}/checkuserpwd -%{_bindir}/checkUserPwd -%{_datadir}/polkit-1/actions/org.ukui.groupmanager.policy -%{_sysconfdir}/pam.d/control-center -/lib/systemd/system/ukui-group-manager.service -%{_bindir}/childCheckpwdwithPAM -%{_bindir}/ukui-control-center-session -%{_datadir}/dbus-1/services/org.ukui.ukcc.session.service %{_datadir}/kylin-user-guide/data/* -%{_datadir}/polkit-1/actions/com.control.center.qt.systemdbus.policy -%{_datadir}/ukui-control-center/shell/res/search.xml +%{_datadir}/locale/zh_CN/LC_MESSAGES/* +%{_datadir}/polkit-1/actions/* +%{_datadir}/ukui/faces/* +%{_datadir}/ukui-control-center/shell/res/* +%{_libdir}/ukui-control-center/* + +%files -n libukcc-devel +%{_includedir}/ukcc/interface/*.h +%{_includedir}/ukcc/widgets/*.h +%{_libdir}/libukcc* %changelog +* Mon Dec 5 2022 peijiankang - 3.1.2-1 +- update version to 3.1.2 + * Mon Aug 08 2022 tanyulong - 3.0.1-29 - update and modify translations diff --git a/ukui-group-manager.desktop b/ukui-group-manager.desktop deleted file mode 100644 index 3c61dc8..0000000 --- a/ukui-group-manager.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Name=ukui-group-manager -Comment=ukui-group-manager -Exec=/usr/bin/group-manager-server -Terminal=false -Type=Application -Keywords=UKUI; -NoDisplay=true -OnlyShowIn=UKUI; -X-UKUI-Autostart-Phase=Application -X-UKUI-Bugzilla-Bugzilla=UKUI -X-MATE-Autostart-Phase=Applications -X-KDE-autostart-after=panel -X-UKUI-Autostart-Notify=true -X-UKUI-Autostart-Delay=3 -X-UKUI-AutoRestart=true - - diff --git a/update-and-modify-translations.patch b/update-and-modify-translations.patch deleted file mode 100644 index 1ca8451..0000000 --- a/update-and-modify-translations.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a809deb7301283abc9d38b7fe7f0087fb499e15b Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -Date: Mon, 8 Aug 2022 10:37:26 +0800 -Subject: [PATCH] update translations - ---- - shell/res/i18n/zh_CN.ts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/shell/res/i18n/zh_CN.ts b/shell/res/i18n/zh_CN.ts -index 472e46f..d01fdca 100644 ---- a/shell/res/i18n/zh_CN.ts -+++ b/shell/res/i18n/zh_CN.ts -@@ -2952,7 +2952,7 @@ folder will be deleted! - - - Update -- 更新 -+ 安全与更新 - - - --- -2.33.0 -