Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-session-shell for
openSUSE:Factory checked in at 2022-09-01 22:10:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-session-shell (Old)
and /work/SRC/openSUSE:Factory/.deepin-session-shell.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-session-shell"
Thu Sep 1 22:10:03 2022 rev:6 rq:999755 version:5.5.48
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-session-shell/deepin-session-shell.changes
2022-04-22 21:54:44.458839273 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-session-shell.new.2083/deepin-session-shell.changes
2022-09-01 22:10:53.156197367 +0200
@@ -1,0 +2,17 @@
+Wed Jun 29 09:03:08 UTC 2022 - Hillwood Yang <[email protected]>
+
+- Update version to 5.5.48
+ * Fix bugs
+- Add remove-invalid-dependence.patch
+
+-------------------------------------------------------------------
+Sun May 8 11:28:48 UTC 2022 - Hillwood Yang <[email protected]>
+
+- Update version to 5.5.31
+ * Optimize wayland support
+ * Fix bugs
+ * Add info log
+ * Support disable logout button
+ * Add configuration of screen keyboard
+
+-------------------------------------------------------------------
Old:
----
dde-session-shell-5.5.24.tar.gz
New:
----
dde-session-shell-5.5.48.tar.gz
remove-invalid-dependence.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-session-shell.spec ++++++
--- /var/tmp/diff_new_pack.7bpzDb/_old 2022-09-01 22:10:54.060199839 +0200
+++ /var/tmp/diff_new_pack.7bpzDb/_new 2022-09-01 22:10:54.064199850 +0200
@@ -1,8 +1,8 @@
#
# spec file for package deepin-session-shell
#
-# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2021 Hillwood Yang <[email protected]>
+# Copyright (c) 2022 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 Hillwood Yang <[email protected]>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,16 @@
%define _name dde-session-shell
Name: deepin-session-shell
-Version: 5.5.24
+Version: 5.5.48
Release: 0
Summary: Deepin desktop-environment - Session UI Shell
License: GPL-3.0+
URL: https://github.com/linuxdeepin/dde-session-shell
Source0:
https://github.com/linuxdeepin/dde-session-shell/archive/%{version}/%{_name}-%{version}.tar.gz
Source1:
https://github.com/linuxdeepin/startdde/raw/master/misc/lightdm.conf
+# PATCH-FOR-OPENSUSE remove-invalid-dependence.patch [email protected]
+# https://github.com/linuxdeepin/developer-center/issues/3266
+Patch0: remove-invalid-dependence.patch
Group: System/GUI/Other
BuildRequires: gtest
BuildRequires: update-desktop-files
@@ -39,6 +42,7 @@
%endif
BuildRequires: pkgconfig(dtkwidget) >= 5.5.0
BuildRequires: libdframeworkdbus-devel >= 5.4.20
+BuildRequires: cmake(KF5Wayland)
BuildRequires: pkgconfig(dde-dock)
BuildRequires: pkgconfig(gsettings-qt)
BuildRequires: pkgconfig(gtk+-2.0)
@@ -106,6 +110,9 @@
sed -i
's|backgrounds/deepin/desktop.jpg|wallpapers/openSUSEdefault/contents/images/1920x1080.jpg|g'
\
src/session-widgets/lockcontent.cpp
cp %{_datadir}/icons/hicolor/scalable/apps/openSUSE-distributor-logo.svg
src/widgets/img/logo.svg
+sed -i "/PIXMAP_WIDTH/s|128|284|" src/widgets/logowidget.cpp
+sed -i "/PIXMAP_HEIGHT/s|132|396|" src/widgets/logowidget.cpp
+sed -i "s|KF5/KWayland/Client|KF5/KWayland/KWayland/Client|g"
src/global_util/keyboardmonitor/keyboardplantform_wayland.cpp
%build
%cmake
@@ -131,8 +138,11 @@
%dir %{_datadir}/deepin-authentication/privileges
%{_datadir}/deepin-authentication/privileges/lightdm-deepin-greeter.conf
%dir %{_datadir}/dsg
-%dir %{_datadir}/dsg/apps/
-%{_datadir}/dsg/apps/dde-lock
+%dir %{_datadir}/dsg/configs
+%dir %{_datadir}/dsg/configs/org.deepin.dde.lightdm-deepin-greeter
+%dir %{_datadir}/dsg/configs/org.deepin.dde.lock
+%{_datadir}/dsg/configs/org.deepin.dde.lightdm-deepin-greeter/org.deepin.dde.lightdm-deepin-greeter.json
+%{_datadir}/dsg/configs/org.deepin.dde.lock/org.deepin.dde.lock.json
%files -n lightdm-deepin-greeter
%license LICENSE
@@ -141,12 +151,9 @@
%{_bindir}/lightdm-deepin-greeter
%{_sysconfdir}/deepin/greeters.d/lightdm-deepin-greeter
%{_sysconfdir}/deepin/greeters.d/10-cursor-theme
-# %dir %{_datadir}/lightdm
-# %dir %{_datadir}/lightdm/lightdm.conf.d
%{_datadir}/lightdm/lightdm.conf.d/60-deepin.conf
%dir %{_datadir}/xgreeters
%{_datadir}/xgreeters/lightdm-deepin-greeter.desktop
-%{_datadir}/dsg/apps/lightdm-deepin-greeter
%files devel
%{_includedir}/%{_name}
++++++ dde-session-shell-5.5.24.tar.gz -> dde-session-shell-5.5.48.tar.gz ++++++
++++ 6539 lines of diff (skipped)
++++++ remove-invalid-dependence.patch ++++++
diff -Nurp dde-session-shell-5.5.48/CMakeLists.txt
dde-session-shell-5.5.48-new/CMakeLists.txt
--- dde-session-shell-5.5.48/CMakeLists.txt 2022-06-09 13:30:20.000000000
+0800
+++ dde-session-shell-5.5.48-new/CMakeLists.txt 2022-06-29 16:08:16.802382355
+0800
@@ -72,6 +72,22 @@ set(Qt_LIBS
Qt5::Svg
)
+try_compile(USE_DEEPIN_WAYLAND
+ ${CMAKE_CURRENT_BINARY_DIR}/try_compile
+ SOURCES
+ ${CMAKE_CURRENT_SOURCE_DIR}/tests/wayland_test.cc
+ LINK_LIBRARIES
+ ${Qt_LIBS}
+ ${Qt5Widgets_LIBRARIES}
+ KF5::WaylandClient
+)
+
+message(STATUS "USE_DEEPIN_WAYLAND ${USE_DEEPIN_WAYLAND}")
+
+if(USE_DEEPIN_WAYLAND)
+ add_definitions(-DUSE_DEEPIN_WAYLAND)
+endif()
+
function(generation_dbus_interface xml class_name class_file option)
execute_process(COMMAND qdbusxml2cpp ${option} -p ${class_file} -c
${class_name} ${xml}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
@@ -109,10 +125,10 @@ include_directories(${PROJECT_SOURCE_DIR
aux_source_directory(${PROJECT_SOURCE_DIR}/src/global_util GLOBAL_UTILS)
aux_source_directory(${PROJECT_SOURCE_DIR}/src/global_util/dbus
GLOBAL_UTILS_DBUS)
-aux_source_directory(${PROJECT_SOURCE_DIR}/src/global_util/keyboardmonitor
GLOBAL_UTILS_KEYBOARDMONITOR)
aux_source_directory(${PROJECT_SOURCE_DIR}/src/widgets WIDGETS)
aux_source_directory(${PROJECT_SOURCE_DIR}/src/session-widgets SESSION_WIDGETS)
aux_source_directory(${PROJECT_SOURCE_DIR}/src/libdde-auth AUTHENTICATE)
+aux_source_directory(${PROJECT_SOURCE_DIR}/src/global_util/keyboardmonitor
GLOBAL_UTILS_KEYBOARDMONITOR)
aux_source_directory(${PROJECT_SOURCE_DIR}/interface INTERFACE)
set(QRCS
diff -Nurp
dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardmonitor.cpp
dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardmonitor.cpp
---
dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardmonitor.cpp
2022-06-09 13:30:20.000000000 +0800
+++
dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardmonitor.cpp
2022-06-29 16:08:16.802382355 +0800
@@ -35,7 +35,9 @@ KeyboardMonitor::KeyboardMonitor() : QTh
if (DGuiApplicationHelper::isXWindowPlatform()) {
keyBoardPlatform = new KeyboardPlantformX11();
} else {
+#ifdef USE_DEEPIN_WAYLAND
keyBoardPlatform = new KeyboardPlantformWayland();
+#endif
}
connect(keyBoardPlatform, &KeyBoardPlatform::capslockStatusChanged, this,
&KeyboardMonitor::capslockStatusChanged);
connect(keyBoardPlatform, &KeyBoardPlatform::numlockStatusChanged, this,
&KeyboardMonitor::numlockStatusChanged);
diff -Nurp
dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardmonitor.h
dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardmonitor.h
--- dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardmonitor.h
2022-06-09 13:30:20.000000000 +0800
+++
dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardmonitor.h
2022-06-29 16:08:16.802382355 +0800
@@ -30,7 +30,9 @@
#include <QThread>
#include "keyboardplantform_x11.h"
+#ifdef USE_DEEPIN_WAYLAND
#include "keyboardplantform_wayland.h"
+#endif
class KeyboardMonitor : public QThread
{
diff -Nurp
dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardplantform_wayland.cpp
dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardplantform_wayland.cpp
---
dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardplantform_wayland.cpp
2022-06-09 13:30:20.000000000 +0800
+++
dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardplantform_wayland.cpp
2022-06-29 16:08:16.802382355 +0800
@@ -23,6 +23,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef USE_DEEPIN_WAYLAND
#include "keyboardplantform_wayland.h"
#include <stdio.h>
@@ -137,3 +138,4 @@ void KeyboardPlantformWayland::setupRegi
registry->create(m_connectionThreadObject);
registry->setup();
}
+#endif
diff -Nurp
dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardplantform_wayland.h
dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardplantform_wayland.h
---
dde-session-shell-5.5.48/src/global_util/keyboardmonitor/keyboardplantform_wayland.h
2022-06-09 13:30:20.000000000 +0800
+++
dde-session-shell-5.5.48-new/src/global_util/keyboardmonitor/keyboardplantform_wayland.h
2022-06-29 16:08:16.802382355 +0800
@@ -22,6 +22,8 @@
#ifndef KEYBOARDPLANTFORM_WAYLAND_H
#define KEYBOARDPLANTFORM_WAYLAND_H
+#ifdef USE_DEEPIN_WAYLAND
+
#include "keyboardplatform.h"
class QThread;
@@ -68,4 +70,6 @@ private:
bool m_numLockOn;
};
+#endif
+
#endif // KEYBOARDPLANTFORM_WAYLAND_H
diff -Nurp
dde-session-shell-5.5.48/tests/dde-lock/ut_keyboardplantformwayland.cpp
dde-session-shell-5.5.48-new/tests/dde-lock/ut_keyboardplantformwayland.cpp
--- dde-session-shell-5.5.48/tests/dde-lock/ut_keyboardplantformwayland.cpp
2022-06-09 13:30:20.000000000 +0800
+++ dde-session-shell-5.5.48-new/tests/dde-lock/ut_keyboardplantformwayland.cpp
2022-06-29 16:08:16.802382355 +0800
@@ -2,6 +2,7 @@
#include <gtest/gtest.h>
+#ifdef USE_DEEPIN_WAYLAND
class UT_KeyboardPlantformWayland : public testing::Test
{
protected:
@@ -27,3 +28,4 @@ TEST_F(UT_KeyboardPlantformWayland, basi
m_keyboard->isNumlockOn();
m_keyboard->setNumlockStatus(false);
}
+#endif
diff -Nurp dde-session-shell-5.5.48/tests/wayland_test.cc
dde-session-shell-5.5.48-new/tests/wayland_test.cc
--- dde-session-shell-5.5.48/tests/wayland_test.cc 1970-01-01
08:00:00.000000000 +0800
+++ dde-session-shell-5.5.48-new/tests/wayland_test.cc 2022-06-29
16:43:22.360728930 +0800
@@ -0,0 +1,7 @@
+#include <KF5/KWayland/KWayland/Client/ddeseat.h>
+
+int main(int argc, char *argv[])
+{
+
+ return 0;
+}
