Re: [PR PATCH] [Updated] New package: nekoray 3.26

[nuckle <nuckle@users.noreply.github.com>]

[-- 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
+}