diff --git a/0001-fix-https-gitee.com-src-openeuler-dde-api-issues-I6H.patch b/0001-fix-https-gitee.com-src-openeuler-dde-api-issues-I6H.patch index a81fee1811a4b65e1b0c7d7c91daaae449ca4974..d840cad30e8274604f4628957d19aed569a33a30 100644 --- a/0001-fix-https-gitee.com-src-openeuler-dde-api-issues-I6H.patch +++ b/0001-fix-https-gitee.com-src-openeuler-dde-api-issues-I6H.patch @@ -1,6 +1,6 @@ -From 39f7d59f412d01f21737a2a0c14306c4c5132a49 Mon Sep 17 00:00:00 2001 -From: heyitao -Date: Fri, 10 Mar 2023 03:21:55 -0500 +From ccebd5e41abd9526ba9ed57cff2d0fe13ee3bc12 Mon Sep 17 00:00:00 2001 +From: leeffo +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 diff --git a/0002-feat-fix-strip.patch b/0002-Remove-all-symbol-table-and-relocation-information-f.patch similarity index 36% rename from 0002-feat-fix-strip.patch rename to 0002-Remove-all-symbol-table-and-relocation-information-f.patch index 40bb4451b9f0f06ccfd31c88f98ea1ef1e2864df..f90e576287f77199cba862e7896783a6c80f971b 100644 --- a/0002-feat-fix-strip.patch +++ b/0002-Remove-all-symbol-table-and-relocation-information-f.patch @@ -1,11 +1,26 @@ ---- a/Makefile 2023-03-14 17:56:42.460087712 +0800 -+++ b/Makefile 2023-03-14 17:55:21.035843959 +0800 -@@ -5,7 +5,7 @@ +From ff28813d5ea9964cfd4efb6139e393be0362240e Mon Sep 17 00:00:00 2001 +From: leeffo +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 = \ - thumbnails \ +-- +2.20.1 + diff --git a/README.en.md b/README.en.md deleted file mode 100644 index a7a15a5abbff4257e04db2dd5149c0f62c6170c2..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -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/) diff --git a/README.md b/README.md deleted file mode 100644 index b53570b4499602a6c0e27f78a948e31bf0964840..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -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/) diff --git a/dde-api-5.4.30.tar.gz b/dde-api-5.5.32.tar.gz similarity index 57% rename from dde-api-5.4.30.tar.gz rename to dde-api-5.5.32.tar.gz index d60c2772fb19c0bb7adb2f84399ad9dbd3714a72..81fe37bb25e981cda27c38526799fa8627ef1fc4 100644 Binary files a/dde-api-5.4.30.tar.gz and b/dde-api-5.5.32.tar.gz differ diff --git a/dde-api.spec b/dde-api.spec index 8f112d68bc2230c09189821d77818e3465d36572..30841ee9fe45f7461122aadb02e0c8a026177305 100644 --- a/dde-api.spec +++ b/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 - 5.5.32-1 +- upgrade to version 5.5.32 + * Wed May 31 2023 Wenlong Zhang - 5.4.30-2 - update sys to 0.4.0 to support loong64 diff --git a/vendor.tar.gz b/vendor.tar.gz index b7bf22ecad2e96b31967a13f0af6d56a8fe2e379..6b45a62f0f75465bd8d5e750039c1628dd0f64a8 100644 Binary files a/vendor.tar.gz and b/vendor.tar.gz differ