summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD39
-rw-r--r--golinx-mod-import.patch11
3 files changed, 47 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e34c893272b9..2fec4117e2fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linx-client
pkgdesc = Simple client for linx-server
pkgver = 1.5.2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/andreimarcu/linx-client
arch = x86_64
arch = i686
@@ -11,7 +11,8 @@ pkgbase = linx-client
makedepends = git
makedepends = mercurial
source = https://github.com/andreimarcu/linx-client/archive/v1.5.2.tar.gz
- sha256sums = 00b50f3c50aca19726ab204f9469adf252f7a8c011eed39e4bf3f2952f3d6ddd
+ source = golinx-mod-import.patch
+ sha512sums = 84c678aa10946200cf91e0f70d925321959bf060961dd98d091c2fb004b180edcb1bb0cd4b1e7297d0268193be487b828b71eafdbb186003ec10832800ae2974
+ sha512sums = 71656633e0ce8564a2405299f53b128e0447343d80824d7d9c690bb98786d08cf0e990e8f4aa88b72bfa74c5c1bf4978d47c15ed20b2f2550b4b8906afa96755
pkgname = linx-client
-
diff --git a/PKGBUILD b/PKGBUILD
index 44e4fbf48e27..ee4b8383976d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,30 @@
# Maintainer: Steven Spangler <132ikl@gmail.com>
-# Maintainer: Vyacheslav Konovalov <vyachkonovalov@protonmail.com>
+# Maintainer: Vyacheslav Konovalov <🦀vk@protonmail.com>
pkgname=linx-client
pkgver=1.5.2
-pkgrel=1
+pkgrel=2
pkgdesc='Simple client for linx-server'
arch=('x86_64' 'i686' 'arm')
url='https://github.com/andreimarcu/linx-client'
license=('GPLv3')
makedepends=('go' 'git' 'mercurial')
-source=("https://github.com/andreimarcu/linx-client/archive/v$pkgver.tar.gz")
-sha256sums=('00b50f3c50aca19726ab204f9469adf252f7a8c011eed39e4bf3f2952f3d6ddd')
+source=(
+ "https://github.com/andreimarcu/linx-client/archive/v$pkgver.tar.gz"
+ 'golinx-mod-import.patch'
+)
+sha512sums=(
+ '84c678aa10946200cf91e0f70d925321959bf060961dd98d091c2fb004b180edcb1bb0cd4b1e7297d0268193be487b828b71eafdbb186003ec10832800ae2974'
+ '71656633e0ce8564a2405299f53b128e0447343d80824d7d9c690bb98786d08cf0e990e8f4aa88b72bfa74c5c1bf4978d47c15ed20b2f2550b4b8906afa96755'
+)
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p0 < "$srcdir/golinx-mod-import.patch"
+
+ GOPATH=$PWD/go go mod init "${url#https://}"
+ GOPATH=$PWD/go go mod tidy -v -e -go 1.16
+}
build() {
case $CARCH in
@@ -20,9 +34,20 @@ build() {
esac
cd $pkgname-$pkgver
- GOPATH=$PWD/go
- GOBIN=$GOPATH/bin go get
- GOOS=linux GOARCH=$go_arch go build -o $pkgname
+
+ CGO_CPPFLAGS="${CPPFLAGS}" \
+ CGO_CFLAGS="${CFLAGS}" \
+ CGO_CXXFLAGS="${CXXFLAGS}" \
+ CGO_LDFLAGS="${LDFLAGS}" \
+ GOPATH="$PWD/go" \
+ GOARCH="$go_arch" \
+ GOOS=linux go build \
+ -trimpath \
+ -buildmode=pie \
+ -mod=readonly \
+ -modcacherw \
+ -ldflags "-linkmode external -extldflags \"${LDFLAGS}\"" \
+ -o $pkgname
}
package() {
diff --git a/golinx-mod-import.patch b/golinx-mod-import.patch
new file mode 100644
index 000000000000..43b5cbbff918
--- /dev/null
+++ b/golinx-mod-import.patch
@@ -0,0 +1,11 @@
+--- linx.go.orig 2022-10-13 16:29:32.187844000 +0300
++++ linx.go 2022-10-13 16:29:54.216305611 +0300
+@@ -19,7 +19,7 @@
+
+ "github.com/timshannon/config"
+ "github.com/atotto/clipboard"
+- "mutantmonkey.in/code/golinx/progress"
++ "github.com/mutantmonkey/golinx/progress"
+ )
+
+ type RespOkJSON struct {