diff --git a/0001-fix-build-error-about-make_build.patch b/0001-fix-build-error-about-make_build.patch deleted file mode 100644 index bb3198f3b3999379d0527a5aee59ff1c707e7a5d..0000000000000000000000000000000000000000 --- a/0001-fix-build-error-about-make_build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fee445645f754100b4e0e9a25d69ca27b93bc237 Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Thu, 24 Jul 2025 17:46:20 +0800 -Subject: [PATCH] fix build error about make_build - ---- - i18n_ts/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/i18n_ts/CMakeLists.txt b/i18n_ts/CMakeLists.txt -index f4b0cef..96e8518 100644 ---- a/i18n_ts/CMakeLists.txt -+++ b/i18n_ts/CMakeLists.txt -@@ -1,7 +1,7 @@ - find_package(Qt5LinguistTools) - - file(GLOB ts_files *.ts) --qt5_create_translation(qm_files ${ts_files}) -+qt5_add_translation(qm_files ${ts_files}) - add_custom_target(i18n - DEPENDS ${qm_files} - SOURCES ${ts_files} --- -2.25.1 - diff --git a/0001-ukui-screensaver-resolve-compilation-errors.patch b/0001-ukui-screensaver-resolve-compilation-errors.patch deleted file mode 100644 index e52f01f886b53e42c1716b7313aa5c08275abe3a..0000000000000000000000000000000000000000 --- a/0001-ukui-screensaver-resolve-compilation-errors.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6f115acdeedecd64161526b9c788bd11a5482e1d Mon Sep 17 00:00:00 2001 -From: huayadong -Date: Sun, 7 Apr 2024 15:07:08 +0800 -Subject: [PATCH] ddd - ---- - Common/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt -index a53f577..3ec672c 100644 ---- a/Common/CMakeLists.txt -+++ b/Common/CMakeLists.txt -@@ -28,4 +28,4 @@ set(Common_SRC - ) - - add_library(Common STATIC ${Common_SRC}) --target_link_libraries(Common Qt5::Core Qt5::DBus Qt5::Widgets ${GIOUNIX2_LIBRARIES} ${KF5Wayland_LIBRARIES} -lKF5WaylandClient -lKF5WaylandServer KF5::WindowSystem) -+target_link_libraries(Common Qt5::Core Qt5::DBus Qt5::Widgets ${GIOUNIX2_LIBRARIES} ${KF5Wayland_LIBRARIES} -lKF5WaylandClient -lKF5WaylandServer KF5::WindowSystem KF5::WaylandClient) --- -2.33.0 - diff --git a/0001-fix-ukui-screensaver-4.0.0.0-about-ukui-screensaver-qt.patch b/modify-config-fix-can-not-unlock-after-first-lock.patch similarity index 39% rename from 0001-fix-ukui-screensaver-4.0.0.0-about-ukui-screensaver-qt.patch rename to modify-config-fix-can-not-unlock-after-first-lock.patch index 6dfddcade1857bccae88c593b1c88b87c8642243..f58bd618ae96828410eff59b16015158b428256e 100644 --- a/0001-fix-ukui-screensaver-4.0.0.0-about-ukui-screensaver-qt.patch +++ b/modify-config-fix-can-not-unlock-after-first-lock.patch @@ -1,24 +1,22 @@ -From fe3cc6cb210ca6ec60c25d7d334d2a02a8550e7a Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Tue, 3 Sep 2024 16:26:13 +0800 -Subject: [PATCH] fix ukui-screensaver-4.0.0.0 about ukui-screensaver-qt +From c936e217afbcd37ad2e700279f71b3e9f2c0ce0f Mon Sep 17 00:00:00 2001 +From: dou33 +Date: Sat, 8 Jun 2024 09:52:43 +0800 +Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ukui-screensaver=E9=85=8D?= + =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=94=81=E5=B1=8F=E5=90=8E?= + =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=A7=A3=E9=94=81=E7=9A=84=E9=97=AE=E9=A2=98?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Change-Id: I697505d251dfd121875291cf3c9463eb9d62f8dd --- - data/ukui-screensaver-qt | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - + data/ukui-screensaver-qt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/ukui-screensaver-qt b/data/ukui-screensaver-qt -index 8ac0d54..51eccb9 100644 +index 43987ae..4912ba1 100644 --- a/data/ukui-screensaver-qt +++ b/data/ukui-screensaver-qt -@@ -1,14 +1,12 @@ - auth requisite pam_nologin.so - auth sufficient pam_succeed_if.so user ingroup nopasswdlogin - --@include common-auth --auth optional pam_gnome_keyring.so - - +@@ -8,7 +8,7 @@ auth sufficient pam_succeed_if.so user ingroup nopasswdlogin #If you are using Arch,comment out the #above and use the following. @@ -32,4 +30,3 @@ index 8ac0d54..51eccb9 100644 +session include system-auth -- 2.25.1 - diff --git a/ukui-screensaver-4.0.0.0.tar.gz b/ukui-screensaver-4.0.0.0.tar.gz deleted file mode 100644 index e0be1c5903873ec7c384d2e432b9454f53ac9abb..0000000000000000000000000000000000000000 Binary files a/ukui-screensaver-4.0.0.0.tar.gz and /dev/null differ diff --git a/ukui-screensaver-4.10.0.0-kylin-add-lib-path-ffmpe.patch b/ukui-screensaver-4.10.0.0-kylin-add-lib-path-ffmpe.patch new file mode 100644 index 0000000000000000000000000000000000000000..cdaec60ed1047e212422cf013262aeae1efc4887 --- /dev/null +++ b/ukui-screensaver-4.10.0.0-kylin-add-lib-path-ffmpe.patch @@ -0,0 +1,24 @@ +From 1d21aa27dc099dc75f3301a3db0ac66561a36958 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Tue, 22 Oct 2024 18:47:02 +0800 +Subject: [PATCH] add lib path ffmpe + +--- + src/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f76501d..78407df 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -65,6 +65,7 @@ include_directories( + ${LIGHTDM-QT5-3_INCLUDE_DIRS} + ${LIBSYSTEMD_INCLUDE_DIRS} + ${LIBXRANDR_INCLUDE_DIRS} ++ "/usr/include/ffmpeg/" + ) + + set(EXTRA_LIBS +-- +2.43.0 + diff --git a/ukui-screensaver-4.10.0.0.tar.gz b/ukui-screensaver-4.10.0.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..09cc92ffd17eeef1ad254b6e9607c966161bb817 Binary files /dev/null and b/ukui-screensaver-4.10.0.0.tar.gz differ diff --git a/ukui-screensaver.spec b/ukui-screensaver.spec index dca601356c114016ae6b74f8ea4d4dd98a8540fb..5693b8a23dd18d13e5cba32ac785bff93f8f7217 100644 --- a/ukui-screensaver.spec +++ b/ukui-screensaver.spec @@ -1,57 +1,60 @@ -Name: ukui-screensaver -Version: 4.0.0.0 -Release: 3 -Summary: Screensaver for UKUI desktop environment -License: GPL-3+ and GPL-2+ -URL: http://www.ukui.org -Source0: %{name}-%{version}.tar.gz - -Patch01: 0001-ukui-screensaver-resolve-compilation-errors.patch -Patch02: 0001-fix-ukui-screensaver-4.0.0.0-about-ukui-screensaver-qt.patch -Patch03: 0001-fix-build-error-about-make_build.patch -BuildRequires: cmake -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: pam-devel -BuildRequires: qt5-qttools-devel -BuildRequires: qt5-qttools-devel -BuildRequires: glib2-devel -BuildRequires: opencv -BuildRequires: libX11-devel -BuildRequires: libXtst-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: libkylin-nm-base -BuildRequires: NetworkManager-libnm-devel -BuildRequires: kf5-networkmanager-qt-devel -BuildRequires: kylin-nm-plugin -BuildRequires: kf5-kwayland-devel -BuildRequires: libkscreen-qt5-devel -BuildRequires: gsettings-qt-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: libmatemixer-devel -BuildRequires: imlib2-devel -BuildRequires: ukui-interface -BuildRequires: libkysdk-sysinfo-devel -BuildRequires: ukui-input-gather -BuildRequires: libinput-devel -BuildRequires: libukuiinputgatherclient-devel -BuildRequires: layer-shell-qt-devel - - -Requires: ukui-session-manager -Requires: glib2-devel -Requires: ethtool -Requires: mate-common -Requires: libpam-biometric -Requires: ukui-input-gather -Requires: layer-shell-qt - - +Summary: Screensaver for UKUI desktop environment +Name: ukui-screensaver +Version: 4.10.0.0 +Release: 1 +License: GPL-3+ and GPL-2+ and BSD-3-clause +URL: https://www.github.com/ukui/ukui-screensaver +Source0: %{name}-%{version}.tar.gz + +Patch1: ukui-screensaver-4.10.0.0-kylin-add-lib-path-ffmpe.patch +Patch2: modify-config-fix-can-not-unlock-after-first-lock.patch + +BuildRequires: cmake >= 2.6 +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: pam-devel +BuildRequires: qt5-qttools-devel +BuildRequires: glib2-devel +BuildRequires: opencv +BuildRequires: libX11-devel +BuildRequires: libXtst-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: libkylin-nm-base >= 3.20.0.9 +BuildRequires: NetworkManager-libnm-devel +BuildRequires: kf5-networkmanager-qt-devel +BuildRequires: kylin-nm-plugin +BuildRequires: kf5-kwayland-devel +BuildRequires: libkscreen-qt5-devel +BuildRequires: gsettings-qt-devel +BuildRequires: kf5-kwindowsystem-devel >= 5.92.0 +BuildRequires: libmatemixer-devel +BuildRequires: imlib2-devel +BuildRequires: libukui-log4qt-devel +BuildRequires: libkysdk-sysinfo-devel > 1.1.0kylin1 +BuildRequires: ukui-input-gather >= 1.0.0.2 +BuildRequires: libinput-devel +BuildRequires: libukuiinputgatherclient-devel +BuildRequires: ffmpeg-devel +BuildRequires: qt5-qtmultimedia-devel +BuildRequires: libkysdk-systime-devel +BuildRequires: libkysdk-waylandhelper-devel +BuildRequires: lightdm-qt5-devel +BuildRequires: systemd-devel +BuildRequires: openssl-devel +BuildRequires: libXrandr-devel +BuildRequires: CharLS-devel + + +Requires: ethtool +Requires: mate-desktop-libs +Requires: ukui-session-manager >= 4.0.0.0 +Requires: libpam-biometric >= 3.20.0.10 +Requires: ukui-input-gather >= 1.0.0.2 +Requires: gstreamer1-plugins-base +Obsoletes: ukui-screensaver-common < 2.0.0 %description -A simple and lightweight screensaver written by Qt5. -The screensaver supports biometric auhentication which is -provided by biometric-auth service. - + A simple and lightweight screensaver written by Qt5. The screensaver supports biometric auhentication which is provided by biometric-auth service. + %prep %autosetup -n %{name}-%{version} -p1 @@ -62,43 +65,64 @@ provided by biometric-auth service. %install %{cmake_install} -%clean -rm -rf $RPM_BUILD_ROOT +#ukui-screensaver +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/lightdm/lightdm.conf.d/ +cp -r data/ukui-greeter/95-ukui-greeter.conf $RPM_BUILD_ROOT/%{_datadir}/lightdm/lightdm.conf.d/ +mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/lightdm/ +cp -r data/ukui-greeter/lightdm-session-setup.sh $RPM_BUILD_ROOT/%{_prefix}/lib/lightdm/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xgreeters/ +cp -r data/ukui-greeter/ukui-greeter.desktop $RPM_BUILD_ROOT/%{_datadir}/xgreeters/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ukui/ukui-session-manager/simpledesk/ +cp -r data/desktop/kwin.desktop $RPM_BUILD_ROOT/%{_datadir}/ukui/ukui-session-manager/simpledesk/ +cp -r data/desktop/ukui-screensaver.desktop $RPM_BUILD_ROOT/%{_datadir}/ukui/ukui-session-manager/simpledesk/ +cp -r data/desktop/ukui-kglobal.desktop $RPM_BUILD_ROOT/%{_datadir}/ukui/ukui-session-manager/simpledesk/ +cp -r data/desktop/ukui-settings-daemon.desktop $RPM_BUILD_ROOT/%{_datadir}/ukui/ukui-session-manager/simpledesk/ + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/man/man1/ +gzip -c man/ukui-screensaver-backend.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/ukui-screensaver-backend.1.gz +gzip -c man/ukui-screensaver-dialog.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/ukui-screensaver-dialog.1.gz +gzip -c man/ukui-screensaver-command.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/ukui-screensaver-command.1.gz + +rm $RPM_BUILD_ROOT/usr/lib/lightdm/lightdm-session-setup.sh +rm $RPM_BUILD_ROOT/usr/share/xgreeters/ukui-greeter.desktop + +%pre %post -set -e +#!/bin/sh chmod u+s /usr/bin/ukui-screensaver-checkpass -glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||: - -if [ -x /usr/share/kylin-system-updater/kylin-reboot-required ]; then - #执行请求重启提示 - /usr/share/kylin-system-updater/kylin-reboot-required -fi +set -e +glib-compile-schemas /usr/share/glib-2.0/schemas/ %files -%doc debian/copyright debian/changelog -%{_bindir}/ukui-screensaver-dialog -%{_bindir}/ukui-screensaver-backend -%{_bindir}/ukui-screensaver-command -%{_bindir}/screensaver-startup.sh -%{_bindir}/ukui-screensaver-checkpass -%{_datadir}/ukui-screensaver/* -%{_datadir}/glib-2.0/schemas/org.ukui.screensaver.gschema.xml +%license debian/copyright +%doc debian/changelog +%{_sysconfdir}/dbus-1/system.d/org.ukui.screensaver.conf +%{_sysconfdir}/pam.d/ukui-screensaver-qt %{_sysconfdir}/xdg/autostart/ukui-screensaver.desktop -%{_datadir}/desktop-directories/ukui-screensaver.directory %{_sysconfdir}/xdg/menus/ukui-screensavers.menu -%{_sysconfdir}/pam.d/ukui-screensaver-qt -%{_prefix}/lib/ukui-screensaver/ukui-screensaver-default -%{_prefix}/lib/ukui-screensaver/screensaver-focus-helper -%{_prefix}/lib/libukss.so -%{_prefix}/lib/ukui-screensaver/libscreensaver-default.so -%{_prefix}/lib/ukui-screensaver/set4kScale -%{_datadir}/applications/ukui-screensaver-dialog.desktop +%{_bindir}/screensaver-startup.sh +%{_bindir}/ukui-screensaver-backend +%{_bindir}/ukui-screensaver-checkpass +%{_bindir}/ukui-screensaver-command +%{_bindir}/ukui-screensaver-dialog %{_includedir}/ukui-screensaver/screensaverplugin.h +%{_prefix}/lib/ukui-screensaver/libscreensaver-default.so +%{_prefix}/lib/ukui-screensaver/screensaver-focus-helper +%{_prefix}/lib/ukui-screensaver/ukui-screensaver-default +%{_datadir}/* + + %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-ok32~1010 + * Thu Jul 24 2025 peijiankang - 4.0.0.0-3 - fix build error about make_build