diff --git a/0001-fix.patch b/0001-fix.patch deleted file mode 100644 index 928effd81268e3f1bb19d5019cc7210f68bed8f4..0000000000000000000000000000000000000000 --- a/0001-fix.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 519a2ad6985fafb8b84c32c7a2005fe989d96fcc Mon Sep 17 00:00:00 2001 -From: shaojun -Date: Wed, 22 Feb 2023 13:42:53 +0800 -Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E6=A0=87=E8=B6=85=E5=A4=A7?= - =?UTF-8?q?=E5=AD=97=E7=AC=A6=E9=9B=86=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA?= - =?UTF-8?q?=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -修改字体计算高度方法 - -Log: -Bug: https://pms.uniontech.com/bug-view-187789.html -Influence: 通知中心和通知界面在不同字体下的布局。 -Change-Id: I463948052b64becad4c623a22a043b6f72642d4c ---- - dde-osd/notification/appbodylabel.cpp | 14 ++++++++++---- - dde-osd/notification/appbodylabel.h | 1 + - 2 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/dde-osd/notification/appbodylabel.cpp b/dde-osd/notification/appbodylabel.cpp -index 071b1ff4..fecbb84f 100644 ---- a/dde-osd/notification/appbodylabel.cpp -+++ b/dde-osd/notification/appbodylabel.cpp -@@ -19,6 +19,10 @@ AppBodyLabel::AppBodyLabel(QWidget *parent) - , m_alignment(Qt::AlignVCenter) - { - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); -+ -+ connect(qApp, &QGuiApplication::fontChanged, this, [&] { -+ m_fontHeight = fontMetrics().size(Qt::TextSingleLine, text()).height(); -+ }); - } - - void AppBodyLabel::setText(const QString &text) -@@ -32,6 +36,8 @@ void AppBodyLabel::setText(const QString &text) - #endif - - m_text = text; -+ m_fontHeight = fontMetrics().size(Qt::TextSingleLine, text).height(); -+ - updateLineCount(); - update(); - } -@@ -96,12 +102,12 @@ static int drawText(QPainter *painter, const QRectF &rect, int lineHeight, QText - - QSize AppBodyLabel::sizeHint() const - { -- return QSize(width(), fontMetrics().height() * m_lineCount); -+ return QSize(width(), m_fontHeight * m_lineCount); - } - - QSize AppBodyLabel::minimumSizeHint() const - { -- QSize size(width(), fontMetrics().height()); -+ QSize size(width(), m_fontHeight); - - return size; - } -@@ -162,7 +168,7 @@ void AppBodyLabel::paintEvent(QPaintEvent *event) - layout.setTextOption(option); - - QRect rect(this->rect()); -- int lineHeight = fontMetrics().height(); -+ int lineHeight = m_fontHeight; - int lineCount = m_lineCount; - - while (lineCount > 1 && lineCount * lineHeight > height()) { -@@ -185,5 +191,5 @@ void AppBodyLabel::updateLineCount() - - layout.setTextOption(option); - -- m_lineCount = drawText(nullptr, QRectF(QPointF(0, 0), QSizeF(width(), INT_MAX)), fontMetrics().height(), &layout, Qt::ElideNone); -+ m_lineCount = drawText(nullptr, QRectF(QPointF(0, 0), QSizeF(width(), INT_MAX)), m_fontHeight, &layout, Qt::ElideNone); - } -diff --git a/dde-osd/notification/appbodylabel.h b/dde-osd/notification/appbodylabel.h -index e05ea9b8..991bc136 100644 ---- a/dde-osd/notification/appbodylabel.h -+++ b/dde-osd/notification/appbodylabel.h -@@ -42,6 +42,7 @@ private: - QString m_text; - int m_lineCount = 0; - Qt::Alignment m_alignment; -+ int m_fontHeight = 0; - }; - - #endif // APPBODYLABEL_H --- -2.20.1 - diff --git a/0001-update-license.patch b/0001-update-license.patch new file mode 100644 index 0000000000000000000000000000000000000000..2f59643683a2066387eabad28c88d597b39e0c45 --- /dev/null +++ b/0001-update-license.patch @@ -0,0 +1,25 @@ +From a66245c71d30bbebf6eca16dc3c681465e573c36 Mon Sep 17 00:00:00 2001 +From: maqi +Date: Mon, 25 Aug 2025 10:36:37 +0800 +Subject: [PATCH] update license + +--- + rpm/dde-session-ui.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rpm/dde-session-ui.spec b/rpm/dde-session-ui.spec +index 7222d7d..47760d8 100644 +--- a/rpm/dde-session-ui.spec ++++ b/rpm/dde-session-ui.spec +@@ -2,7 +2,7 @@ Name: dde-session-ui + Version: 5.4.8 + Release: 1 + Summary: Deepin desktop-environment - Session UI module +-License: GPLv3 ++License: GPL-3.0-or-later + URL: https://github.com/linuxdeepin/%{name} + Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +-- +2.39.3 + diff --git a/dde-session-ui-5.5.39.tar.gz b/dde-session-ui-5.5.39.tar.gz deleted file mode 100644 index 0dd83c11658da80b51c750ca2b8026bad5bbd064..0000000000000000000000000000000000000000 Binary files a/dde-session-ui-5.5.39.tar.gz and /dev/null differ diff --git a/dde-session-ui.conf b/dde-session-ui.conf new file mode 100644 index 0000000000000000000000000000000000000000..afcdeb0b1d3855b391b80fd552d1a482e5f7f91c --- /dev/null +++ b/dde-session-ui.conf @@ -0,0 +1,2 @@ +[General] +userlist=false diff --git a/dde-session-ui.spec b/dde-session-ui.spec index a22c9d21c8c2b8910e4f25e39fa5bc36380e8104..5b7380957809b17ffb347dfcdc25914b37de0ee5 100644 --- a/dde-session-ui.spec +++ b/dde-session-ui.spec @@ -1,38 +1,45 @@ -%define anolis_release 2 -%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} Name: dde-session-ui -Version: 5.5.39 -Release: 3.%{anolis_release}%{?dist} +Version: 5.7.30 +Release: 1%{?dist}.02 Summary: Deepin desktop-environment - Session UI module -License: GPLv3 -URL: https://github.com/linuxdeepin/%{name} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-fix.patch +License: GPL-3.0-or-later +URL: https://github.com/linuxdeepin/dde-session-ui +Source0: dde-session-ui_5.7.30.orig.tar.xz +Source1: dde-session-ui.conf +Patch0: 0001-update-license.patch BuildRequires: gcc-c++ -BuildRequires: deepin-gettext-tools -BuildRequires: pkgconfig(dtkwidget) >= 5.1 -BuildRequires: pkgconfig(dframeworkdbus) -BuildRequires: pkgconfig(gsettings-qt) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libsystemd) +BuildRequires: make +BuildRequires: cmake BuildRequires: pkgconfig(xcb-ewmh) -BuildRequires: pkgconfig(xcursor) -BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(xext) -BuildRequires: gocode +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: deepin-gettext-tools +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(dtkwidget) BuildRequires: qt5-devel +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(dframeworkdbus) BuildRequires: dtkcore-devel >= 5.1 BuildRequires: dde-dock-devel -BuildRequires: make -BuildRequires: cmake BuildRequires: gtest-devel -Requires: dde-daemon -Requires: startdde +BuildRequires: pkgconfig(gio-qt) +BuildRequires: pkgconfig(xext) +Requires: dde-common >= 2026 +Requires: deepin-desktop-schemas >= 5.9.14 +Requires: dde-qt-dbus-factory >= 5.4.6 +Requires: dde-daemon >= 5.13.27 +Requires: startdde >= 5.8.15 +Requires: xorg-x11-server-utils +Requires: dbus-x11 +Requires: dde-session-shell +Requires: libxcb Requires: lightdm Requires(post): sed -Provides: lightdm-deepin-greeter = %{version}-%{release} + +Recommends: onboard Provides: lightdm-greeter = 1.2 Provides: deepin-notifications = %{version}-%{release} Obsoletes: deepin-notifications < %{version}-%{release} @@ -50,7 +57,7 @@ This project include those sub-project: - dde-hotzone: User interface of setting hot zone. %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 sed -i 's|default_background.jpg|default.png|' widgets/fullscreenbackground.cpp sed -i 's|lib/deepin-daemon|libexec/deepin-daemon|' \ dde-osd/files/com.deepin.dde.Notification.service \ @@ -61,17 +68,18 @@ sed -i 's|lib/deepin-daemon|libexec/deepin-daemon|' \ dde-warning-dialog/com.deepin.dde.WarningDialog.service \ CMakeLists.txt sed -i 's|lib/dde-dock|%{_libdir}/dde-dock|' CMakeLists.txt -%patch0 -p1 +sed -i 's|Exec=/usr/lib/deepin-daemon/dde-blackwidget|Exec=%{_libexecdir}/deepin-daemon/dde-blackwidget|g' dde-blackwidget/com.deepin.dde.BlackScreen.service %build export PATH=%{_qt5_bindir}:$PATH mkdir build && cd build %cmake .. -%make_build -C %{_vpath_builddir} +%make_build %install cd build -%make_install INSTALL_ROOT=%{buildroot} -C %{_vpath_builddir} +%make_install INSTALL_ROOT=%{buildroot} +install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/dde-session-ui/dde-session-ui.conf %post sed -i "s|#greeter-session.*|greeter-session=lightdm-deepin-greeter|g" /etc/lightdm/lightdm.conf @@ -81,20 +89,52 @@ sed -i "s|#greeter-session.*|greeter-session=lightdm-deepin-greeter|g" /etc/ligh %license LICENSE %{_bindir}/dde-* %{_bindir}/dmemory-warning-dialog +%{_bindir}/dde_user_notice_warpper +%{_bindir}/user_notice_check.sh +%{_libdir}/dde-dock/plugins/libnotifications.so %{_libexecdir}/deepin-daemon/* +%{_datadir}/applications/dde-* +%{_datadir}/dde-session-shell/greeters.d/launch.conf.d/*.json %{_datadir}/%{name}/ -%{_datadir}/icons/hicolor/scalable/devices/computer.svg +%{_datadir}/%{name}/dde-session-ui.conf %{_datadir}/dbus-1/services/*.service -%{_libdir}/dde-dock/plugins/libnotifications.so -%{_prefix}/share/glib-2.0/schemas/com.deepin.dde.dock.module.notifications.gschema.xml -%{_datadir}/applications/dde-* +%{_datadir}/glib-2.0/schemas/com.deepin.dde.dock.module.notifications.gschema.xml +%{_datadir}/icons/hicolor/scalable/devices/computer.svg +%{_datadir}/dsg/configs/org.deepin.dde.network.secret.dlg/org.deepin.dde.network.secret.dlg.json +%{_datadir}/dsg/configs/org.deepin.dde.osd/org.deepin.dde.osd.json +%{_datadir}/dsg/configs/org.deepin.dde.session.ui/org.deepin.dde.session.ui.json %changelog -* Tue Nov 07 2023 yangxianzhao - 5.5.39-3.2 -- rebuild for qt +* Mon Dec 29 2025 liweigang - 5.7.30-1.02 +- spec: revert "modify file exec path" + +* Tue Dec 23 2025 liweigang - 5.7.30-1.01 +- spec: modify file exec path + +* Mon Dec 15 2025 liweigang - 5.7.30-1 +- update: update to version 5.7.30 +- spec: cleanup spec + +* Mon Aug 25 2025 maqi - 5.7.28.1-1.04 +- spec: update license + +* Fri Aug 01 2025 lichao - 5.7.28.1-1.03 +- fix: fix file path error(bugid:326819) + +* Wed Jun 11 2025 lvgenggeng - 5.7.28.1-1.02 +- rebuild: rebuild without gcc_secure + +* Wed Apr 09 2025 maqi - 5.7.28.1-1.01 +- fix: the issue of no account switching entry on the login interface(bugid:310175) + +* Mon Oct 21 2024 liweigang - 5.7.28.1-1 +- update: update to version 5.7.28.1 + +* Mon Oct 09 2023 liweigang - 5.6.16-1 +- update: update to version 5.6.16 -* Wed Nov 01 2023 yangxianzhao - 5.5.39-3.1 -- fix build error +* Wed Aug 16 2023 liuzhilin - 5.6.10-1 +- update: update to 5.6.10 * Fri Apr 14 2023 liweiganga - 5.5.39-3 - feat: fix bug(bugid:187789) diff --git a/dde-session-ui_5.7.30.orig.tar.xz b/dde-session-ui_5.7.30.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..6a0e42b188b910f4883c83c19eedcf278c72897c Binary files /dev/null and b/dde-session-ui_5.7.30.orig.tar.xz differ