upgrade to version 5.5.32
(cherry picked from commit 72e08bee8ab77ef74765e48e29a5c87210edc36d)
This commit is contained in:
parent
0ce58dcd3a
commit
5d4020e401
@ -1,6 +1,6 @@
|
|||||||
From 39f7d59f412d01f21737a2a0c14306c4c5132a49 Mon Sep 17 00:00:00 2001
|
From ccebd5e41abd9526ba9ed57cff2d0fe13ee3bc12 Mon Sep 17 00:00:00 2001
|
||||||
From: heyitao <heyitao@uniontech.com>
|
From: leeffo <liweiganga@uniontech.com>
|
||||||
Date: Fri, 10 Mar 2023 03:21:55 -0500
|
Date: Mon, 31 Jul 2023 11:44:25 +0800
|
||||||
Subject: [PATCH] fix:https://gitee.com/src-openeuler/dde-api/issues/I6HXVH
|
Subject: [PATCH] fix:https://gitee.com/src-openeuler/dde-api/issues/I6HXVH
|
||||||
|
|
||||||
---
|
---
|
||||||
@ -9,7 +9,7 @@ Subject: [PATCH] fix:https://gitee.com/src-openeuler/dde-api/issues/I6HXVH
|
|||||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/misc/systemd/system/deepin-login-sound.service b/misc/systemd/system/deepin-login-sound.service
|
diff --git a/misc/systemd/system/deepin-login-sound.service b/misc/systemd/system/deepin-login-sound.service
|
||||||
index 35c8671..4f1d533 100644
|
index 38fcda1..fbc0fc5 100644
|
||||||
--- a/misc/systemd/system/deepin-login-sound.service
|
--- a/misc/systemd/system/deepin-login-sound.service
|
||||||
+++ b/misc/systemd/system/deepin-login-sound.service
|
+++ b/misc/systemd/system/deepin-login-sound.service
|
||||||
@@ -1,6 +1,6 @@
|
@@ -1,6 +1,6 @@
|
||||||
@ -21,7 +21,7 @@ index 35c8671..4f1d533 100644
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
diff --git a/misc/systemd/system/deepin-shutdown-sound.service b/misc/systemd/system/deepin-shutdown-sound.service
|
diff --git a/misc/systemd/system/deepin-shutdown-sound.service b/misc/systemd/system/deepin-shutdown-sound.service
|
||||||
index bfb313c..4bc5665 100644
|
index 71797e7..33604c6 100644
|
||||||
--- a/misc/systemd/system/deepin-shutdown-sound.service
|
--- a/misc/systemd/system/deepin-shutdown-sound.service
|
||||||
+++ b/misc/systemd/system/deepin-shutdown-sound.service
|
+++ b/misc/systemd/system/deepin-shutdown-sound.service
|
||||||
@@ -1,6 +1,7 @@
|
@@ -1,6 +1,7 @@
|
||||||
@ -31,8 +31,8 @@ index bfb313c..4bc5665 100644
|
|||||||
+Requisite=local-fs.target
|
+Requisite=local-fs.target
|
||||||
+Wants=sound.target
|
+Wants=sound.target
|
||||||
After=sound.target local-fs.target
|
After=sound.target local-fs.target
|
||||||
Before=systemd-logind.service
|
Conflicts=shutdown.target
|
||||||
|
Before=shutdown.target
|
||||||
--
|
--
|
||||||
2.18.2
|
2.20.1
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,26 @@
|
|||||||
|
From ff28813d5ea9964cfd4efb6139e393be0362240e Mon Sep 17 00:00:00 2001
|
||||||
|
From: leeffo <liweiganga@uniontech.com>
|
||||||
|
Date: Mon, 31 Jul 2023 11:45:32 +0800
|
||||||
|
Subject: [PATCH] Remove all symbol table and relocation information from the
|
||||||
|
executable
|
||||||
|
|
||||||
|
---
|
||||||
|
Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 1b2c4b7..57b2146 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -5,7 +5,7 @@ GOSITE_DIR = ${PREFIX}/share/gocode
|
||||||
|
libdir = /lib
|
||||||
|
SYSTEMD_LIB_DIR = ${libdir}
|
||||||
|
SYSTEMD_SERVICE_DIR = ${SYSTEMD_LIB_DIR}/systemd/system/
|
||||||
|
-GOBUILD = env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go build
|
||||||
|
+GOBUILD = env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go build -ldflags "-s" -buildmode=pie
|
||||||
|
export GO111MODULE=off
|
||||||
|
|
||||||
|
LIBRARIES = \
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- a/Makefile 2023-03-14 17:56:42.460087712 +0800
|
|
||||||
+++ b/Makefile 2023-03-14 17:55:21.035843959 +0800
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
libdir = /lib
|
|
||||||
SYSTEMD_LIB_DIR = ${libdir}
|
|
||||||
SYSTEMD_SERVICE_DIR = ${SYSTEMD_LIB_DIR}/systemd/system/
|
|
||||||
-GOBUILD = env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go build
|
|
||||||
+GOBUILD = env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go build -ldflags "-s" -buildmode=pie
|
|
||||||
|
|
||||||
LIBRARIES = \
|
|
||||||
thumbnails \
|
|
||||||
Binary file not shown.
18
dde-api.spec
18
dde-api.spec
@ -1,7 +1,7 @@
|
|||||||
# Run tests in check section
|
# Run tests in check section
|
||||||
# disable for bootstrapping
|
# disable for bootstrapping
|
||||||
%bcond_with check
|
%bcond_with check
|
||||||
#%global _unpackaged_files_terminate_build 0
|
#%%global _unpackaged_files_terminate_build 0
|
||||||
%global with_debug 1
|
%global with_debug 1
|
||||||
|
|
||||||
%if 0%{?with_debug}
|
%if 0%{?with_debug}
|
||||||
@ -15,29 +15,28 @@
|
|||||||
%global _smp_mflags -j1
|
%global _smp_mflags -j1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global goipath pkg.deepin.io/dde/api
|
%global goipath github.com/linuxdeepin/dde-api
|
||||||
%global forgeurl https://github.com/linuxdeepin/dde-api
|
%global forgeurl https://github.com/linuxdeepin/dde-api
|
||||||
%global tag %{version}
|
%global tag %{version}
|
||||||
|
|
||||||
Name: dde-api
|
Name: dde-api
|
||||||
Version: 5.4.30
|
Version: 5.5.32
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: Go-lang bingding for dde-daemon
|
Summary: Go-lang bingding for dde-daemon
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/
|
URL: https://github.com/linuxdeepin/dde-api
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Source1: vendor.tar.gz
|
Source1: vendor.tar.gz
|
||||||
|
|
||||||
|
|
||||||
#fix sound service bug
|
#fix sound service bug
|
||||||
Patch0001: 0001-fix-https-gitee.com-src-openeuler-dde-api-issues-I6H.patch
|
Patch0001: 0001-fix-https-gitee.com-src-openeuler-dde-api-issues-I6H.patch
|
||||||
Patch0002: 0002-feat-fix-strip.patch
|
Patch0002: 0002-Remove-all-symbol-table-and-relocation-information-f.patch
|
||||||
|
|
||||||
BuildRequires: libcanberra-devel
|
BuildRequires: libcanberra-devel
|
||||||
BuildRequires: deepin-gettext-tools
|
BuildRequires: deepin-gettext-tools
|
||||||
BuildRequires: librsvg2-devel
|
BuildRequires: librsvg2-devel
|
||||||
BuildRequires: sqlite-devel
|
BuildRequires: sqlite-devel
|
||||||
#BuildRequires: go-compiler
|
|
||||||
BuildRequires: golang golang-devel
|
BuildRequires: golang golang-devel
|
||||||
BuildRequires: gdk-pixbuf-xlib
|
BuildRequires: gdk-pixbuf-xlib
|
||||||
BuildRequires: kf5-kwayland-devel
|
BuildRequires: kf5-kwayland-devel
|
||||||
@ -67,7 +66,7 @@ building other packages which use import path with
|
|||||||
%{goipath} prefix.
|
%{goipath} prefix.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%forgeautosetup -p1 -n %{name}-%{version}
|
%autosetup -p1 -n %{name}-%{version}
|
||||||
|
|
||||||
sed -i 's|/usr/lib|%{_libexecdir}|' misc/*services/*.service \
|
sed -i 's|/usr/lib|%{_libexecdir}|' misc/*services/*.service \
|
||||||
misc/systemd/system/deepin-shutdown-sound.service \
|
misc/systemd/system/deepin-shutdown-sound.service \
|
||||||
@ -136,6 +135,9 @@ exit 0
|
|||||||
%{_datadir}/gocode/src/%{goipath}/themes/scanner/testdata/
|
%{_datadir}/gocode/src/%{goipath}/themes/scanner/testdata/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 31 2023 leeffo <liweiganga@uniontech.com> - 5.5.32-1
|
||||||
|
- upgrade to version 5.5.32
|
||||||
|
|
||||||
* Wed May 31 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 5.4.30-2
|
* Wed May 31 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 5.4.30-2
|
||||||
- update sys to 0.4.0 to support loong64
|
- update sys to 0.4.0 to support loong64
|
||||||
|
|
||||||
|
|||||||
BIN
vendor.tar.gz
BIN
vendor.tar.gz
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user