* [PR PATCH] Nekoray
@ 2024-02-19 10:26 nuckle
2024-02-19 12:41 ` New package: nekoray 3.26 slymattz
` (21 more replies)
0 siblings, 22 replies; 23+ messages in thread
From: nuckle @ 2024-02-19 10:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]
There is a new pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
Nekoray
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 6340 bytes --]
From 778bdc1f8ebdbc95b1c8c0218030d4a86fe55159 Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/protobuf.patch | 11 +++++
srcpkgs/nekoray/template | 65 ++++++++++++++++++++++++++
3 files changed, 85 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 0000000000000..19414f8bc825a
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 0000000000000..ec68cd6537f7c
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/nekoray/cmake/myproto.cmake
++++ b/nekoray/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 0000000000000..1f00f32e36829
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,65 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+archs="x86_64 aarch64"
+build_style=cmake
+configure_args="-DQT_VERSION_MAJOR=6 -DNKR_PACKAGE=ON"
+hostmakedepends="cmake ninja go git protobuf"
+makedepends="qt6-tools qt6-base-devel qt6-svg-devel
+ protobuf-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="Qt based cross-platform GUI proxy configuration manager (v2ray/sing-box)"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+checksum=21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+build_wrksrc="${pkgname}"
+
+do_fetch() {
+ git clone \
+ --branch ${version} \
+ https://github.com/MatsuriDayo/${pkgname}.git ${wrksrc}/${pkgname}
+ ls -l
+ cd ${wrksrc}/${pkgname}
+ git submodule init
+ git submodule update
+}
+
+do_extract() {
+ : # submodule not in tarball
+}
+
+do_build() {
+ case "$XBPS_TARGET_MACHINE" in
+ x86_64) ARCH='amd64' ;;
+ aarch64) ARCH='arm64' ;;
+ esac
+
+ cd ${wrksrc}/${pkgname}
+ bash libs/get_source.sh
+ cd build
+ cmake -GNinja ${configure_args} ..
+ ninja
+ cd ${wrksrc}/${pkgname}
+ GOOS=linux GOARCH=${ARCH} ./libs/build_go.sh
+}
+
+do_clean() {
+ go clean -modcache
+}
+
+do_install() {
+ vmkdir usr/lib/nekoray
+ vcopy ${wrksrc}/${pkgname}/deployment/linux*/nekobox_core usr/lib/nekoray
+ vcopy ${wrksrc}/${pkgname}/deployment/linux*/nekoray_core usr/lib/nekoray
+
+ vmkdir usr/bin
+ vcopy ${wrksrc}/${pkgname}/build/nekoray usr/lib/nekoray
+ ln -sf /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin/
+
+ vinstall ${wrksrc}/${pkgname}/res/public/nekoray.png 644 usr/share/pixmaps
+ vinstall ${wrksrc}/${pkgname}/res/public/nekobox.png 644 usr/share/pixmaps
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+}
From 32cfce6fe7a757bca9025015ecda5914bcb0598e Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 0000000000000..031e76f1bd96d
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,26 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=meta
+hostmakedepends="go"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+do_build() {
+ cd ${wrksrc}
+ NO_SKIP=true go run -modcacherw -v .
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy ${wrksrc}/rule-set/* usr/share/sing-geoip/rule-set
+ vcopy ${wrksrc}/*.db usr/share/sing-geoip
+}
From 2930a69aa1d7d14e67cda48eec777d4383da761e Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:52 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 0000000000000..3c45ffb5367e8
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,26 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+version=20240217140518
+revision=1
+build_style=meta
+hostmakedepends="go"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+do_build() {
+ cd ${wrksrc}
+ NO_SKIP=true go run -modcacherw -v .
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy ${wrksrc}/rule-set/* usr/share/sing-geosite/rule-set
+ vcopy ${wrksrc}/*.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
@ 2024-02-19 12:41 ` slymattz
2024-02-19 13:31 ` nuckle
` (20 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: slymattz @ 2024-02-19 12:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/48831#issuecomment-1952370130
Comment:
As far as I know, you should insert distfiles before checksum and remove do_fetch (from what I've learned git clone in do_fetch is not the right way to do it in Void):
`distfiles="https://github.com/MatsuriDayo/nekoray/archive/refs/tags/${version}.tar.gz"`
Oh, and remember to update the sha256sum checksum.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
2024-02-19 12:41 ` New package: nekoray 3.26 slymattz
@ 2024-02-19 13:31 ` nuckle
2024-02-19 13:33 ` nuckle
` (19 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-19 13:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1366 bytes --]
New comment by nuckle on void-packages repository
https://github.com/void-linux/void-packages/pull/48831#issuecomment-1952461860
Comment:
> As far as I know, you should insert distfiles before checksum and remove do_fetch (from what I've learned git clone in do_fetch is not the right way to do it in Void): `distfiles="https://github.com/MatsuriDayo/nekoray/archive/refs/tags/${version}.tar.gz"`
>
> Oh, and remember to update the sha256sum checksum.
Yes, I checked the order with `xlint`. I tried to create this template without dealing with `do_fetch`, but the issue is that `.tar` doesn't contain any files for 3d party repositories and there's no git repository inside of it. You can't compile nekoray without those repositories, so you have to use something like this
```
git clone https://github.com/MatsuriDayo/nekoray.git --recursive
```
or this
```
git clone \
--branch ${version} \
https://github.com/MatsuriDayo/${pkgname}.git ${wrksrc}/${pkgname}
cd ${wrksrc}/${pkgname}
git submodule init
git submodule update
```
to get them. Also there's an issue with database packages. I tried to use `build_style=go`, but looks like the binary is useless and the only way to make use of it is to run it directly with `go run -v .`, but I don't really know how to do it properly in Void's template format, so it's kind of a mess too
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
2024-02-19 12:41 ` New package: nekoray 3.26 slymattz
2024-02-19 13:31 ` nuckle
@ 2024-02-19 13:33 ` nuckle
2024-02-19 13:38 ` nuckle
` (18 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-19 13:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1367 bytes --]
New comment by nuckle on void-packages repository
https://github.com/void-linux/void-packages/pull/48831#issuecomment-1952461860
Comment:
> As far as I know, you should insert distfiles before checksum and remove do_fetch (from what I've learned git clone in do_fetch is not the right way to do it in Void): `distfiles="https://github.com/MatsuriDayo/nekoray/archive/refs/tags/${version}.tar.gz"`
>
> Oh, and remember to update the sha256sum checksum.
Yes, I checked the order with `xlint`. I tried to create this template without dealing with `do_fetch`, but the issue is that `.tar` doesn't contain any files for 3rd party repositories and there's no git repository inside of it. You can't compile nekoray without those repositories, so you have to use something like this
```
git clone https://github.com/MatsuriDayo/nekoray.git --recursive
```
or this
```
git clone \
--branch ${version} \
https://github.com/MatsuriDayo/${pkgname}.git ${wrksrc}/${pkgname}
cd ${wrksrc}/${pkgname}
git submodule init
git submodule update
```
to get them. Also there's an issue with database packages. I tried to use `build_style=go`, but looks like the binary is useless and the only way to make use of it is to run it directly with `go run -v .`, but I don't really know how to do it properly in Void's template format, so it's kind of a mess too
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (2 preceding siblings ...)
2024-02-19 13:33 ` nuckle
@ 2024-02-19 13:38 ` nuckle
2024-02-19 13:46 ` slymattz
` (17 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-19 13:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1365 bytes --]
New comment by nuckle on void-packages repository
https://github.com/void-linux/void-packages/pull/48831#issuecomment-1952461860
Comment:
> As far as I know, you should insert distfiles before checksum and remove do_fetch (from what I've learned git clone in do_fetch is not the right way to do it in Void): `distfiles="https://github.com/MatsuriDayo/nekoray/archive/refs/tags/${version}.tar.gz"`
>
> Oh, and remember to update the sha256sum checksum.
Yes, I checked the order with `xlint`. I tried to create this template without dealing with `do_fetch`, but the issue is that `.tar` doesn't contain any files for 3rd party dependencies and there's no git repository inside of it. You can't compile nekoray without those submodules, so you have to use something like this
```
git clone https://github.com/MatsuriDayo/nekoray.git --recursive
```
or this
```
git clone \
--branch ${version} \
https://github.com/MatsuriDayo/${pkgname}.git ${wrksrc}/${pkgname}
cd ${wrksrc}/${pkgname}
git submodule init
git submodule update
```
to get them. Also there's an issue with database packages. I tried to use `build_style=go`, but looks like the binary is useless and the only way to make use of it is to run it directly with `go run -v .`, but I don't really know how to do it properly in Void's template format, so it's kind of a mess too
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (3 preceding siblings ...)
2024-02-19 13:38 ` nuckle
@ 2024-02-19 13:46 ` slymattz
2024-02-19 13:48 ` slymattz
` (16 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: slymattz @ 2024-02-19 13:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/48831#issuecomment-1952488279
Comment:
In this case, maybe somebody more knowledgeable will inspect your code and be able to help you with this multi-faceted problem.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (4 preceding siblings ...)
2024-02-19 13:46 ` slymattz
@ 2024-02-19 13:48 ` slymattz
2024-02-19 13:49 ` chrysos349
` (15 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: slymattz @ 2024-02-19 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/48831#issuecomment-1952488279
Comment:
In this case, maybe somebody more knowledgeable than myself will inspect your code and be able to help you with this multi-faceted problem.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (5 preceding siblings ...)
2024-02-19 13:48 ` slymattz
@ 2024-02-19 13:49 ` chrysos349
2024-02-19 13:58 ` chrysos349
` (14 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: chrysos349 @ 2024-02-19 13:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1814 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48831#issuecomment-1952493788
Comment:
``` bash
# Template file for 'nekoray'
pkgname=nekoray
version=3.26
revision=1
build_style=cmake
archs="aarch64* x86_64*"
configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
hostmakedepends="git go protobuf qt6-base qt6-tools"
makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
maintainer="chrysos349 <chrysostom349@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://matsuridayo.github.io"
changelog="https://github.com/MatsuriDayo/nekoray/releases"
_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
. $XBPS_COMMONDIR/environment/build-style/go.sh
export GOOS=linux
post_extract() {
mv nekoray-*/* .
mv QHotkey-*/* 3rdparty/QHotkey
mv qjs-*/* 3rdparty/qjs
}
post_build() {
./libs/get_source.sh
./libs/build_go.sh
}
do_install() {
vinstall build/nekoray 755 usr/lib/nekoray
vcopy deployment/linux*/neko* usr/lib/nekoray
vmkdir usr/share/pixmaps
vcopy res/public/neko* usr/share/pixmaps
vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
vmkdir usr/bin
ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
}
```
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (6 preceding siblings ...)
2024-02-19 13:49 ` chrysos349
@ 2024-02-19 13:58 ` chrysos349
2024-02-19 14:29 ` nuckle
` (13 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: chrysos349 @ 2024-02-19 13:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48831#issuecomment-1952510198
Comment:
you could also add 32-bit archs support via the patch below. i didn't encounter any cross-compilation errors. i can't guarantee there won't be any runtime errors, though. if you decide to use the patch, remove `archs=` in the template.
`add-32bit-archs.patch`
``` bash
--- a/libs/build_go.sh
+++ b/libs/build_go.sh
@@ -5,7 +5,9 @@ source libs/env_deploy.sh
[ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
[ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
[ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
+[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
+[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
[ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
[ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
if [ -z $DEST ]; then
```
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (7 preceding siblings ...)
2024-02-19 13:58 ` chrysos349
@ 2024-02-19 14:29 ` nuckle
2024-02-19 19:54 ` [PR PATCH] [Updated] " nuckle
` (12 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-19 14:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2224 bytes --]
New comment by nuckle on void-packages repository
https://github.com/void-linux/void-packages/pull/48831#issuecomment-1952566525
Comment:
> ```shell
> # Template file for 'nekoray'
> pkgname=nekoray
> version=3.26
> revision=1
> build_style=cmake
> archs="aarch64* x86_64*"
> configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
> hostmakedepends="git go protobuf qt6-base qt6-tools"
> makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
> short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
> maintainer="chrysos349 <chrysostom349@gmail.com>"
> license="GPL-3.0-or-later"
> homepage="https://matsuridayo.github.io"
> changelog="https://github.com/MatsuriDayo/nekoray/releases"
> _qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
> _qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
> distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
> https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
> https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
> checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
> e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
> 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
>
> . $XBPS_COMMONDIR/environment/build-style/go.sh
> export GOOS=linux
>
> post_extract() {
> mv nekoray-*/* .
> mv QHotkey-*/* 3rdparty/QHotkey
> mv qjs-*/* 3rdparty/qjs
> }
>
> post_build() {
> ./libs/get_source.sh
> ./libs/build_go.sh
> }
>
> do_install() {
> vinstall build/nekoray 755 usr/lib/nekoray
> vcopy deployment/linux*/neko* usr/lib/nekoray
>
> vmkdir usr/share/pixmaps
> vcopy res/public/neko* usr/share/pixmaps
>
> vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
>
> vmkdir usr/bin
> ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
> }
> ```
Looks great and compiles without errors. The only remain part is `.db` files. As for 32 bits patch, I don't know if it'll work or not, since the maintainer clearly doesn't support it (at least oficially), but maybe someone who uses i386 could try this patch
https://github.com/MatsuriDayo/nekoray/issues/8
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (8 preceding siblings ...)
2024-02-19 14:29 ` nuckle
@ 2024-02-19 19:54 ` nuckle
2024-02-19 19:55 ` nuckle
` (11 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-19 19:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 4959 bytes --]
From 778bdc1f8ebdbc95b1c8c0218030d4a86fe55159 Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/2] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/protobuf.patch | 11 +++++
srcpkgs/nekoray/template | 65 ++++++++++++++++++++++++++
3 files changed, 85 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 00000000000000..19414f8bc825a4
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 00000000000000..ec68cd6537f7cf
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/nekoray/cmake/myproto.cmake
++++ b/nekoray/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 00000000000000..1f00f32e368290
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,65 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+archs="x86_64 aarch64"
+build_style=cmake
+configure_args="-DQT_VERSION_MAJOR=6 -DNKR_PACKAGE=ON"
+hostmakedepends="cmake ninja go git protobuf"
+makedepends="qt6-tools qt6-base-devel qt6-svg-devel
+ protobuf-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="Qt based cross-platform GUI proxy configuration manager (v2ray/sing-box)"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+checksum=21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+build_wrksrc="${pkgname}"
+
+do_fetch() {
+ git clone \
+ --branch ${version} \
+ https://github.com/MatsuriDayo/${pkgname}.git ${wrksrc}/${pkgname}
+ ls -l
+ cd ${wrksrc}/${pkgname}
+ git submodule init
+ git submodule update
+}
+
+do_extract() {
+ : # submodule not in tarball
+}
+
+do_build() {
+ case "$XBPS_TARGET_MACHINE" in
+ x86_64) ARCH='amd64' ;;
+ aarch64) ARCH='arm64' ;;
+ esac
+
+ cd ${wrksrc}/${pkgname}
+ bash libs/get_source.sh
+ cd build
+ cmake -GNinja ${configure_args} ..
+ ninja
+ cd ${wrksrc}/${pkgname}
+ GOOS=linux GOARCH=${ARCH} ./libs/build_go.sh
+}
+
+do_clean() {
+ go clean -modcache
+}
+
+do_install() {
+ vmkdir usr/lib/nekoray
+ vcopy ${wrksrc}/${pkgname}/deployment/linux*/nekobox_core usr/lib/nekoray
+ vcopy ${wrksrc}/${pkgname}/deployment/linux*/nekoray_core usr/lib/nekoray
+
+ vmkdir usr/bin
+ vcopy ${wrksrc}/${pkgname}/build/nekoray usr/lib/nekoray
+ ln -sf /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin/
+
+ vinstall ${wrksrc}/${pkgname}/res/public/nekoray.png 644 usr/share/pixmaps
+ vinstall ${wrksrc}/${pkgname}/res/public/nekobox.png 644 usr/share/pixmaps
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+}
From 32cfce6fe7a757bca9025015ecda5914bcb0598e Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/2] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 00000000000000..031e76f1bd96d2
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,26 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=meta
+hostmakedepends="go"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+do_build() {
+ cd ${wrksrc}
+ NO_SKIP=true go run -modcacherw -v .
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy ${wrksrc}/rule-set/* usr/share/sing-geoip/rule-set
+ vcopy ${wrksrc}/*.db usr/share/sing-geoip
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (9 preceding siblings ...)
2024-02-19 19:54 ` [PR PATCH] [Updated] " nuckle
@ 2024-02-19 19:55 ` nuckle
2024-02-19 21:34 ` nuckle
` (10 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-19 19:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 10272 bytes --]
From 778bdc1f8ebdbc95b1c8c0218030d4a86fe55159 Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/2] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/protobuf.patch | 11 +++++
srcpkgs/nekoray/template | 65 ++++++++++++++++++++++++++
3 files changed, 85 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 0000000000000..19414f8bc825a
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 0000000000000..ec68cd6537f7c
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/nekoray/cmake/myproto.cmake
++++ b/nekoray/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 0000000000000..1f00f32e36829
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,65 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+archs="x86_64 aarch64"
+build_style=cmake
+configure_args="-DQT_VERSION_MAJOR=6 -DNKR_PACKAGE=ON"
+hostmakedepends="cmake ninja go git protobuf"
+makedepends="qt6-tools qt6-base-devel qt6-svg-devel
+ protobuf-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="Qt based cross-platform GUI proxy configuration manager (v2ray/sing-box)"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+checksum=21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+build_wrksrc="${pkgname}"
+
+do_fetch() {
+ git clone \
+ --branch ${version} \
+ https://github.com/MatsuriDayo/${pkgname}.git ${wrksrc}/${pkgname}
+ ls -l
+ cd ${wrksrc}/${pkgname}
+ git submodule init
+ git submodule update
+}
+
+do_extract() {
+ : # submodule not in tarball
+}
+
+do_build() {
+ case "$XBPS_TARGET_MACHINE" in
+ x86_64) ARCH='amd64' ;;
+ aarch64) ARCH='arm64' ;;
+ esac
+
+ cd ${wrksrc}/${pkgname}
+ bash libs/get_source.sh
+ cd build
+ cmake -GNinja ${configure_args} ..
+ ninja
+ cd ${wrksrc}/${pkgname}
+ GOOS=linux GOARCH=${ARCH} ./libs/build_go.sh
+}
+
+do_clean() {
+ go clean -modcache
+}
+
+do_install() {
+ vmkdir usr/lib/nekoray
+ vcopy ${wrksrc}/${pkgname}/deployment/linux*/nekobox_core usr/lib/nekoray
+ vcopy ${wrksrc}/${pkgname}/deployment/linux*/nekoray_core usr/lib/nekoray
+
+ vmkdir usr/bin
+ vcopy ${wrksrc}/${pkgname}/build/nekoray usr/lib/nekoray
+ ln -sf /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin/
+
+ vinstall ${wrksrc}/${pkgname}/res/public/nekoray.png 644 usr/share/pixmaps
+ vinstall ${wrksrc}/${pkgname}/res/public/nekobox.png 644 usr/share/pixmaps
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+}
From f3f42ddaabb32177d44cbdad7f887d7c5dced0b0 Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/2] New package: sing-geoip-20240212
Update template
---
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++
srcpkgs/nekoray/patches/protobuf.patch | 4 +-
srcpkgs/nekoray/template | 83 ++++++++-----------
srcpkgs/sing-geoip/template | 26 ++++++
4 files changed, 74 insertions(+), 51 deletions(-)
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 0000000000000..630df0fdbfcd7
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
index ec68cd6537f7c..b00f0d3b3ee21 100644
--- a/srcpkgs/nekoray/patches/protobuf.patch
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -1,6 +1,6 @@
Makes cmake compatible with Void's version of Protobuf
---- a/nekoray/cmake/myproto.cmake
-+++ b/nekoray/cmake/myproto.cmake
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
@@ -1,4 +1,6 @@
-find_package(Protobuf CONFIG REQUIRED)
+include(FindProtobuf)
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
index 1f00f32e36829..6ad933ffe22c1 100644
--- a/srcpkgs/nekoray/template
+++ b/srcpkgs/nekoray/template
@@ -2,64 +2,49 @@
pkgname=nekoray
version=3.26
revision=1
-archs="x86_64 aarch64"
+# archs="aarch64* x86_64*"
build_style=cmake
-configure_args="-DQT_VERSION_MAJOR=6 -DNKR_PACKAGE=ON"
-hostmakedepends="cmake ninja go git protobuf"
-makedepends="qt6-tools qt6-base-devel qt6-svg-devel
- protobuf-devel yaml-cpp-devel zxing-cpp-devel"
-depends="sing-geoip sing-geosite"
-short_desc="Qt based cross-platform GUI proxy configuration manager (v2ray/sing-box)"
-maintainer="Nuckle <coil@itscat.org>"
-license="GPL-3.0-or-later, LGPL-3.0-or-later"
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+# depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
homepage="https://matsuridayo.github.io"
changelog="https://github.com/MatsuriDayo/nekoray/releases"
-checksum=21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
-build_wrksrc="${pkgname}"
-
-do_fetch() {
- git clone \
- --branch ${version} \
- https://github.com/MatsuriDayo/${pkgname}.git ${wrksrc}/${pkgname}
- ls -l
- cd ${wrksrc}/${pkgname}
- git submodule init
- git submodule update
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
}
-do_extract() {
- : # submodule not in tarball
-}
-
-do_build() {
- case "$XBPS_TARGET_MACHINE" in
- x86_64) ARCH='amd64' ;;
- aarch64) ARCH='arm64' ;;
- esac
-
- cd ${wrksrc}/${pkgname}
- bash libs/get_source.sh
- cd build
- cmake -GNinja ${configure_args} ..
- ninja
- cd ${wrksrc}/${pkgname}
- GOOS=linux GOARCH=${ARCH} ./libs/build_go.sh
-}
-
-do_clean() {
- go clean -modcache
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
}
do_install() {
- vmkdir usr/lib/nekoray
- vcopy ${wrksrc}/${pkgname}/deployment/linux*/nekobox_core usr/lib/nekoray
- vcopy ${wrksrc}/${pkgname}/deployment/linux*/nekoray_core usr/lib/nekoray
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
- vmkdir usr/bin
- vcopy ${wrksrc}/${pkgname}/build/nekoray usr/lib/nekoray
- ln -sf /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin/
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
- vinstall ${wrksrc}/${pkgname}/res/public/nekoray.png 644 usr/share/pixmaps
- vinstall ${wrksrc}/${pkgname}/res/public/nekobox.png 644 usr/share/pixmaps
vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
}
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 0000000000000..031e76f1bd96d
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,26 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=meta
+hostmakedepends="go"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+do_build() {
+ cd ${wrksrc}
+ NO_SKIP=true go run -modcacherw -v .
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy ${wrksrc}/rule-set/* usr/share/sing-geoip/rule-set
+ vcopy ${wrksrc}/*.db usr/share/sing-geoip
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (10 preceding siblings ...)
2024-02-19 19:55 ` nuckle
@ 2024-02-19 21:34 ` nuckle
2024-02-19 22:30 ` nuckle
` (9 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-19 21:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 7371 bytes --]
From a030f307fb86118c7f367b9b5431890ab450b94f Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++++
srcpkgs/nekoray/patches/protobuf.patch | 11 ++++
srcpkgs/nekoray/template | 50 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 0000000000000..19414f8bc825a
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 0000000000000..630df0fdbfcd7
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 0000000000000..b00f0d3b3ee21
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 0000000000000..6ad933ffe22c1
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,50 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+# archs="aarch64* x86_64*"
+build_style=cmake
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+# depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
+}
+
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
+}
+
+do_install() {
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
+
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
+
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
+}
From 495d6c5291024ae2698263e6a3fece1a1fba0ac7 Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 0000000000000..031e76f1bd96d
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,26 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=meta
+hostmakedepends="go"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+do_build() {
+ cd ${wrksrc}
+ NO_SKIP=true go run -modcacherw -v .
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy ${wrksrc}/rule-set/* usr/share/sing-geoip/rule-set
+ vcopy ${wrksrc}/*.db usr/share/sing-geoip
+}
From ea808612a0c9e14e0fb906c5e69b23ec5aee2fd3 Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Tue, 20 Feb 2024 00:33:17 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 0000000000000..3c45ffb5367e8
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,26 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+version=20240217140518
+revision=1
+build_style=meta
+hostmakedepends="go"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+do_build() {
+ cd ${wrksrc}
+ NO_SKIP=true go run -modcacherw -v .
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy ${wrksrc}/rule-set/* usr/share/sing-geosite/rule-set
+ vcopy ${wrksrc}/*.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (11 preceding siblings ...)
2024-02-19 21:34 ` nuckle
@ 2024-02-19 22:30 ` nuckle
2024-02-20 7:08 ` nuckle
` (8 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-19 22:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 7469 bytes --]
From ad28541735a38dcaef18921c36ff415a6fc0306a Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++++
srcpkgs/nekoray/patches/protobuf.patch | 11 ++++
srcpkgs/nekoray/template | 50 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 00000000000000..19414f8bc825a4
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 00000000000000..630df0fdbfcd7f
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 00000000000000..b00f0d3b3ee211
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 00000000000000..5fa8e95a8ddcc0
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,50 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+# archs="aarch64* x86_64*"
+build_style=cmake
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
+}
+
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
+}
+
+do_install() {
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
+
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
+
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
+}
From 3e65de635269b1ffa5c098ce60436cdfa7be46bc Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 00000000000000..888a45ff128d27
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,29 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=go
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+pre_build() {
+ export GOPATH=$wrksrc/build
+}
+
+post_build() {
+ NO_SKIP=true build/bin/sing-geoip
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy rule-set/* usr/share/sing-geoip/rule-set
+ vcopy *.db usr/share/sing-geoip
+}
From 34731120cea2250b2493226e1243f7ede240f07b Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Tue, 20 Feb 2024 00:33:17 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 00000000000000..1ac568b016749d
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,29 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+version=20240217140518
+revision=1
+build_style=go
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+pre_build() {
+ export GOPATH=$wrksrc/build
+}
+
+post_build() {
+ NO_SKIP=true build/bin/sing-geosite
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy rule-set/* usr/share/sing-geosite/rule-set
+ vcopy *.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (12 preceding siblings ...)
2024-02-19 22:30 ` nuckle
@ 2024-02-20 7:08 ` nuckle
2024-02-20 7:25 ` [PR REVIEW] " chrysos349
` (7 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-20 7:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 7543 bytes --]
From ad28541735a38dcaef18921c36ff415a6fc0306a Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++++
srcpkgs/nekoray/patches/protobuf.patch | 11 ++++
srcpkgs/nekoray/template | 50 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 00000000000000..19414f8bc825a4
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 00000000000000..630df0fdbfcd7f
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 00000000000000..b00f0d3b3ee211
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 00000000000000..5fa8e95a8ddcc0
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,50 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+# archs="aarch64* x86_64*"
+build_style=cmake
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
+}
+
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
+}
+
+do_install() {
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
+
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
+
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
+}
From 663a1b63a152f2aff55ae843b57cfacdfd4f21ac Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 00000000000000..bedc11eee75071
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,29 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=go
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy rule-set/* usr/share/sing-geoip/rule-set
+ vcopy *.db usr/share/sing-geoip
+}
From 01c5e118b6161ad953a263603c3a01cc4ef762cd Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Tue, 20 Feb 2024 00:33:17 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 00000000000000..fa099e0956fca5
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,29 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+version=20240217140518
+revision=1
+build_style=go
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy rule-set/* usr/share/sing-geosite/rule-set
+ vcopy *.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (13 preceding siblings ...)
2024-02-20 7:08 ` nuckle
@ 2024-02-20 7:25 ` chrysos349
2024-02-20 7:34 ` [PR PATCH] [Updated] " nuckle
` (6 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: chrysos349 @ 2024-02-20 7:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New review comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48831#discussion_r1495346527
Comment:
please put yourself as a maintainer of the template.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (14 preceding siblings ...)
2024-02-20 7:25 ` [PR REVIEW] " chrysos349
@ 2024-02-20 7:34 ` nuckle
2024-02-20 8:11 ` nuckle
` (5 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-20 7:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 7593 bytes --]
From ad28541735a38dcaef18921c36ff415a6fc0306a Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++++
srcpkgs/nekoray/patches/protobuf.patch | 11 ++++
srcpkgs/nekoray/template | 50 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 0000000000000..19414f8bc825a
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 0000000000000..630df0fdbfcd7
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 0000000000000..b00f0d3b3ee21
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 0000000000000..5fa8e95a8ddcc
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,50 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+# archs="aarch64* x86_64*"
+build_style=cmake
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="chrysos349 <chrysostom349@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
+}
+
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
+}
+
+do_install() {
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
+
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
+
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
+}
From e385dc28c51a637ab649e7ca91b7f7aca24a1f3d Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 0000000000000..98d32cab89d36
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,30 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy rule-set/* usr/share/sing-geoip/rule-set
+ vcopy *.db usr/share/sing-geoip
+}
From c7ad8ac554a9fc74ac17756c59ec437b18e42e4a Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Tue, 20 Feb 2024 00:33:17 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 0000000000000..57d5b42cfe8f4
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,30 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+version=20240217140518
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy rule-set/* usr/share/sing-geosite/rule-set
+ vcopy *.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (15 preceding siblings ...)
2024-02-20 7:34 ` [PR PATCH] [Updated] " nuckle
@ 2024-02-20 8:11 ` nuckle
2024-02-20 8:15 ` nuckle
` (4 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-20 8:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 7631 bytes --]
From bdb4b9f8213c5f40b43e065a5486ec765419fe1e Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++++
srcpkgs/nekoray/patches/protobuf.patch | 11 ++++
srcpkgs/nekoray/template | 50 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 0000000000000..19414f8bc825a
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 0000000000000..630df0fdbfcd7
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 0000000000000..b00f0d3b3ee21
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 0000000000000..eb04cc60fc133
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,50 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+# archs="aarch64* x86_64*"
+build_style=cmake
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
+}
+
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
+}
+
+do_install() {
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
+
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
+
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
+}
From 8deaff0bd8e9854d169ed77b1bd82e87a700928f Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 0000000000000..98d32cab89d36
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,30 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy rule-set/* usr/share/sing-geoip/rule-set
+ vcopy *.db usr/share/sing-geoip
+}
From d585d9064bb08083bdff4c3b3634bca329cf20de Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Tue, 20 Feb 2024 00:33:17 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 0000000000000..7cd84a7accbc6
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,31 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+reverts=20240217140518_1 # Not an actual revert
+version=20240217140518
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy rule-set/* usr/share/sing-geosite/rule-set
+ vcopy *.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (16 preceding siblings ...)
2024-02-20 8:11 ` nuckle
@ 2024-02-20 8:15 ` nuckle
2024-02-20 8:20 ` nuckle
` (3 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-20 8:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 7643 bytes --]
From bdb4b9f8213c5f40b43e065a5486ec765419fe1e Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++++
srcpkgs/nekoray/patches/protobuf.patch | 11 ++++
srcpkgs/nekoray/template | 50 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 00000000000000..19414f8bc825a4
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 00000000000000..630df0fdbfcd7f
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 00000000000000..b00f0d3b3ee211
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 00000000000000..eb04cc60fc1336
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,50 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+# archs="aarch64* x86_64*"
+build_style=cmake
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
+}
+
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
+}
+
+do_install() {
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
+
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
+
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
+}
From 8deaff0bd8e9854d169ed77b1bd82e87a700928f Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 00000000000000..98d32cab89d369
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,30 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy rule-set/* usr/share/sing-geoip/rule-set
+ vcopy *.db usr/share/sing-geoip
+}
From 9e9ab1299137bd1e71fe927bc59e2abcb570d917 Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Tue, 20 Feb 2024 00:33:17 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 00000000000000..fc7a33f271c76e
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,31 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+reverts=20240215145143_1 # Not an actual revert
+version=20240217140518
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy rule-set/* usr/share/sing-geosite/rule-set
+ vcopy *.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (17 preceding siblings ...)
2024-02-20 8:15 ` nuckle
@ 2024-02-20 8:20 ` nuckle
2024-02-28 20:01 ` nuckle
` (2 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-20 8:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 7581 bytes --]
From bdb4b9f8213c5f40b43e065a5486ec765419fe1e Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++++
srcpkgs/nekoray/patches/protobuf.patch | 11 ++++
srcpkgs/nekoray/template | 50 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 0000000000000..19414f8bc825a
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 0000000000000..630df0fdbfcd7
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 0000000000000..b00f0d3b3ee21
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 0000000000000..eb04cc60fc133
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,50 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+# archs="aarch64* x86_64*"
+build_style=cmake
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
+}
+
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
+}
+
+do_install() {
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
+
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
+
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
+}
From 8deaff0bd8e9854d169ed77b1bd82e87a700928f Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 0000000000000..98d32cab89d36
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,30 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy rule-set/* usr/share/sing-geoip/rule-set
+ vcopy *.db usr/share/sing-geoip
+}
From f865c8a215ab6928ccf74b55d2b08188bdbc4dbf Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Tue, 20 Feb 2024 00:33:17 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 0000000000000..57d5b42cfe8f4
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,30 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+version=20240217140518
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy rule-set/* usr/share/sing-geosite/rule-set
+ vcopy *.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (18 preceding siblings ...)
2024-02-20 8:20 ` nuckle
@ 2024-02-28 20:01 ` nuckle
2024-02-28 20:04 ` nuckle
2024-02-28 20:11 ` nuckle
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-28 20:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 7620 bytes --]
From bdb4b9f8213c5f40b43e065a5486ec765419fe1e Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++++
srcpkgs/nekoray/patches/protobuf.patch | 11 ++++
srcpkgs/nekoray/template | 50 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 00000000000000..19414f8bc825a4
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 00000000000000..630df0fdbfcd7f
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 00000000000000..b00f0d3b3ee211
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 00000000000000..eb04cc60fc1336
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,50 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+# archs="aarch64* x86_64*"
+build_style=cmake
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
+}
+
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
+}
+
+do_install() {
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
+
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
+
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
+}
From 8deaff0bd8e9854d169ed77b1bd82e87a700928f Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 00000000000000..98d32cab89d369
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,30 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy rule-set/* usr/share/sing-geoip/rule-set
+ vcopy *.db usr/share/sing-geoip
+}
From e01eec5478c4cd6a0b17596950a3bee7399c4bea Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Tue, 20 Feb 2024 00:33:17 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 00000000000000..fa4d121dfd8c4f
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,31 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+reverts=20240217140518_1
+version=20240217140518
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy rule-set/* usr/share/sing-geosite/rule-set
+ vcopy *.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (19 preceding siblings ...)
2024-02-28 20:01 ` nuckle
@ 2024-02-28 20:04 ` nuckle
2024-02-28 20:11 ` nuckle
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-28 20:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 7622 bytes --]
From bdb4b9f8213c5f40b43e065a5486ec765419fe1e Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++++
srcpkgs/nekoray/patches/protobuf.patch | 11 ++++
srcpkgs/nekoray/template | 50 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 00000000000000..19414f8bc825a4
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 00000000000000..630df0fdbfcd7f
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 00000000000000..b00f0d3b3ee211
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 00000000000000..eb04cc60fc1336
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,50 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+# archs="aarch64* x86_64*"
+build_style=cmake
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
+}
+
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
+}
+
+do_install() {
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
+
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
+
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
+}
From 8deaff0bd8e9854d169ed77b1bd82e87a700928f Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 00000000000000..98d32cab89d369
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,30 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy rule-set/* usr/share/sing-geoip/rule-set
+ vcopy *.db usr/share/sing-geoip
+}
From 99f9b647f5e88377fec66da47ce3b17072085278 Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Tue, 20 Feb 2024 00:33:17 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 00000000000000..25436b4077facb
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,31 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+reverts="20240217140518_1"
+version=20240217140518
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy rule-set/* usr/share/sing-geosite/rule-set
+ vcopy *.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] New package: nekoray 3.26
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
` (20 preceding siblings ...)
2024-02-28 20:04 ` nuckle
@ 2024-02-28 20:11 ` nuckle
21 siblings, 0 replies; 23+ messages in thread
From: nuckle @ 2024-02-28 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There is an updated pull request by nuckle against master on the void-packages repository
https://github.com/nuckle/void-packages nekoray
https://github.com/void-linux/void-packages/pull/48831
New package: nekoray 3.26
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/48831.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nekoray-48831.patch --]
[-- Type: text/x-diff, Size: 7622 bytes --]
From bdb4b9f8213c5f40b43e065a5486ec765419fe1e Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:24:44 +0300
Subject: [PATCH 1/3] New package: nekoray-3.26
---
srcpkgs/nekoray/files/nekoray.desktop | 9 ++++
srcpkgs/nekoray/patches/add-32bit-archs.patch | 12 +++++
srcpkgs/nekoray/patches/protobuf.patch | 11 ++++
srcpkgs/nekoray/template | 50 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100644 srcpkgs/nekoray/files/nekoray.desktop
create mode 100644 srcpkgs/nekoray/patches/add-32bit-archs.patch
create mode 100644 srcpkgs/nekoray/patches/protobuf.patch
create mode 100644 srcpkgs/nekoray/template
diff --git a/srcpkgs/nekoray/files/nekoray.desktop b/srcpkgs/nekoray/files/nekoray.desktop
new file mode 100644
index 00000000000000..19414f8bc825a4
--- /dev/null
+++ b/srcpkgs/nekoray/files/nekoray.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=NekoRay
+Comment=NekoRay
+Exec=nekoray
+Icon=nekoray
+Terminal=false
+StartupWMClass=NekoRay,nekoray,Nekoray,nekoRay
+Type=Application
+Categories=Network
diff --git a/srcpkgs/nekoray/patches/add-32bit-archs.patch b/srcpkgs/nekoray/patches/add-32bit-archs.patch
new file mode 100644
index 00000000000000..630df0fdbfcd7f
--- /dev/null
+++ b/srcpkgs/nekoray/patches/add-32bit-archs.patch
@@ -0,0 +1,12 @@
+--- a/libs/build_go.sh
++++ b/libs/build_go.sh
+@@ -5,7 +5,9 @@ source libs/env_deploy.sh
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/windows64 || true
+ [ "$GOOS" == "windows" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/windows-arm64 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/linux64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "386" ] && DEST=$DEPLOYMENT/linux32 || true
+ [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true
++[ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm" ] && DEST=$DEPLOYMENT/linux-arm || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true
+ [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true
+ if [ -z $DEST ]; then
diff --git a/srcpkgs/nekoray/patches/protobuf.patch b/srcpkgs/nekoray/patches/protobuf.patch
new file mode 100644
index 00000000000000..b00f0d3b3ee211
--- /dev/null
+++ b/srcpkgs/nekoray/patches/protobuf.patch
@@ -0,0 +1,11 @@
+Makes cmake compatible with Void's version of Protobuf
+--- a/cmake/myproto.cmake
++++ b/cmake/myproto.cmake
+@@ -1,4 +1,6 @@
+-find_package(Protobuf CONFIG REQUIRED)
++include(FindProtobuf)
++find_package(Protobuf REQUIRED)
++INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+ set(PROTO_FILES
+ go/grpc_server/gen/libcore.proto
diff --git a/srcpkgs/nekoray/template b/srcpkgs/nekoray/template
new file mode 100644
index 00000000000000..eb04cc60fc1336
--- /dev/null
+++ b/srcpkgs/nekoray/template
@@ -0,0 +1,50 @@
+# Template file for 'nekoray'
+pkgname=nekoray
+version=3.26
+revision=1
+# archs="aarch64* x86_64*"
+build_style=cmake
+configure_args="-DNKR_PACKAGE=ON -DQT_VERSION_MAJOR=6"
+hostmakedepends="git go protobuf qt6-base qt6-tools"
+makedepends="protobuf-devel qt6-svg-devel yaml-cpp-devel zxing-cpp-devel"
+depends="sing-geoip sing-geosite"
+short_desc="GUI proxy configuration manager (backend: v2ray / sing-box)"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later"
+homepage="https://matsuridayo.github.io"
+changelog="https://github.com/MatsuriDayo/nekoray/releases"
+_qho_commit=52e25acf221e5ac86ce648f6922620fb2d6a7121
+_qjs_commit=3fb0770c9ee5ab031a56072520641d4577b694e3
+distfiles="https://github.com/MatsuriDayo/nekoray/archive/${version}.tar.gz
+ https://github.com/Skycoder42/QHotkey/archive/${_qho_commit}.tar.gz
+ https://github.com/MatsuriDayo/qjs/archive/${_qjs_commit}.tar.gz"
+checksum="21977bc7f8e732b5e171a0f4e099050228815a3ca49582056060bff5023e5a20
+ e1d69ed7b718770be9b58de674ba59362a3227437071cf575f0481d921c414b5
+ 1cc5262c624d42644c2c0cce0fae9ea6fd258d37f2ac6a5096ab55f814ea2faa"
+
+. $XBPS_COMMONDIR/environment/build-style/go.sh
+export GOOS=linux
+
+post_extract() {
+ mv nekoray-*/* .
+ mv QHotkey-*/* 3rdparty/QHotkey
+ mv qjs-*/* 3rdparty/qjs
+}
+
+post_build() {
+ ./libs/get_source.sh
+ ./libs/build_go.sh
+}
+
+do_install() {
+ vinstall build/nekoray 755 usr/lib/nekoray
+ vcopy deployment/linux*/neko* usr/lib/nekoray
+
+ vmkdir usr/share/pixmaps
+ vcopy res/public/neko* usr/share/pixmaps
+
+ vinstall ${FILESDIR}/nekoray.desktop 644 usr/share/applications
+
+ vmkdir usr/bin
+ ln -s /usr/lib/nekoray/nekoray ${DESTDIR}/usr/bin
+}
From 8deaff0bd8e9854d169ed77b1bd82e87a700928f Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Mon, 19 Feb 2024 13:25:27 +0300
Subject: [PATCH 2/3] New package: sing-geoip-20240212
---
srcpkgs/sing-geoip/template | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/sing-geoip/template
diff --git a/srcpkgs/sing-geoip/template b/srcpkgs/sing-geoip/template
new file mode 100644
index 00000000000000..98d32cab89d369
--- /dev/null
+++ b/srcpkgs/sing-geoip/template
@@ -0,0 +1,30 @@
+# Template file for 'sing-geoip'
+pkgname=sing-geoip
+version=20240212
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geoip"
+short_desc="Geoip database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geoip"
+changelog="https://github.com/SagerNet/sing-geoip/releases"
+distfiles="https://github.com/SagerNet/sing-geoip/archive/refs/tags/${version}.tar.gz"
+checksum=9c45705de8bff9ac875a332e5b2dc26b5658414f2da75b69e7e306931e6c1308
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geoip
+ vmkdir usr/share/sing-geoip/rule-set
+
+ vcopy rule-set/* usr/share/sing-geoip/rule-set
+ vcopy *.db usr/share/sing-geoip
+}
From fc08e842dfa6216570df47ec9ed9b7693d85883e Mon Sep 17 00:00:00 2001
From: Nuckle <coil@itscat.org>
Date: Tue, 20 Feb 2024 00:33:17 +0300
Subject: [PATCH 3/3] New package: sing-geosite-20240217140518
---
srcpkgs/sing-geosite/template | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 srcpkgs/sing-geosite/template
diff --git a/srcpkgs/sing-geosite/template b/srcpkgs/sing-geosite/template
new file mode 100644
index 00000000000000..7256e5773564b0
--- /dev/null
+++ b/srcpkgs/sing-geosite/template
@@ -0,0 +1,31 @@
+# Template file for 'sing-geosite'
+pkgname=sing-geosite
+reverts="20240221053250_1"
+version=20240217140518
+revision=1
+build_style=go
+build_helper=qemu
+go_import_path="github.com/sagernet/sing-geosite"
+short_desc="Geosite database and rule sets for sing-box"
+maintainer="Nuckle <coil@itscat.org>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://github.com/SagerNet/sing-geosite"
+changelog="https://github.com/SagerNet/sing-geosite/releases"
+distfiles="https://github.com/SagerNet/sing-geosite/archive/refs/tags/${version}.tar.gz"
+checksum=44f065601e89918dd4746f5d18756de1bceea3ea1b309d6a05e6eaeeee476c59
+
+post_build() {
+ for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do
+ if [ -f "$f" ] && [ -x "$f" ]; then
+ NO_SKIP=true vtargetrun "$f"
+ fi
+ done
+}
+
+do_install() {
+ vmkdir usr/share/sing-geosite
+ vmkdir usr/share/sing-geosite/rule-set
+
+ vcopy rule-set/* usr/share/sing-geosite/rule-set
+ vcopy *.db usr/share/sing-geosite
+}
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2024-02-28 20:11 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-19 10:26 [PR PATCH] Nekoray nuckle
2024-02-19 12:41 ` New package: nekoray 3.26 slymattz
2024-02-19 13:31 ` nuckle
2024-02-19 13:33 ` nuckle
2024-02-19 13:38 ` nuckle
2024-02-19 13:46 ` slymattz
2024-02-19 13:48 ` slymattz
2024-02-19 13:49 ` chrysos349
2024-02-19 13:58 ` chrysos349
2024-02-19 14:29 ` nuckle
2024-02-19 19:54 ` [PR PATCH] [Updated] " nuckle
2024-02-19 19:55 ` nuckle
2024-02-19 21:34 ` nuckle
2024-02-19 22:30 ` nuckle
2024-02-20 7:08 ` nuckle
2024-02-20 7:25 ` [PR REVIEW] " chrysos349
2024-02-20 7:34 ` [PR PATCH] [Updated] " nuckle
2024-02-20 8:11 ` nuckle
2024-02-20 8:15 ` nuckle
2024-02-20 8:20 ` nuckle
2024-02-28 20:01 ` nuckle
2024-02-28 20:04 ` nuckle
2024-02-28 20:11 ` nuckle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).