packages/dde-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!62 update dde-daemon package

Browse Source 
From: @hanshuang123456 
Reviewed-by: @ut-layne-yang 
Signed-off-by: @ut-layne-yang
This commit is contained in:
openeuler-ci-bot 2023-11-28 06:54:14 +00:00 committed by Gitee
commit 91bfbac7a3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 72 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
0001-fix-building-error.patch
View File

@ -1,67 +0,0 @@
From eae5e193d50494616d983600ca014b801d75e32f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 7 May 2020 14:16:56 +0800
Subject: [PATCH 2/2] 2
---
misc/dde-daemon/gesture.json | 9 ---------
system/gesture/core.c | 5 +++++
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/misc/dde-daemon/gesture.json b/misc/dde-daemon/gesture.json
index 73a3d7e..fbcc8fd 100644
--- a/misc/dde-daemon/gesture.json
+++ b/misc/dde-daemon/gesture.json
@@ -53,15 +53,6 @@
"Action": "ShowWindow"
}
},
- {
- "Name": "tap",
- "Direction": "none",
- "Fingers": 3,
- "Action": {
- "Type": "built-in",
- "Action": "MoveWindow"
- }
- },
{
"Name": "swipe",
"Direction": "up",
diff --git a/system/gesture/core.c b/system/gesture/core.c
index f953cc1..ab1ffdf 100644
--- a/system/gesture/core.c
+++ b/system/gesture/core.c
@@ -305,6 +305,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
}
raw_event_reset(raw);
break;
+#if 0
case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
break;
case LIBINPUT_EVENT_GESTURE_TAP_END:
@@ -315,6 +316,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
g_debug("[Tap] fingers: %d", raw->fingers);
handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers);
break;
+#endif
}
}
@@ -432,10 +434,13 @@ handle_events(struct libinput *li)
case LIBINPUT_EVENT_GESTURE_PINCH_END:
case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
+#if 0
case LIBINPUT_EVENT_GESTURE_SWIPE_END:
case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
case LIBINPUT_EVENT_GESTURE_TAP_UPDATE:
case LIBINPUT_EVENT_GESTURE_TAP_END:{
+#endif
+ case LIBINPUT_EVENT_GESTURE_SWIPE_END:{
handle_gesture_events(ev, type);
break;
}
--
2.18.2

BIN
dde-daemon-5.10.0.23-server-industry.orig.tar.xz
View File

Binary file not shown.

BIN
dde-daemon-5.13.85.8.tar.gz Normal file
View File

Binary file not shown.

110
dde-daemon.spec
View File

@ -1,60 +1,63 @@
%global _smp_mflags -j1
%global debug_package %{nil}
%global _unpackaged_files_terminate_build 0
%global _missing_build_ids_terminate_build 0
%define __debug_install_post \
%{_rpmconfigdir}/find-debuginfo.sh %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
%{nil}
%global sname deepin-daemon
%global repo dde-daemon
%global release_name server-industry
Name: dde-daemon
Version: 5.10.0.23
Release: 8
Version: 5.13.85.8
Release: 2
Summary: Daemon handling the DDE session settings
License: GPLv3
URL: http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/
Source0: %{name}-%{version}-%{release_name}.orig.tar.xz
Patch0: 0001-fix-building-error.patch
Source0: %{name}-%{version}.tar.gz
BuildRequires: python3
BuildRequires: gocode
BuildRequires: compiler(go-compiler)
BuildRequires: deepin-gettext-tools
BuildRequires: fontpackages-devel
BuildRequires: librsvg2-tools
BuildRequires: pam-devel >= 1.3.1
BuildRequires: pam >= 1.3.1
BuildRequires: glib2-devel
BuildRequires: gtk3-devel
BuildRequires: systemd-devel
BuildRequires: alsa-lib-devel
BuildRequires: alsa-lib
BuildRequires: pulseaudio-libs-devel
BuildRequires: gdk-pixbuf2-xlib-devel
BuildRequires: gdk-pixbuf2-xlib
BuildRequires: libnl3-devel
BuildRequires: libnl3
BuildRequires: libgudev-devel
BuildRequires: libgudev
BuildRequires: libinput-devel
BuildRequires: libinput
BuildRequires: librsvg2-devel
BuildRequires: librsvg2
BuildRequires: libXcursor-devel
BuildRequires: pkgconfig(sqlite3)
BuildRequires: go-lib-devel
BuildRequires: libX11-devel
BuildRequires: dde-api-devel
BuildRequires: golang-github-linuxdeepin-go-x11-client-devel
BuildRequires: golang-github-linuxdeepin-go-dbus-factory-devel
BuildRequires: golang(gir/gio-2.0)
BuildRequires: golang(gir/glib-2.0)
BuildRequires: golang(gir/gobject-2.0)
BuildRequires: golang(gir/gudev-1.0)
Requires: bluez-libs
Requires: deepin-desktop-base
Requires: deepin-desktop-schemas
Requires: dde-session-ui
Requires: dde-polkit-agent
Requires: rfkill
Requires: gvfs
Requires: iw
# Requires: xdotool
# Requires: gnome-keyring-pam
Requires: imwheel
# Requires: proxychains-ng
# Requires: deepin-proxy
Recommends: iso-codes
Recommends: imwheel
Recommends: mobile-broadband-provider-info
Recommends: google-noto-mono-fonts
Recommends: google-noto-sans-fonts
@ -63,11 +66,14 @@ Recommends: google-noto-sans-fonts
Daemon handling the DDE session settings
%prep
%setup -q -n %{name}-%{version}-%{release_name}
%patch0 -p1
%autosetup -p1 -n %{name}-%{version}
patch langselector/locale.go < rpm/locale.go.patch
patch accounts/users/passwd.go < rpm/passwd.go.patch
# Fix library exec path
sed -i '/deepin/s|lib|libexec|' Makefile
sed -i '/systemd/s|lib|usr/lib|' Makefile
sed -i 's:/lib/udev/rules.d:%{_udevrulesdir}:' Makefile
sed -i '/${DESTDIR}\/usr\/lib\/deepin-daemon\/service-trigger/s|${DESTDIR}/usr/lib/deepin-daemon/service-trigger|${DESTDIR}/usr/libexec/deepin-daemon/service-trigger|g' Makefile
sed -i '/${DESTDIR}${PREFIX}\/lib\/deepin-daemon/s|${DESTDIR}${PREFIX}/lib/deepin-daemon|${DESTDIR}${PREFIX}/usr/libexec/deepin-daemon|g' Makefile
sed -i 's|lib/NetworkManager|libexec|' network/utils_test.go
@ -108,13 +114,27 @@ EOF
sed -i 's/google-chrome/chromium-browser/g' misc/dde-daemon/mime/data.json
%build
%ifarch loongarch64
export CGO_ENABLED=1
export GOOS=linux
%endif
BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')"
export GOPATH=%{_builddir}/%{name}-%{version}-%{release_name}/vendor
%make_build GOBUILD="go build -mod=vendor -compiler gc -ldflags \"-B $BUILDID\""
export GOPATH=/usr/share/gocode
%make_build GO_BUILD_FLAGS=-trimpath GOBUILD="go build -compiler gc -ldflags \"-B $BUILDID\""
%install
export GOPATH=/usr/share/gocode:%{_builddir}/%{name}-%{version}-%{release_name}/vendor
%make_install
%ifarch loongarch64
export CGO_ENABLED=1
export GOOS=linux
%endif
BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')"
export GOPATH=/usr/share/gocode
%make_install GOBUILD="go build -compiler gc -ldflags \"-B $BUILDID\""
install -Dm0644 rpm/85-deepin-accounts-daemon.preset -t %{buildroot}/%{_presetdir}
# fix systemd/logind config
install -d %{buildroot}/usr/lib/systemd/logind.conf.d/
@ -124,8 +144,6 @@ HandlePowerKey=ignore
HandleSuspendKey=ignore
EOF
install -d %{buildroot}/%{_libdir}/security/
install -Dm755 %{buildroot}/pam_deepin_auth.so %{buildroot}/%{_libdir}/security/pam_deepin_auth.so
%find_lang %{name}
@ -135,25 +153,32 @@ if [ $1 -ge 1 ]; then
%{_sbindir}/alternatives --install %{_bindir}/x-terminal-emulator \
x-terminal-emulator %{_libexecdir}/%{sname}/default-terminal 30
fi
%systemd_post deepin-accounts-daemon.service
if [ $1 -eq 2 ] ; then
# Upgrade installation
systemctl --no-reload preset deepin-accounts-daemon.service &>/dev/null || :
fi
%preun
if [ $1 -eq 0 ]; then
%{_sbindir}/alternatives --remove x-terminal-emulator \
%{_libexecdir}/%{sname}/default-terminal
fi
%systemd_preun deepin-accounts-daemon.service
%postun
if [ $1 -eq 0 ]; then
rm -f /var/cache/deepin/mark-setup-network-services
rm -f /var/log/deepin.log
rm -f /var/log/deepin.log
fi
%systemd_postun_with_restart deepin-accounts-daemon.service
%files -f %{name}.lang
%doc README.md
%license LICENSE
%{_sysconfdir}/default/grub.d/10_deepin.cfg
%{_sysconfdir}/grub.d/35_deepin_gfxmode
%{_sysconfdir}/pam.d/deepin-auth-keyboard
%{_sysconfdir}/NetworkManager/conf.d/deepin.dde.daemon.conf
%{_libexecdir}/%{sname}/
%{_prefix}/lib/systemd/logind.conf.d/10-%{sname}.conf
%{_datadir}/dbus-1/services/*.service
@ -163,25 +188,34 @@ fi
%{_datadir}/%{name}/
%{_datadir}/dde/
%{_datadir}/polkit-1/actions/*.policy
%{_var}/cache/appearance/
%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla
%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla
%{_sysconfdir}/acpi/actions/deepin_lid.sh
%{_sysconfdir}/acpi/events/deepin_lid
%{_sysconfdir}/lightdm/deepin/xsettingsd.conf
# This directory is not provided by any other package.
%dir %{_sysconfdir}/pulse/daemon.conf.d
%{_sysconfdir}/pulse/daemon.conf.d/10-deepin.conf
/lib/udev/rules.d/80-deepin-fprintd.rules
%{_datadir}/pam-configs/deepin-auth
/var/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Fprintd.pkla
%{_libdir}/security/pam_deepin_auth.so
/lib/systemd/system/dbus-com.deepin.dde.lockservice.service
/lib/systemd/system/deepin-accounts-daemon.service
%{_udevrulesdir}/80-deepin-fprintd.rules
%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Fprintd.pkla
%{_unitdir}/dbus-com.deepin.dde.lockservice.service
%{_unitdir}/deepin-accounts-daemon.service
%{_presetdir}/85-deepin-accounts-daemon.preset
%{_sysconfdir}/default/grub.d/10_deepin.cfg
%{_sysconfdir}/grub.d/35_deepin_gfxmode
%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla
%changelog
* Tue Nov 28 2023 hanshuang <hanshuang@uniontech.com> - 5.13.85.8-2
- modify spec remove openeuler info
* Wed Sep 2 2020 chenbo pan <panchenbo@uniontech.com> - 5.10.0.23-8
- fix requires golang devel
* Wed Aug 19 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.10.0.23-7
- change python37 to python3
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.10.0.23-6
- remove golang devel
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.10.0.23-5
- Package init