From 68934e6b673f3aec2a22fea320bbd589e939499c Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 30 May 2025 10:33:09 -0400 Subject: [PATCH] ntfy: update to 2.12.0. --- srcpkgs/ntfy/patches/no_short_commit.patch | 13 ------------- srcpkgs/ntfy/template | 12 +++++++++--- 2 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/ntfy/patches/no_short_commit.patch diff --git a/srcpkgs/ntfy/patches/no_short_commit.patch b/srcpkgs/ntfy/patches/no_short_commit.patch deleted file mode 100644 index 27fe46e5838..00000000000 --- a/srcpkgs/ntfy/patches/no_short_commit.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/main.go b/main.go -index 5b1428d..2f7087a 100644 ---- a/main.go -+++ b/main.go -@@ -24,7 +24,7 @@ the Matrix room (https://matrix.to/#/#ntfy:matrix.org). - - ntfy %s (%s), runtime %s, built at %s - Copyright (C) 2022 Philipp C. Heckel, licensed under Apache License 2.0 & GPLv2 --`, version, commit[:7], runtime.Version(), date) -+`, version, commit, runtime.Version(), date) - - app := cmd.New() - app.Version = version diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template index 5d12f42fd68..1c52e6fb939 100644 --- a/srcpkgs/ntfy/template +++ b/srcpkgs/ntfy/template @@ -1,25 +1,31 @@ # Template file for 'ntfy' pkgname=ntfy -version=2.11.0 -revision=2 +version=2.12.0 +revision=1 build_style=go go_import_path="heckel.io/ntfy/v2" go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.date=${SOURCE_DATE_EPOCH}" hostmakedepends="nodejs" +checkdepends="curl" short_desc="Send push notifications to your phone or desktop using PUT/POST" maintainer="Joel Beckmeyer " license="Apache-2.0,GPL-2.0-only" homepage="https://ntfy.sh" changelog="https://raw.githubusercontent.com/binwiederhier/ntfy/main/docs/releases.md" distfiles="https://github.com/binwiederhier/ntfy/archive/refs/tags/v${version}.tar.gz" -checksum=56b4c91d53e479e207b8064d894516030f608848c76c6d4eed2d37277d337e71 +checksum=210b7409894aa51719077da6a771c82d460bd710a52a527cf52694166f6103d0 system_accounts="_ntfy" make_dirs="/var/lib/ntfy 0700 _ntfy _ntfy" _ntfy_homedir="/var/lib/ntfy" conf_files="/etc/ntfy/server.yml" pre_build() { + # rollup doesn't support native i686, use wasm instead + if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then + (cd web && npm install --override rollup@npm:@rollup/wasm-node@latest) + fi + make web mkdir -p dist/ntfy_linux_server server/docs touch server/docs/index.html server/site/app.html