update vesktop

Makefile

@@ -0,0 +1,38 @@
+BUILDDIR := ./void-packages
+TEMPLATES := $(shell find srcpkgs/* -maxdepth 0 -type d)
+PACKAGES := $(addprefix $(BUILDDIR)/,$(notdir $(TEMPLATES)))
+
+all: sync $(PACKAGES) end
+
+$(info TEMPLATES: $(TEMPLATES))
+$(info PACKAGES: $(PACKAGES))
+
+$(BUILDDIR)/%: srcpkgs/%
+	@echo "Building package: $<"
+	@rm -rf $(BUILDDIR)/srcpkgs/$<
+	@cp -ru $< $(BUILDDIR)/srcpkgs/
+	@-cd $(BUILDDIR) && ./xbps-src clean $<
+	@-cd $(BUILDDIR) && ./xbps-src pkg $< || echo "Warning: Failed to build $<"
+	@mkdir -p ./dest
+	@-cp -u $(BUILDDIR)/hostdir/binpkgs/*.xbps ./dest/
+	@-cp $(BUILDDIR)/hostdir/binpkgs/x86_64-repodata ./dest/
+
+end:
+	@printf "\n\n\033[1;31mRun the following commands:\033[m\n"
+	@printf 'xbps-rindex -s ./dest --privkey \033[31m/path/to/key\033[m --signedby \033[31m"Name <Email>"\033[m\n'
+	@printf 'xbps-rindex -S ./dest/* --privkey \033[31m/path/to/key\033[m\n'
+
+sync: sync-build
+sync-fetch:
+	test -d $(BUILDDIR) || git clone --depth=1 https://github.com/void-linux/void-packages.git $^
+sync-update: sync-fetch
+	@cd $(BUILDDIR) && git pull
+sync-build: sync-update
+	@cd $(BUILDDIR) && ./xbps-src binary-bootstrap
+sync-clean:
+	rm -rf $(BUILDDIR)
+
+build-clean:
+	rm -rf ./dest
+
+clean: sync-clean build-clean

README.md

@@ -6,3 +6,8 @@ To install the packages in this repo make a file called:
 ```conf
 repository=https://voidpkgs.squi.bid
 ```
+
+## Building
+To add a template to the repository make a template in the srcpkgs directory.
+To build all packages run `make` to choose a specific one run
+`make TEMPLATES=srcpkgs/your_package_name`.

build.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-# a small script to help me compile all packages and push them to my server
-
-set -e # exit asap
-
-# cleanup previous build
-if [ "$1" = "clean" ]; then
-  rm -rf ./dest ./void-packages
-  exit 0
-fi
-
-mkdir -p ./dest
-[ ! -d void-packages ] && git clone --depth 1 https://github.com/void-linux/void-packages.git
-./void-packages/xbps-src binary-bootstrap
-
-for f in srcpkgs/*; do
-  cp ./"$f" ./void-packages/"$f" -ruf
-  ./void-packages/xbps-src pkg "$f"
-  cp ./void-packages/hostdir/binpkgs/*.xbps ./dest/ -u
-done
-
-# copy repodata after building all packages
-cp ./void-packages/hostdir/binpkgs/x86_64-repodata ./dest/
-
-# tell the builder to sign their packages
-printf "\n\n\033[1;31mRun the following commands:\033[m\n"
-printf 'xbps-rindex -s ./dest --privkey \033[31m/path/to/key\033[m --signedby \033[31m"Name <Email>"\033[m\n'
-printf 'xbps-rindex -S ./dest/* --privkey \033[31m/path/to/key\033[m\n'

srcpkgs/XD/template

@@ -0,0 +1,23 @@
+# Template file for 'XD'
+pkgname=XD
+version=3.3
+revision=1
+archs="x86_64"
+makedepends="git libgit2-devel pkg-config"
+depends="libgit2"
+build_style=gnu-makefile
+short_desc="smiley face to explain info on the shell"
+maintainer="Zachary Scheiman <me@zacharyscheiman.com>"
+license="GPL-3.0-or-later"
+homepage="https://git.squi.bid/XD"
+distfiles="https://git.squi.bid/${pkgname}/snapshot/${pkgname}-${version}.tar.gz"
+checksum=1686fd1c989674826ca378cc6f4d32ca1d5a8fd9aee4b18cf7047db6408d3e25
+
+do_build() {
+  make
+}
+
+do_install() {
+  vbin XD
+  vman XD.1
+}

srcpkgs/globe/patches/remove_stdlib_req.patch

@@ -0,0 +1,18 @@
+--- globe.c
++++ globe.c
+@@ -733,7 +733,7 @@
+ 
+ 
+ int
+-main( int argc, char* argv )
++main( int argc, char** argv )
+     {
+     time_t now;
+     int gnum, lnum;
+@@ -743,6 +743,4 @@
+     gnum = ( now + OFFSET ) % SECSPERDAY / ( SECSPERDAY / NGLOBES );
+     for ( lnum = 0; lnum < NLINES; ++lnum )
+ 	puts( globes[gnum][lnum] );
+-
+-    exit( 0 );
+    }

srcpkgs/globe/template

@@ -0,0 +1,22 @@
+# Template file for 'globe'
+pkgname=globe
+version=1
+revision=1
+archs="x86_64"
+makedepends="git"
+build_style=gnu-makefile
+short_desc="display the currently-lighted face of Earth in ASCII"
+maintainer="Zachary Scheiman <me@zacharyscheiman.com>"
+license="MIT"
+homepage="https://github.com/Distrotech/globe"
+patch_args="-Np0"
+
+do_fetch() {
+	git clone https://github.com/Distrotech/globe.git $wrksrc
+	cd $wrksrc
+}
+
+do_install() {
+  vbin globe
+  vman globe.1
+}

srcpkgs/lutgen/template

@@ -0,0 +1,20 @@
+# Template file for 'lutgen'
+pkgname=lutgen
+version=0.12.0
+revision=1
+archs="x86_64"
+short_desc="Blazingly fast interpolated LUT generator and applicator for arbitrary and popular color palettes."
+maintainer="Zachary Scheiman <me@zacharyscheiman.com>"
+license="MIT"
+homepage="https://github.com/ozwaldorf/lutgen-rs"
+distfiles="https://github.com/ozwaldorf/lutgen-rs/releases/download/v${version}/lutgen-${version}-x86_64.tar.gz"
+checksum=c8e5d0ae62e1b5c19a211a4d1ab3162a711b2c0999214803381b5a70059de330
+
+do_install() {
+  local package_location="usr/lib/$pkgname"
+	vmkdir ${package_location}
+	chmod +x lutgen
+  vcopy lutgen ${package_location}
+	vmkdir usr/bin
+	ln -sfr $DESTDIR/${package_location}/lutgen $DESTDIR/usr/bin/lutgen
+}

srcpkgs/ly/template

@@ -0,0 +1,22 @@
+# Template file for 'ly'
+pkgname=ly
+version=1.0.3
+revision=1
+build_style=zig-build
+nopie=yes
+makedepends="pam-devel xcb-util-devel pkg-config"
+short_desc="display manager with console UI"
+maintainer="Zachary Scheiman <me@zacharyscheiman.com>"
+license="WTFPL"
+homepage="https://github.com/fairyglade/ly"
+changelog="https://github.com/fairyglade/ly/releases/tag/v${version}"
+distfiles="https://github.com/fairyglade/ly/archive/refs/tags/v${version}.tar.gz"
+checksum=269cc070905bd3a064b458dacb25787e409dad5930f2fbb98640f8e4f57b0bf6
+
+post_install() {
+	vmkdir etc/sv
+  vcopy res/ly-runit-service etc/sv/ly
+	chmod 644 "${PKGDESTDIR}/etc/sv/ly/conf"
+	chmod 755 "${PKGDESTDIR}/etc/sv/ly/finish"
+	chmod 755 "${PKGDESTDIR}/etc/sv/ly/run"
+}

srcpkgs/phoon/patches/fix_stdlib.patch

@@ -0,0 +1,95 @@
+diff --git astro.c astro.c
+index 1fbff03..a98c8a3 100644
+--- astro.c
++++ astro.c
+@@ -26,6 +26,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include <time.h>
+ 
+diff --git astro.h astro.h
+index 8923520..1719ccc 100644
+--- astro.h
++++ astro.h
+@@ -43,4 +43,4 @@ extern void phasehunt2( double sdate, double phases[2], double which[2] );
+  */
+ extern double phase( double pdate, double* pphase, double* mage, double* dist, double* angdia, double* sudist, double* suangdia );
+ 
+-#endif _ASTRO_H_
++#endif
+diff --git date_parse.c date_parse.c
+index 3ccfbee..0c665a0 100644
+--- date_parse.c
++++ date_parse.c
+@@ -334,7 +334,7 @@ date_parse( char* str )
+     ** non-portability, and it's only used for local times that don't
+     ** specify a zone - those don't occur in email and netnews.
+     */
+-#ifdef OS_SYSV
++#if defined(OS_SYSV) || defined(__linux)
+     tzset();
+     gmtoff = -timezone;
+ #else /* OS_SYSV */
+diff --git phoon.c phoon.c
+index 6b68465..05cdfae 100644
+--- phoon.c
++++ phoon.c
+@@ -218,7 +218,7 @@ putmoon( time_t t, int numlines, char* atfiller )
+ 	"          `-.   /     .       .    .-'         ",
+ 	"             `--.       .      .--'            ",
+ 	"                 `------------'                "};
+-    
++
+     static char background24[24][49] = {
+ 	"                  .------------.                 ",
+ 	"             .---' o     .  .   `---.            ",
+@@ -510,19 +510,19 @@ main( int argc, char** argv )
+ 	    if ( argv[argn][1] != 'l' || argv[argn][2] != '\0' )
+ 		{
+ 		fprintf( stderr, usage, argv[0] );
+-		exit( 1 );
++		return 1;
+ 		}
+ 	    else
+ 		{
+ 		if ( argc - argn < 2 )
+ 		    {
+ 		    fprintf( stderr, usage, argv[0] );
+-		    exit( 1 );
++		    return 1;
+ 		    }
+ 		if ( sscanf( argv[argn + 1], "%d", &numlines ) != 1 )
+ 		    {
+ 		    fprintf( stderr, usage, argv[0] );
+-		    exit( 1 );
++		    return 1;
+ 		    }
+ 		argn += 2;
+ 		}
+@@ -553,14 +553,14 @@ main( int argc, char** argv )
+ 	if ( t <= 0 )
+ 	    {
+ 	    fprintf( stderr, "illegal date/time: %s\n", buf );
+-	    exit( 1 );
++	    return 1;
+ 	    }
+ 	}
+     else
+ 	{
+ 	/* Too many args! */
+ 	fprintf( stderr, usage, argv[0] );
+-	exit( 1 );
++	return 1;
+ 	}
+ 
+     /* Pseudo-randomly decide what the moon is made of, and print it. */
+@@ -570,5 +570,5 @@ main( int argc, char** argv )
+ 	putmoon( t, numlines, "@" );
+ 
+     /* All done. */
+-    exit( 0 );
++    return 0;
+     }

srcpkgs/phoon/template

@@ -0,0 +1,22 @@
+# Template file for 'phoon'
+pkgname=phoon
+version=1
+revision=1
+archs="x86_64"
+makedepends="git"
+build_style=gnu-makefile
+short_desc="display current moon phase"
+maintainer="Zachary Scheiman <me@zacharyscheiman.com>"
+license="MIT"
+homepage="https://github.com/Distrotech/phoon"
+patch_args="-Np0"
+
+do_fetch() {
+	git clone https://github.com/Distrotech/phoon.git $wrksrc
+	cd $wrksrc
+}
+
+do_install() {
+  vbin phoon
+  vman phoon.1
+}

srcpkgs/vesktop/template

@@ -1,6 +1,6 @@
 # Template file for 'vesktop'
 pkgname=vesktop
-version=1.5.4
+version=1.5.7
 revision=1
 archs="x86_64"
 short_desc="custom Discord App"
@@ -8,7 +8,8 @@ maintainer="Zachary Scheiman <me@zacharyscheiman.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Vencord/Vesktop"
 distfiles="https://github.com/Vencord/Vesktop/releases/download/v${version}/vesktop-${version}.tar.gz"
-checksum=1bad95ffc98723fb095d73928dc794ce9e07a49ce00aab7a05af245412795a04
+checksum=7670381baa4956d3d60b17562a3838db832cf3ff59cdf6563c7ffbc580508038
+
 
 do_install() {
 	local package_location="usr/lib/$pkgname" item