diff --git a/0001-fix-building-error.patch b/0001-fix-building-error.patch deleted file mode 100644 index 3104173632818e3a706e831f35b9cdceec8af92f..0000000000000000000000000000000000000000 --- a/0001-fix-building-error.patch +++ /dev/null @@ -1,67 +0,0 @@ -From eae5e193d50494616d983600ca014b801d75e32f Mon Sep 17 00:00:00 2001 -From: Your Name -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 - diff --git a/dde-daemon-5.12.0.18.orig.tar.xz b/dde-daemon-5.12.0.18.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..83e6f98b7179fe153d4f8c8ccfc83856f2d0c7a2 Binary files /dev/null and b/dde-daemon-5.12.0.18.orig.tar.xz differ diff --git a/dde-daemon.spec b/dde-daemon.spec index b7355824f1b34553d11fe0501401aaddce88eeff..a68f5976d8864f680f6bc7f1f50ac993511963c9 100644 --- a/dde-daemon.spec +++ b/dde-daemon.spec @@ -11,13 +11,14 @@ %global release_name server-industry Name: dde-daemon -Version: 5.10.0.23 -Release: 10 +Version: 5.12.0.18 +Release: 1 Summary: Daemon handling the DDE session settings -License: GPLv2 and MIT +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}.orig.tar.xz +Source1: vendor.tar.gz + BuildRequires: python3 BuildRequires: golang @@ -43,6 +44,7 @@ BuildRequires: libinput BuildRequires: librsvg2-devel BuildRequires: librsvg2 BuildRequires: libXcursor-devel +BuildRequires: pkgconfig(sqlite3) Requires: bluez-libs Requires: deepin-desktop-base @@ -63,8 +65,9 @@ Recommends: google-noto-sans-fonts Daemon handling the DDE session settings %prep -%setup -q -n %{name}-%{version}-%{release_name} -%patch0 -p1 +%autosetup +tar -xf %{SOURCE1} +patch langselector/locale.go < rpm/locale.go.patch # Fix library exec path sed -i '/deepin/s|lib|libexec|' Makefile @@ -110,11 +113,13 @@ sed -i 's/google-chrome/chromium-browser/g' misc/dde-daemon/mime/data.json %build 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\"" +%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 +BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" +export GOPATH=/usr/share/gocode +%make_install PAM_MODULE_DIR=%{_libdir}/security GOBUILD="go build -compiler gc -ldflags \"-B $BUILDID\"" # fix systemd/logind config install -d %{buildroot}/usr/lib/systemd/logind.conf.d/ @@ -124,9 +129,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} %post @@ -177,6 +179,9 @@ fi /lib/systemd/system/deepin-accounts-daemon.service %changelog +* Thu Jul 08 2021 weidong - 5.12.0.18-1 +- Update 5.12.0.18. + * Thu Mar 04 2021 weidong - 5.10.0.23-10 - Update license. @@ -190,3 +195,4 @@ fi - remove golang devel * Thu Jul 30 2020 openEuler Buildteam - 5.10.0.23-5 - Package init + diff --git a/dde-daemon-5.10.0.23-server-industry.orig.tar.xz b/vendor.tar.gz similarity index 57% rename from dde-daemon-5.10.0.23-server-industry.orig.tar.xz rename to vendor.tar.gz index eaa873b7f6ead5c177304a68225b07dc8a9b98a9..8438d45095653c8ada6fca6dbab540be4db46bfe 100644 Binary files a/dde-daemon-5.10.0.23-server-industry.orig.tar.xz and b/vendor.tar.gz differ