!52 sync by openEuler-22.03-LTS-SP3
From: @ut-layne-yang Reviewed-by: @xzyangha Signed-off-by: @xzyangha
This commit is contained in:
openeuler-ci-bot
Gitee
commit
2837de2cb9
@ -1,6 +1,6 @@
|
||||
From 39f7d59f412d01f21737a2a0c14306c4c5132a49 Mon Sep 17 00:00:00 2001
|
||||
From: heyitao <heyitao@uniontech.com>
|
||||
Date: Fri, 10 Mar 2023 03:21:55 -0500
|
||||
From ccebd5e41abd9526ba9ed57cff2d0fe13ee3bc12 Mon Sep 17 00:00:00 2001
|
||||
From: leeffo <liweiganga@uniontech.com>
|
||||
Date: Mon, 31 Jul 2023 11:44:25 +0800
|
||||
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(-)
|
||||
|
||||
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
|
||||
+++ b/misc/systemd/system/deepin-login-sound.service
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -21,7 +21,7 @@ index 35c8671..4f1d533 100644
|
||||
|
||||
[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
|
||||
+++ b/misc/systemd/system/deepin-shutdown-sound.service
|
||||
@@ -1,6 +1,7 @@
|
||||
@ -31,8 +31,8 @@ index bfb313c..4bc5665 100644
|
||||
+Requisite=local-fs.target
|
||||
+Wants=sound.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 \
|
||||
36
README.en.md
36
README.en.md
@ -1,36 +0,0 @@
|
||||
# dde-api
|
||||
|
||||
#### Description
|
||||
dde api
|
||||
|
||||
#### Software Architecture
|
||||
Software architecture description
|
||||
|
||||
#### Installation
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### Instructions
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### Contribution
|
||||
|
||||
1. Fork the repository
|
||||
2. Create Feat_xxx branch
|
||||
3. Commit your code
|
||||
4. Create Pull Request
|
||||
|
||||
|
||||
#### Gitee Feature
|
||||
|
||||
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
|
||||
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
|
||||
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
|
||||
4. The most valuable open source project [GVP](https://gitee.com/gvp)
|
||||
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
|
||||
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
37
README.md
37
README.md
@ -1,37 +0,0 @@
|
||||
# dde-api
|
||||
|
||||
#### 介绍
|
||||
dde api
|
||||
|
||||
#### 软件架构
|
||||
软件架构说明
|
||||
|
||||
|
||||
#### 安装教程
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### 使用说明
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### 参与贡献
|
||||
|
||||
1. Fork 本仓库
|
||||
2. 新建 Feat_xxx 分支
|
||||
3. 提交代码
|
||||
4. 新建 Pull Request
|
||||
|
||||
|
||||
#### 码云特技
|
||||
|
||||
1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
|
||||
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
|
||||
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
|
||||
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
|
||||
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
||||
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
Binary file not shown.
18
dde-api.spec
18
dde-api.spec
@ -1,7 +1,7 @@
|
||||
# Run tests in check section
|
||||
# disable for bootstrapping
|
||||
%bcond_with check
|
||||
#%global _unpackaged_files_terminate_build 0
|
||||
#%%global _unpackaged_files_terminate_build 0
|
||||
%global with_debug 1
|
||||
|
||||
%if 0%{?with_debug}
|
||||
@ -15,29 +15,28 @@
|
||||
%global _smp_mflags -j1
|
||||
%endif
|
||||
|
||||
%global goipath pkg.deepin.io/dde/api
|
||||
%global goipath github.com/linuxdeepin/dde-api
|
||||
%global forgeurl https://github.com/linuxdeepin/dde-api
|
||||
%global tag %{version}
|
||||
|
||||
Name: dde-api
|
||||
Version: 5.4.30
|
||||
Release: 2
|
||||
Version: 5.5.32
|
||||
Release: 1
|
||||
Summary: Go-lang bingding for dde-daemon
|
||||
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
|
||||
Source1: vendor.tar.gz
|
||||
|
||||
|
||||
#fix sound service bug
|
||||
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: deepin-gettext-tools
|
||||
BuildRequires: librsvg2-devel
|
||||
BuildRequires: sqlite-devel
|
||||
#BuildRequires: go-compiler
|
||||
BuildRequires: golang golang-devel
|
||||
BuildRequires: gdk-pixbuf-xlib
|
||||
BuildRequires: kf5-kwayland-devel
|
||||
@ -67,7 +66,7 @@ building other packages which use import path with
|
||||
%{goipath} prefix.
|
||||
|
||||
%prep
|
||||
%forgeautosetup -p1 -n %{name}-%{version}
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
|
||||
sed -i 's|/usr/lib|%{_libexecdir}|' misc/*services/*.service \
|
||||
misc/systemd/system/deepin-shutdown-sound.service \
|
||||
@ -136,6 +135,9 @@ exit 0
|
||||
%{_datadir}/gocode/src/%{goipath}/themes/scanner/testdata/
|
||||
|
||||
%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
|
||||
- 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