diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 13f974cb574b949808ca886d0a56bc3938bd75ef..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gocode - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### 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 9ed76cda607d820a3e0c1a0331948c3b45919f69..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# gocode - -#### 介绍 -{**以下是 Gitee 平台说明，您可以替换此简介** -Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -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. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/fix-sw64-build-dde-error.patch b/fix-sw64-build-dde-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..2ff2566951c183fb9df9f27f665d57cf43ab883b --- /dev/null +++ b/fix-sw64-build-dde-error.patch @@ -0,0 +1,62 @@ +diff --git a/golang.org/x/net/internal/socket/sys_linux_sw64.go b/golang.org/x/net/internal/socket/sys_linux_sw64.go +index 3e7d2d3..d860b2b 100755 +--- a/golang.org/x/net/internal/socket/sys_linux_sw64.go ++++ b/golang.org/x/net/internal/socket/sys_linux_sw64.go +@@ -2,6 +2,9 @@ + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + ++//go:build linux && sw64 ++// +build linux,sw64 ++ + package socket + + const ( +diff --git a/golang.org/x/net/internal/socket/zsys_linux_sw64.go b/golang.org/x/net/internal/socket/zsys_linux_sw64.go +index b20d216..bef3515 100755 +--- a/golang.org/x/net/internal/socket/zsys_linux_sw64.go ++++ b/golang.org/x/net/internal/socket/zsys_linux_sw64.go +@@ -1,6 +1,9 @@ + // Code generated by cmd/cgo -godefs; DO NOT EDIT. + // cgo -godefs defs_linux.go + ++//go:build linux && sw64 ++// +build linux,sw64 ++ + package socket + + type iovec struct { +@@ -53,5 +56,4 @@ const ( + sizeofCmsghdr = 0x10 + + sizeofSockaddrInet = 0x10 +- sizeofSockaddrInet6 = 0x1c + ) +diff --git a/golang.org/x/net/ipv4/zsys_linux_sw64.go b/golang.org/x/net/ipv4/zsys_linux_sw64.go +index a04e785..669c699 100755 +--- a/golang.org/x/net/ipv4/zsys_linux_sw64.go ++++ b/golang.org/x/net/ipv4/zsys_linux_sw64.go +@@ -1,6 +1,9 @@ + // Code generated by cmd/cgo -godefs; DO NOT EDIT. + // cgo -godefs defs_linux.go + ++//go:build linux && sw64 ++// +build linux,sw64 ++ + package ipv4 + + const ( +diff --git a/golang.org/x/net/ipv6/zsys_linux_sw64.go b/golang.org/x/net/ipv6/zsys_linux_sw64.go +index 992ac9e..8c0170c 100755 +--- a/golang.org/x/net/ipv6/zsys_linux_sw64.go ++++ b/golang.org/x/net/ipv6/zsys_linux_sw64.go +@@ -1,6 +1,9 @@ + // Code generated by cmd/cgo -godefs; DO NOT EDIT. + // cgo -godefs defs_linux.go + ++//go:build linux && sw64 ++// +build linux,sw64 ++ + package ipv6 + + const ( diff --git a/gocode.spec b/gocode.spec index ded3bcefde9674b16748f18d9b44981beb189ab4..2ad7162ceaab3f46491a5040bc7e5074baef2bf1 100644 --- a/gocode.spec +++ b/gocode.spec @@ -1,4 +1,3 @@ -%define anolis_release 2 # Run tests in check section # disable for bootstrapping %bcond_with check @@ -6,7 +5,7 @@ Name: gocode Version: 0.0.0.52 -Release: 6.%{anolis_release}%{?dist} +Release: 12%{?dist}.06 Summary: gocode License: GPLv3 URL: %{gourl} @@ -16,6 +15,7 @@ Source0: %{name}_%{version}.orig.tar.gz Patch0001: 0001-sync-upstream-and-correct-illegal-msg-check.patch Patch0002: 0002-sync-upstream.patch Patch0003: 0003-correct-code-style.patch +Patch0004: fix-sw64-build-dde-error.patch #end BuildArch: noarch @@ -29,62 +29,60 @@ gocode %build %install -mkdir -p %{buildroot}%{gopath}/src/ -cp -r ./* %{buildroot}%{gopath}/src/ +install -d -p %{buildroot}/%{gopath}/src/ +for file in $(find . -iname "*.go" -o -iname "*.c" -o -iname "*.h" -o -iname "*.s" -o -iname "*.v1") ; do + install -d -p %{buildroot}/%{gopath}/src/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/$file + echo "%{gopath}/src/$file" >> devel.file-list +done -%files -%{gopath}/src/* - -##install -d -p %{buildroot}/%{gopath}/src/ -##for file in $(find . -iname "*.go" -o -iname "*.c" -o -iname "*.h" -o -iname "*.s") ; do -## install -d -p %{buildroot}/%{gopath}/src/$(dirname $file) -## cp -pav $file %{buildroot}/%{gopath}/src/$file -## echo "%{gopath}/src/$file" >> devel.file-list -##done -##%files -f devel.file-list +%files -f devel.file-list %changelog -* Tue Nov 07 2023 yangxianzhao - 0.0.0.52-6.2 -- rebuild for qt +* Fri Nov 29 2024 liweigang - 0.0.0.52-12.06 +- feat: fix sw64 build dde error + +* Wed Nov 27 2024 liweigang - 0.0.0.52-12.05 +- feat: fix sw64 build dde error + +* Wed Nov 20 2024 liweigang - 0.0.0.52-12.04 +- feat: fix sw64 build dde error -* Mon Aug 28 2023 yangxianzhao - 0.0.0.52-6.09.1 -- Specification spec file +* Mon Nov 18 2024 liweigang - 0.0.0.52-12.03 +- feat: to support sw_64 -* Fri Mar 03 2023 zhaoshuang - 0.0.0.52-6.09 +* Fri Sep 08 2023 liuzhilin - 0.0.0.52-12.02 +- feat: add github.com/jouyouyun and add github.com/linuxdeepin + +* Fri Mar 03 2023 zhaoshuang - 0.0.0.52-12.01 - fix: sync patch from dde master branch to fix dbus/dde character set related issue(bugid:195007) -* Tue Jan 10 2023 liweiganga - 0.0.0.52-6.08 -- feat: update golang.org/x/net(v0.4.0) to support loongarch64 +* Tue Jan 10 2023 liweiganga - 0.0.0.52-12 +- feat: update goalng.org/x/net(v0.4.0) to support loongarch64 -* Tue Jan 10 2023 liweiganga - 0.0.0.52-6.07 +* Tue Jan 10 2023 liweiganga - 0.0.0.52-11 - feat: add github.com/golang/groupcache/lru(master) - feat: add github.com/miekg/dns(v1.1.50) -* Fri Dec 30 2022 liweiganga - 0.0.0.52-6.06 +* Fri Dec 30 2022 liweiganga - 0.0.0.52-10 - feat: add golang.org/x/sync -- feat: update golang.org/x/sys and adapt unsafe.Slice +- feat: update goalng.org/x/sys and adapt unsafe.Slice -* Thu Dec 29 2022 liweiganga - 0.0.0.52-6.05 +* Thu Dec 29 2022 liweiganga - 0.0.0.52-9 - feat: add github.com/mdlayher/socket - feat: add github.com/josharian/native -* Thu Dec 29 2022 liweiganga - 0.0.0.52-6.04 +* Thu Dec 29 2022 liweiganga - 0.0.0.52-8 - feat: add github.com/mdlayher/netlink -* Thu Dec 29 2022 liweiganga - 0.0.0.52-6.03 +* Thu Dec 29 2022 liweiganga - 0.0.0.52-7 - feat: add google.golang.org/protobuf -* Wed Dec 28 2022 liweiganga - 0.0.0.52-6.02 +* Wed Dec 28 2022 liweiganga - 0.0.0.52-6 - feat: add github.com/youpy/go-wav - feat: add github.com/youpy/go-riff - feat: add github.com/zaf/g711 -* Fri Jul 30 2021 bianguangze - 0.0.0.52-6.01 -- Modify SOURCES . - -* Thu Jul 22 2021 panchenbo - 0.0.0.52-6 -- add support deepin-elf-verify - * Thu Apr 15 2021 panchenbo - 0.0.0.52-5 - add github.com/godbus/dbus/v5 diff --git a/gocode_0.0.0.52.orig.tar.gz b/gocode_0.0.0.52.orig.tar.gz index 1979a4ab4a388cad8a8b04e8a859762dda2cbd34..4f204d83f47172cba9ded09b2c2775d959785aa2 100644 Binary files a/gocode_0.0.0.52.orig.tar.gz and b/gocode_0.0.0.52.orig.tar.gz differ