From: nuckle <nuckle@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: nekoray 3.26
Date: Mon, 19 Feb 2024 20:54:44 +0100 [thread overview]
Message-ID: <20240219195444.616A82BAC4@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48831@inbox.vuxu.org>
[-- 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
+}
next prev parent reply other threads:[~2024-02-19 19:54 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` nuckle [this message]
2024-02-19 19:55 ` [PR PATCH] [Updated] " 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
2024-05-29 1:49 ` github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240219195444.616A82BAC4@inbox.vuxu.org \
--to=nuckle@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).